From a1b8df4aebb813f6b80f33fa32fea779181302ac Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 25 May 2018 08:44:09 -0500 Subject: [PATCH] include/ceph_features: define CEPHX2 feature This indicates support for cephx v2. Signed-off-by: Sage Weil (cherry picked from commit d672a7afe62ade4960e3e7f935c004f15945f39b) (cherry picked from commit 52318ad035d2e1698b021e85a34d9d98c4bc078c) # Conflicts: # src/include/ceph_features.h --- src/include/ceph_features.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 9756746425ce7..e6ff292c9f51d 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -85,7 +85,8 @@ #define CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING (1ULL<<58) /* New, v7 encoding */ #define CEPH_FEATURE_FS_FILE_LAYOUT_V2 (1ULL<<58) /* file_layout_t */ -#define CEPH_FEATURE_RESERVED2 (1ULL<<61) /* slow down, we are almost out... */ +#define CEPH_FEATURE_CEPHX_V2 (1ULL<<61) /* do not share this bit */ + #define CEPH_FEATURE_RESERVED (1ULL<<62) /* DO NOT USE THIS ... last bit! */ #define CEPH_FEATURE_RESERVED_BROKEN (1ULL<<63) /* DO NOT USE THIS; see below */ @@ -179,6 +180,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_CRUSH_TUNABLES5 | \ CEPH_FEATURE_SERVER_JEWEL | \ CEPH_FEATURE_FS_FILE_LAYOUT_V2 | \ + CEPH_FEATURE_CEPHX_V2 | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL @@ -202,7 +204,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { static inline void ____build_time_check_for_reserved_bits(void) { CEPH_STATIC_ASSERT((CEPH_FEATURES_ALL & (CEPH_FEATURE_RESERVED | - CEPH_FEATURE_RESERVED2 | CEPH_FEATURE_RESERVED_BROKEN)) == 0); } -- 2.39.5