]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
librbd: diff_iterate needs to handle holes in parent images
authorJason Dillaman <dillaman@redhat.com>
Tue, 8 Sep 2015 19:47:37 +0000 (15:47 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 28 Sep 2015 14:28:22 +0000 (10:28 -0400)
commit93c523c65c1f0b6f9a76b1d71acf9e8df57c0fc9
tree2e4ab692a816d93990cefb4cee32c1a5d0ce9b0a
parent359b68447393980bb7cdd4acc23582e8046b186c
librbd: diff_iterate needs to handle holes in parent images

If a clone's parent image snapshot includes a discarded extent,
this was previously causing an assert failure.  Instead, ignore
any discard holes in the parent image.

Fixes: #12885
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3ccc3bb4bd35e57209852d460633e371b4d004e2)

 Conflicts:
src/librbd/DiffIterate.cc : file doesn't exist in hammer, logic is in internal.cc
src/librbd/internal.cc