include/ceph_features: define CEPHX2 feature

This indicates support for cephx v2.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d672a7afe62ade4960e3e7f935c004f15945f39b)

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 19fab5f303a56715fc13f1cad680da02a7119c13..bea6f49fb160760e13d12644f6652573809ce353 100755 (executable)
--- 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);
 }