From: Kefu Chai Date: Thu, 27 Aug 2015 16:32:38 +0000 (+0800) Subject: osd: do not let OSD_HITSET_GMT reuse the feature bit X-Git-Tag: v0.94.7~8^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7aec079f8a1bbe75625c438a17bb87e45398568e;p=ceph.git osd: do not let OSD_HITSET_GMT reuse the feature bit * to ease the backport to hammer Signed-off-by: Kefu Chai (cherry picked from commit 5a4f6a866bb675195ad83c38fd23238d078c78ed) Conflicts: src/include/ceph_features.h minor changes to resolve conflicts --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index a5d9fc1f16f7..205e18fb12c8 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -64,7 +64,7 @@ // duplicated since it was introduced at the same time as MIN_SIZE_RECOVERY #define CEPH_FEATURE_OSD_PROXY_FEATURES (1ULL<<49) /* overlap w/ above */ #define CEPH_FEATURE_MON_METADATA (1ULL<<50) -#define CEPH_FEATURE_OSD_HITSET_GMT (1ULL<<51) /* overlap with bitwise sort */ +#define CEPH_FEATURE_OSD_HITSET_GMT (1ULL<<54) /* ... */ #define CEPH_FEATURE_HAMMER_0_94_4 (1ULL<<55) @@ -152,6 +152,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY | \ + CEPH_FEATURE_OSD_HITSET_GMT | \ CEPH_FEATURE_HAMMER_0_94_4 | \ 0ULL)