From: xinxin shu <shuxinxin@chinac.com>
Date: Thu, 2 Jun 2016 06:13:09 +0000 (+0800)
Subject: remove invalid objectmap flag when objectmap is disabled
X-Git-Tag: v11.0.0~331^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2d475686ee7617bb2023d753941e3d6952f0878;p=ceph.git

remove invalid objectmap flag when objectmap is disabled
Fixes: http://tracker.ceph.com/issues/16076
Signed-off-by: xinxin shu <shuxinxin@chinac.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 49dea3cc9c48..ca298d6f0193 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1782,7 +1782,7 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
             return -EINVAL;
           }
 
-          disable_flags = RBD_FLAG_OBJECT_MAP_INVALID;
+          disable_flags |= RBD_FLAG_OBJECT_MAP_INVALID;
           r = remove_object_map(ictx);
           if (r < 0) {
             lderr(cct) << "failed to remove object map" << dendl;
@@ -1790,7 +1790,7 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
           }
         }
         if ((features & RBD_FEATURE_FAST_DIFF) != 0) {
-          disable_flags = RBD_FLAG_FAST_DIFF_INVALID;
+          disable_flags |= RBD_FLAG_FAST_DIFF_INVALID;
         }
         if ((features & RBD_FEATURE_JOURNALING) != 0) {
           rbd_mirror_mode_t mirror_mode;