Merge pull request #6097 from dillaman/wip-13045-hammer

librbd: diff_iterate needs to handle holes in parent images

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/test/librbd/test_librbd.cc
Simple merge