From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Apr 2018 21:09:17 +0000 (-0500)
Subject: osd/SnapMapper: allow split_bits to decrease (merge)
X-Git-Tag: v14.0.1~371^2~61
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cba9dea7da98c565762c0f66e789fcf7f957b846;p=ceph.git

osd/SnapMapper: allow split_bits to decrease (merge)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/SnapMapper.h b/src/osd/SnapMapper.h
index 26e90d60c0639..21157ef2ae146 100644
--- a/src/osd/SnapMapper.h
+++ b/src/osd/SnapMapper.h
@@ -180,11 +180,10 @@ public:
   }
 
   set<string> prefixes;
-  /// Update bits in case of pg split
+  /// Update bits in case of pg split or merge
   void update_bits(
     uint32_t new_bits  ///< [in] new split bits
     ) {
-    ceph_assert(new_bits >= mask_bits);
     mask_bits = new_bits;
     set<string> _prefixes = hobject_t::get_prefixes(
       mask_bits,