From 67cb2f5143b2a89748ecdf98f69044fc527b659e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Feb 2017 09:10:52 -0500 Subject: [PATCH] include/ceph_features: retire {BACKFILL,RECOVERY}_RESERVATION Signed-off-by: Sage Weil --- src/include/ceph_features.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 263e878397f..10587252636 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -98,10 +98,10 @@ DEFINE_CEPH_FEATURE_RETIRED(20, 1, MON_NULLROUTE, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_RETIRED(21, 1, MON_GV, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(21, 2, SERVER_LUMINOUS) DEFINE_CEPH_FEATURE(21, 2, RESEND_ON_SPLIT) // overlap -DEFINE_CEPH_FEATURE_DEPRECATED(22, 1, BACKFILL_RESERVATION, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(22, 1, BACKFILL_RESERVATION, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(23, 1, MSG_AUTH) -DEFINE_CEPH_FEATURE_DEPRECATED(24, 1, RECOVERY_RESERVATION, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(24, 1, RECOVERY_RESERVATION, JEWEL, LUNINOUS) DEFINE_CEPH_FEATURE(25, 1, CRUSH_TUNABLES2) DEFINE_CEPH_FEATURE(26, 1, CREATEPOOLID) @@ -206,9 +206,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_OSDENC | \ CEPH_FEATURE_MONENC | \ CEPH_FEATURE_CRUSH_TUNABLES | \ - DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION | \ CEPH_FEATURE_MSG_AUTH | \ - DEPRECATED_CEPH_FEATURE_RECOVERY_RESERVATION | \ CEPH_FEATURE_CRUSH_TUNABLES2 | \ CEPH_FEATURE_CREATEPOOLID | \ CEPH_FEATURE_REPLY_CREATE_INODE | \ -- 2.47.3