From: Samuel Just Date: Mon, 14 Mar 2016 22:19:09 +0000 (-0700) Subject: features: deprecate CEPH_FEATURE_INDEP_PG_MAP X-Git-Tag: v10.1.0~17^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac443a899ad3f97284a8854e7d2e225c04ae07a8;p=ceph.git features: deprecate CEPH_FEATURE_INDEP_PG_MAP Signed-off-by: Samuel Just --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3b98242b7bac..59d2d8da4f05 100644 --- 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 a71d55177550..f67b967e3110 100755 --- 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 | \