]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
remove invalid objectmap flag when objectmap is disabled
authorxinxin shu <shuxinxin@chinac.com>
Thu, 2 Jun 2016 06:13:09 +0000 (14:13 +0800)
committerxinxin shu <shuxinxin@chinac.com>
Fri, 3 Jun 2016 01:28:57 +0000 (09:28 +0800)
Fixes: http://tracker.ceph.com/issues/16076
Signed-off-by: xinxin shu <shuxinxin@chinac.com>
src/librbd/internal.cc

index 49dea3cc9c486b5d2ff462fe164dc2ccbdf4e07c..ca298d6f019374713974f50246547336a2ee6c58 100644 (file)
@@ -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;