LU-6050 target: control OST-index in IDIF via ROCOMPAT flag

[fs/lustre-release.git] / lustre / include / lustre_disk.h

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 567e194..b0dec84 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -68,6 +68,10 @@
 #define QMT_DIR                        "quota_master"
 #define QSD_DIR                        "quota_slave"
 #define HSM_ACTIONS            "hsm_actions"
+#define LFSCK_DIR              "LFSCK"
+#define LFSCK_BOOKMARK         "lfsck_bookmark"
+#define LFSCK_LAYOUT           "lfsck_layout"
+#define LFSCK_NAMESPACE                "lfsck_namespace"
 
 /****************** persistent mount data *********************/
 
@@ -208,7 +212,8 @@ static inline int server_make_name(__u32 flags, __u16 index, char *fs,
 /* The lmd is only used internally by Lustre; mount simply passes
    everything as string options */
 
-#define LMD_MAGIC    0xbdacbd03
+#define LMD_MAGIC              0xbdacbd03
+#define LMD_PARAMS_MAXLEN      4096
 
 /* gleaned from the mount command - no persistent info here */
 struct lustre_mount_data {
@@ -284,7 +289,9 @@ struct lustre_mount_data {
 #define OBD_COMPAT_20           0x00000008
 
 /** MDS handles LOV_OBJID file */
-#define OBD_ROCOMPAT_LOVOBJID   0x00000001
+#define OBD_ROCOMPAT_LOVOBJID          0x00000001
+/** store OST index in the IDIF */
+#define OBD_ROCOMPAT_IDX_IN_IDIF       0x00000002
 
 /** OST handles group subdirs */
 #define OBD_INCOMPAT_GROUPS     0x00000001
@@ -363,7 +370,7 @@ struct lsd_client_data {
 static inline void check_lcd(char *obd_name, int index,
                              struct lsd_client_data *lcd)
 {
-        int length = sizeof(lcd->lcd_uuid);
+       size_t length = sizeof(lcd->lcd_uuid);
         if (strnlen((char*)lcd->lcd_uuid, length) == length) {
                 lcd->lcd_uuid[length - 1] = '\0';
 
@@ -520,9 +527,9 @@ struct lustre_sb_info {
 /****************** mount lookup info *********************/
 
 struct lustre_mount_info {
-        char                 *lmi_name;
-        struct super_block   *lmi_sb;
-        cfs_list_t            lmi_list_chain;
+       char                    *lmi_name;
+       struct super_block      *lmi_sb;
+       struct list_head         lmi_list_chain;
 };
 
 /****************** prototypes *********************/