From b2d475686ee7617bb2023d753941e3d6952f0878 Mon Sep 17 00:00:00 2001 From: xinxin shu Date: Thu, 2 Jun 2016 14:13:09 +0800 Subject: [PATCH] remove invalid objectmap flag when objectmap is disabled Fixes: http://tracker.ceph.com/issues/16076 Signed-off-by: xinxin shu --- src/librbd/internal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 49dea3cc9c486..ca298d6f01937 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; -- 2.39.5