Merge pull request #12649 from xiaoxichen/wip-18278-jewel

jewel: rbd: librbd: use proper snapshot when computing diff parent overlap Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Jan 30, 2017 · efad365 · efad365
2 parents a1e7c06 + 64c0cae
commit efad365
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/librbd/DiffIterate.cc b/src/librbd/DiffIterate.cc
@@ -264,7 +264,7 @@ int DiffIterate::execute() {
     RWLock::RLocker l(m_image_ctx.snap_lock);
     RWLock::RLocker l2(m_image_ctx.parent_lock);
     uint64_t overlap = end_size;
-    m_image_ctx.get_parent_overlap(from_snap_id, &overlap);
+    m_image_ctx.get_parent_overlap(m_image_ctx.snap_id, &overlap);
     r = 0;
     if (m_image_ctx.parent && overlap > 0) {
       ldout(cct, 10) << " first getting parent diff" << dendl;