From: Xiaoxi Chen <xiaoxchen@ebay.com>
Date: Thu, 8 Dec 2016 18:40:03 +0000 (+0800)
Subject: librbd/diff_iterator: use proper snap to query parent overlap
X-Git-Tag: v11.1.1~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12396%2Fhead;p=ceph.git

librbd/diff_iterator: use proper snap to query parent overlap

If no snapshot has been made, we will use CEPH_NOSNAP instead of 0,
to query the parent overlap.

Fixes bug http://tracker.ceph.com/issues/18200

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
---

diff --git a/src/librbd/DiffIterate.cc b/src/librbd/DiffIterate.cc
index c0165c72774..82dcaa689ef 100644
--- 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;