hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/include/linux/ceph/ceph_features.h
....@@ -11,14 +11,14 @@
1111 #define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL
1212
1313 #define DEFINE_CEPH_FEATURE(bit, incarnation, name) \
14
- static const uint64_t CEPH_FEATURE_##name = (1ULL<<bit); \
15
- static const uint64_t CEPH_FEATUREMASK_##name = \
14
+ static const uint64_t __maybe_unused CEPH_FEATURE_##name = (1ULL<<bit); \
15
+ static const uint64_t __maybe_unused CEPH_FEATUREMASK_##name = \
1616 (1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
1717
1818 /* this bit is ignored but still advertised by release *when* */
1919 #define DEFINE_CEPH_FEATURE_DEPRECATED(bit, incarnation, name, when) \
20
- static const uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
21
- static const uint64_t DEPRECATED_CEPH_FEATUREMASK_##name = \
20
+ static const uint64_t __maybe_unused DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
21
+ static const uint64_t __maybe_unused DEPRECATED_CEPH_FEATUREMASK_##name = \
2222 (1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
2323
2424 /*
....@@ -58,7 +58,7 @@
5858 * because 10.2.z (jewel) did not care if its peers advertised this
5959 * feature bit.
6060 *
61
- * - In the second phase we stop advertising the the bit and call it
61
+ * - In the second phase we stop advertising the bit and call it
6262 * RETIRED. This can normally be done in the *next* major release
6363 * following the one in which we marked the feature DEPRECATED. In
6464 * the above example, for 12.0.z (luminous) we can say:
....@@ -211,14 +211,9 @@
211211 CEPH_FEATURE_MON_STATEFUL_SUB | \
212212 CEPH_FEATURE_CRUSH_TUNABLES5 | \
213213 CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
214
+ CEPH_FEATURE_MSG_ADDR2 | \
214215 CEPH_FEATURE_CEPHX_V2)
215216
216
-#define CEPH_FEATURES_REQUIRED_DEFAULT \
217
- (CEPH_FEATURE_NOSRCADDR | \
218
- CEPH_FEATURE_SUBSCRIBE2 | \
219
- CEPH_FEATURE_RECONNECT_SEQ | \
220
- CEPH_FEATURE_PGID64 | \
221
- CEPH_FEATURE_PGPOOL3 | \
222
- CEPH_FEATURE_OSDENC)
217
+#define CEPH_FEATURES_REQUIRED_DEFAULT 0
223218
224219 #endif