From: lixiaoy1 <xiaoyan.li@intel.com>
Date: Thu, 22 Oct 2020 08:22:42 +0000 (-0400)
Subject: rbd/image: remove implicit features when cloning
X-Git-Tag: v16.1.0~756^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37743%2Fhead;p=ceph.git

rbd/image: remove implicit features when cloning

Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>
---

diff --git a/src/librbd/image/CloneRequest.cc b/src/librbd/image/CloneRequest.cc
index 1b11b3a5fae03..b022ea75a72f5 100644
--- a/src/librbd/image/CloneRequest.cc
+++ b/src/librbd/image/CloneRequest.cc
@@ -214,8 +214,9 @@ void CloneRequest<I>::validate_parent() {
     return;
   }
   if (m_use_p_features) {
-    m_features = (p_features & ~RBD_FEATURES_IMPLICIT_ENABLE);
+    m_features = p_features;
   }
+  m_features &= ~RBD_FEATURES_IMPLICIT_ENABLE;
 
   if (r < 0) {
     lderr(m_cct) << "unable to locate parent's snapshot" << dendl;