update sources to v12.1.2

[ceph.git] / ceph / src / include / ceph_features.h

diff --git a/ceph/src/include/ceph_features.h b/ceph/src/include/ceph_features.h
index 9decdaff3e709aca48a77278203ca3fb6f7b649e..19fab5f303a56715fc13f1cad680da02a7119c13 100755 (executable)
--- a/ceph/src/include/ceph_features.h
+++ b/ceph/src/include/ceph_features.h
@@ -162,22 +162,13 @@ DEFINE_CEPH_FEATURE(58, 1, FS_FILE_LAYOUT_V2) // overlap
 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, BLKIN_TRACING)  // *do not share this bit*
+DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *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
 
 
-/*
- * conditionally include blkin in CEPH_FEATURES_ALL/SUPPORTED_DEFAULT
- */
-#ifdef WITH_BLKIN
-#define CEPH_FEATURES_BLKIN CEPH_FEATURE_BLKIN_TRACING
-#else
-#define CEPH_FEATURES_BLKIN 0
-#endif
-
 /*
  * Features supported.  Should be everything above.
  */
@@ -238,7 +229,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_SERVER_LUMINOUS |         \
         CEPH_FEATURE_RESEND_ON_SPLIT |         \
         CEPH_FEATURE_RADOS_BACKOFF |           \
-        CEPH_FEATURES_BLKIN | \
+        CEPH_FEATURE_OSD_RECOVERY_DELETES | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL
@@ -253,7 +244,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_CRUSH_TUNABLES5 |         \
         CEPH_FEATURE_CRUSH_V2 |                \
         CEPH_FEATURE_CRUSH_V4 |                \
-        CEPH_FEATURE_CRUSH_CHOOSE_ARGS)
+        CEPH_FEATUREMASK_CRUSH_CHOOSE_ARGS)
 
 /*
  * make sure we don't try to use the reserved features