include/ceph_features: return INDEP_PG_MAP

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index f70d76cd548fa8bfbaea2cb1091ec04b31abf771..8501df87b4ecdec4c3fa589687428033e1e06dd0 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -88,7 +88,7 @@ DEFINE_CEPH_FEATURE(14, 2, SERVER_KRAKEN)
 DEFINE_CEPH_FEATURE(15, 1, MONENC)
 DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS)
 
-DEFINE_CEPH_FEATURE_DEPRECATED(17, 1, INDEP_PG_MAP, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES)
 DEFINE_CEPH_FEATURE_DEPRECATED(19, 1, CHUNKY_SCRUB, JEWEL)
@@ -205,7 +205,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_OSDREPLYMUX |      \
         CEPH_FEATURE_OSDENC |           \
         CEPH_FEATURE_MONENC |           \
-        DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP |  \
         CEPH_FEATURE_CRUSH_TUNABLES |   \
         DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \
         DEPRECATED_CEPH_FEATURE_MON_NULLROUTE |         \