LU-6179 llite: remove LOCKAHEAD_OLD compatibility

[fs/lustre-release.git] / lustre / include / uapi / linux / lustre / lustre_idl.h

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 720119d..1402fbb 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -816,7 +816,7 @@ struct ptlrpc_body_v2 {
                                                         RPCs in parallel */
 #define OBD_CONNECT_DIR_STRIPE  0x400000000000000ULL /* striped DNE dir */
 #define OBD_CONNECT_SUBTREE    0x800000000000000ULL /* fileset mount */
-#define OBD_CONNECT_LOCKAHEAD_OLD 0x1000000000000000ULL /* Old Cray lockahead */
+/* was OBD_CONNECT_LOCKAHEAD_OLD 0x1000000000000000ULL old lockahead 2.12-2.13*/
 
 /** bulk matchbits is sent within ptlrpc_body */
 #define OBD_CONNECT_BULK_MBITS  0x2000000000000000ULL
@@ -900,7 +900,8 @@ struct ptlrpc_body_v2 {
                                OBD_CONNECT2_SELINUX_POLICY | \
                                OBD_CONNECT2_LSOM | \
                                OBD_CONNECT2_ASYNC_DISCARD | \
-                               OBD_CONNECT2_PCC)
+                               OBD_CONNECT2_PCC | \
+                               OBD_CONNECT2_CRUSH)
 
 #define OST_CONNECT_SUPPORTED  (OBD_CONNECT_SRVLOCK | OBD_CONNECT_GRANT | \
                                OBD_CONNECT_REQPORTAL | OBD_CONNECT_VERSION | \
@@ -2223,6 +2224,13 @@ struct lmv_mds_md_v1 {
        struct lu_fid lmv_stripe_fids[0];       /* FIDs for each stripe */
 };
 
+#define LMV_DEBUG(mask, lmv, msg)                                      \
+       CDEBUG(mask, "%s LMV: magic %#x count %u index %u hash %#x version %u migrate offset %u migrate hash %u.\n",    \
+              msg, (lmv)->lmv_magic, (lmv)->lmv_stripe_count,          \
+              (lmv)->lmv_master_mdt_index, (lmv)->lmv_hash_type,       \
+              (lmv)->lmv_layout_version, (lmv)->lmv_migrate_offset,    \
+              (lmv)->lmv_migrate_hash)
+
 /* foreign LMV EA */
 struct lmv_foreign_md {
        __u32 lfm_magic;        /* magic number = LMV_MAGIC_FOREIGN */
@@ -2267,6 +2275,9 @@ static inline __u64 lustre_hash_fnv_1a_64(const void *buf, __kernel_size_t size)
        return hash;
 }
 
+/* CRUSH placement group count */
+#define LMV_CRUSH_PG_COUNT     4096
+
 union lmv_mds_md {
        __u32                    lmv_magic;
        struct lmv_mds_md_v1     lmv_md_v1;
@@ -2558,15 +2569,6 @@ enum mgs_cmd {
        MGS_FIRST_OPC   = MGS_CONNECT
 };
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
-#define MGS_PARAM_MAXLEN 1024
-#define KEY_SET_INFO "set_info"
-
-struct mgs_send_param {
-        char             mgs_param[MGS_PARAM_MAXLEN];
-};
-#endif
-
 /* We pass this info to the MGS so it can write config logs */
 #define MTI_NAME_MAXLEN  64
 #define MTI_PARAM_MAXLEN 4096