From: Sage Weil Date: Fri, 4 May 2018 15:20:47 +0000 (-0500) Subject: include/ceph_features: define CEPHX2 feature X-Git-Tag: v12.2.6~3^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52318ad035d2e1698b021e85a34d9d98c4bc078c;p=ceph.git include/ceph_features: define CEPHX2 feature This indicates support for cephx v2. Signed-off-by: Sage Weil (cherry picked from commit d672a7afe62ade4960e3e7f935c004f15945f39b) --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 19fab5f303a5..bea6f49fb160 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -163,8 +163,8 @@ DEFINE_CEPH_FEATURE(59, 1, FS_BTIME) DEFINE_CEPH_FEATURE(59, 1, FS_CHANGE_ATTR) // overlap DEFINE_CEPH_FEATURE(59, 1, MSG_ADDR2) // overlap DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit* +DEFINE_CEPH_FEATURE(61, 1, CEPHX_V2) // *do not share this bit* -DEFINE_CEPH_FEATURE(61, 1, RESERVED2) // unused, but slow down! DEFINE_CEPH_FEATURE(62, 1, RESERVED) // do not use; used as a sentinal DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facing @@ -230,6 +230,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_RESEND_ON_SPLIT | \ CEPH_FEATURE_RADOS_BACKOFF | \ CEPH_FEATURE_OSD_RECOVERY_DELETES | \ + CEPH_FEATURE_CEPHX_V2 | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL @@ -254,7 +255,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin static inline void ____build_time_check_for_reserved_bits(void) { CEPH_STATIC_ASSERT((CEPH_FEATURES_ALL & (CEPH_FEATURE_RESERVED | - CEPH_FEATURE_RESERVED2 | DEPRECATED_CEPH_FEATURE_RESERVED_BROKEN)) == 0); }