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: v9.1.0~289^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5683%2Fhead;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 --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 81ff511c2325..78e0fbef09a6 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -65,9 +65,9 @@ #define CEPH_FEATURE_OSD_PROXY_FEATURES (1ULL<<49) /* overlap w/ above */ #define CEPH_FEATURE_MON_METADATA (1ULL<<50) #define CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT (1ULL<<51) /* can sort objs bitwise */ -#define CEPH_FEATURE_OSD_HITSET_GMT (1ULL<<51) /* overlap with bitwise sort */ #define CEPH_FEATURE_OSD_PROXY_WRITE_FEATURES (1ULL<<52) #define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 (1ULL<<53) +#define CEPH_FEATURE_OSD_HITSET_GMT (1ULL<<54) #define CEPH_FEATURE_RESERVED2 (1ULL<<61) /* slow down, we are almost out... */ #define CEPH_FEATURE_RESERVED (1ULL<<62) /* DO NOT USE THIS ... last bit! */ @@ -157,6 +157,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT | \ CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 | \ CEPH_FEATURE_OSD_PROXY_WRITE_FEATURES | \ + CEPH_FEATURE_OSD_HITSET_GMT | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL