update sources to v12.1.0

[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 8b8933b7e018816907f0cc18437a5e58a7eefe87..9decdaff3e709aca48a77278203ca3fb6f7b649e 100755 (executable)
--- a/ceph/src/include/ceph_features.h
+++ b/ceph/src/include/ceph_features.h
@@ -101,7 +101,7 @@ DEFINE_CEPH_FEATURE(21, 2, SERVER_LUMINOUS)
 DEFINE_CEPH_FEATURE(21, 2, RESEND_ON_SPLIT)  // overlap
 DEFINE_CEPH_FEATURE(21, 2, RADOS_BACKOFF)    // overlap
 DEFINE_CEPH_FEATURE(21, 2, OSDMAP_PG_UPMAP)  // overlap
-DEFINE_CEPH_FEATURE(21, 2, CRUSH_CHOOSEARGS) // overlap
+DEFINE_CEPH_FEATURE(21, 2, CRUSH_CHOOSE_ARGS) // overlap
 DEFINE_CEPH_FEATURE_RETIRED(22, 1, BACKFILL_RESERVATION, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(23, 1, MSG_AUTH)
@@ -253,7 +253,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_CHOOSEARGS)
+        CEPH_FEATURE_CRUSH_CHOOSE_ARGS)
 
 /*
  * make sure we don't try to use the reserved features