4 files changed, 11 insertions, 4 deletions

diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index f0f6c537b64c..040dd105c3e7 100644
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -10,14 +10,14 @@
 #define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL
 
 #define DEFINE_CEPH_FEATURE(bit, incarnation, name)                     \
-        const static uint64_t CEPH_FEATURE_##name = (1ULL<<bit);                \
-        const static uint64_t CEPH_FEATUREMASK_##name =                 \
+        static const uint64_t CEPH_FEATURE_##name = (1ULL<<bit);                \
+        static const uint64_t CEPH_FEATUREMASK_##name =                 \
                 (1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
 
 /* this bit is ignored but still advertised by release *when* */
 #define DEFINE_CEPH_FEATURE_DEPRECATED(bit, incarnation, name, when) \
-        const static uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
-        const static uint64_t DEPRECATED_CEPH_FEATUREMASK_##name =              \
+        static const uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
+        static const uint64_t DEPRECATED_CEPH_FEATUREMASK_##name =              \
                 (1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
 
 /*
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index c6d96a5f46fd..adf670ecaf94 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -148,6 +148,7 @@ struct ceph_osd_request_target {
         int size;
         int min_size;
         bool sort_bitwise;
+        bool recovery_deletes;
 
         unsigned int flags;                /* CEPH_OSD_FLAG_* */
         bool paused;
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index a0996cb9faed..af3444a5bfdd 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -272,6 +272,8 @@ bool ceph_is_new_interval(const struct ceph_osds *old_acting,
                           u32 new_pg_num,
                           bool old_sort_bitwise,
                           bool new_sort_bitwise,
+                          bool old_recovery_deletes,
+                          bool new_recovery_deletes,
                           const struct ceph_pg *pgid);
 bool ceph_osds_changed(const struct ceph_osds *old_acting,
                        const struct ceph_osds *new_acting,
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h
index 385db08bb8b2..b8281feda9c7 100644
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
@@ -158,6 +158,10 @@ extern const char *ceph_osd_state_name(int s);
 #define CEPH_OSDMAP_NOTIERAGENT (1<<13) /* disable tiering agent */
 #define CEPH_OSDMAP_NOREBALANCE (1<<14) /* block osd backfill unless pg is degraded */
 #define CEPH_OSDMAP_SORTBITWISE (1<<15) /* use bitwise hobject_t sort */
+#define CEPH_OSDMAP_REQUIRE_JEWEL    (1<<16) /* require jewel for booting osds */
+#define CEPH_OSDMAP_REQUIRE_KRAKEN   (1<<17) /* require kraken for booting osds */
+#define CEPH_OSDMAP_REQUIRE_LUMINOUS (1<<18) /* require l for booting osds */
+#define CEPH_OSDMAP_RECOVERY_DELETES (1<<19) /* deletes performed during recovery instead of peering */
 
 /*
  * The error code to return when an OSD can't handle a write