features: deprecate CEPH_FEATURE_INDEP_PG_MAP

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 3b98242b7bac5f01da27a9292c36ca2642113880..59d2d8da4f054e621cde419994844b2c9c657688 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -495,7 +495,6 @@ int main(int argc, const char **argv)
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_OSDENC |
     CEPH_FEATURE_OSD_SNAPMAPPER |
-    CEPH_FEATURE_INDEP_PG_MAP |
     CEPH_FEATURE_OSD_PACKED_RECOVERY |
     CEPH_FEATURE_RECOVERY_RESERVATION |
     CEPH_FEATURE_BACKFILL_RESERVATION |

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index a71d55177550503f1c210b2d03f794290458b0e8..f67b967e3110f7af7d8f701666a5826cd21a02e8 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -27,7 +27,7 @@
 // UNUSED: (1ULL<<14)
 #define CEPH_FEATURE_MONENC         (1ULL<<15)
 #define DEPRECATED_CEPH_FEATURE_QUERY_T        (1ULL<<16) // DEPRECATED: JEWEL
-#define CEPH_FEATURE_INDEP_PG_MAP   (1ULL<<17)
+#define DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP   (1ULL<<17) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_CRUSH_TUNABLES (1ULL<<18)
 #define CEPH_FEATURE_CHUNKY_SCRUB   (1ULL<<19)
 #define CEPH_FEATURE_MON_NULLROUTE  (1ULL<<20)
@@ -131,7 +131,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_OSDENC |           \
         DEPRECATED_CEPH_FEATURE_QUERY_T |               \
         CEPH_FEATURE_MONENC |           \
-        CEPH_FEATURE_INDEP_PG_MAP |     \
+        DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP |  \
         CEPH_FEATURE_CRUSH_TUNABLES |   \
         CEPH_FEATURE_CHUNKY_SCRUB |     \
         CEPH_FEATURE_MON_NULLROUTE |    \