From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 15 May 2018 19:07:21 +0000 (-0400)
Subject: librbd: deep-copy should remove parent metadata if overlap updated
X-Git-Tag: v14.0.0~95^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af4298464d6809969eb35382b3cbbb1ea0b3bd1e;p=ceph.git

librbd: deep-copy should remove parent metadata if overlap updated

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/deep_copy/SetHeadRequest.cc b/src/librbd/deep_copy/SetHeadRequest.cc
index cab319820c1..ade87ba384d 100644
--- a/src/librbd/deep_copy/SetHeadRequest.cc
+++ b/src/librbd/deep_copy/SetHeadRequest.cc
@@ -102,7 +102,8 @@ template <typename I>
 void SetHeadRequest<I>::send_remove_parent() {
   m_image_ctx->parent_lock.get_read();
   if (m_image_ctx->parent_md.spec.pool_id == -1 ||
-      m_image_ctx->parent_md.spec == m_parent_spec) {
+      (m_image_ctx->parent_md.spec == m_parent_spec &&
+       m_image_ctx->parent_md.overlap == m_parent_overlap)) {
     m_image_ctx->parent_lock.put_read();
     send_set_parent();
     return;