doc, include/ceph_features: retire RESERVED_BROKEN

X-3 == R-3 == Octopus

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 952707425543ae31236a14823265e1fd9664741a..5bbe6dc13de097d8fbd2180d70cbcd7628cff61b 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -47,7 +47,7 @@ Feature bits
 ------------
 
 - [x] ensure that `SERVER_X` is defined
-- [ ] change any features `DEPRECATED` in release X-3 are now marked `RETIRED`.
+- [x] change any features `DEPRECATED` in release X-3 are now marked `RETIRED`.
 - [ ] look for features that (1) were present in X-2 and (2) have no
   client dependency and mark them `DEPRECATED` as of X.
 

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 6252493744610c81ca3724e5f912c2f8a12c391f..794e10efd7a8d1a2b552fd36522e4cc700c9314f 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -184,7 +184,8 @@ DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit*
 DEFINE_CEPH_FEATURE(61, 1, CEPHX_V2)         // 4.19, *do not share this bit*
 
 DEFINE_CEPH_FEATURE(62, 1, RESERVED)           // do not use; used as a sentinel
-DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facing
+DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client-facing
+// available
 
 
 /*
@@ -273,9 +274,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
 #define CEPH_STATIC_ASSERT(x) (void)(sizeof(int[((x)==0) ? -1 : 0]))
 
 static inline void ____build_time_check_for_reserved_bits(void) {
-       CEPH_STATIC_ASSERT((CEPH_FEATURES_ALL &
-                           (CEPH_FEATURE_RESERVED |
-                            DEPRECATED_CEPH_FEATURE_RESERVED_BROKEN)) == 0);
+       CEPH_STATIC_ASSERT((CEPH_FEATURES_ALL & CEPH_FEATURE_RESERVED) == 0);
 }
 
 #endif