Whamcloud - gitweb
LU-3006 utils: mount to pass/clear UPDATE flag
[fs/lustre-release.git] / lustre / include / lustre_disk.h
index 7869803..b685dcb 100644 (file)
@@ -172,12 +172,13 @@ struct lustre_disk_data {
 /*8192*/char       ldd_params[4096];     /* key=value pairs */
 };
 
+
 #define IS_MDT(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_MDT)
 #define IS_OST(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_OST)
 #define IS_MGS(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_MGS)
 #define IS_SERVER(data) ((data)->lsi_flags & (LDD_F_SV_TYPE_MGS | \
-       LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST))
-#define MT_STR(data)   mt_str((data)->ldd_mount_type)
+                        LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST))
+#define MT_STR(data)    mt_str((data)->ldd_mount_type)
 
 /* Make the mdt/ost server obd name based on the filesystem name */
 static inline int server_make_name(__u32 flags, __u16 index, char *fs,
@@ -199,11 +200,6 @@ static inline int server_make_name(__u32 flags, __u16 index, char *fs,
         return 0;
 }
 
-/* Get the index from the obd name */
-int server_name2index(char *svname, __u32 *idx, char **endptr);
-int server_name2svname(char *label, char *svname, char **endptr);
-
-
 /****************** mount command *********************/
 
 /* The lmd is only used internally by Lustre; mount simply passes
@@ -244,6 +240,7 @@ struct lustre_mount_data {
 #define LMD_FLG_IAM         0x0400  /* IAM dir */
 #define LMD_FLG_NO_PRIMNODE  0x0800  /* all nodes are service nodes */
 #define LMD_FLG_VIRGIN      0x1000  /* the service registers first time */
+#define LMD_FLG_UPDATE      0x2000  /* update parameters */
 
 #define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)
 
@@ -327,8 +324,8 @@ struct lr_server_data {
         __u64 lsd_catalog_oid;     /* recovery catalog object id */
         __u32 lsd_catalog_ogen;    /* recovery catalog inode generation */
         __u8  lsd_peeruuid[40];    /* UUID of MDS associated with this OST */
-        __u32 lsd_ost_index;       /* index number of OST in LOV */
-        __u32 lsd_mdt_index;       /* index number of MDT in LMV */
+       __u32 lsd_osd_index;       /* index number of OST in LOV */
+       __u32 lsd_padding1;        /* was lsd_mdt_index, unused in 2.4.0 */
         __u32 lsd_start_epoch;     /* VBR: start epoch from last boot */
         /** transaction values since lsd_trans_table_time */
         __u64 lsd_trans_table[LR_EXPIRE_INTERVALS];
@@ -376,55 +373,55 @@ static inline void check_lcd(char *obd_name, int index,
 static inline void lsd_le_to_cpu(struct lr_server_data *buf,
                                  struct lr_server_data *lsd)
 {
-        int i;
-        memcpy(lsd->lsd_uuid, buf->lsd_uuid, sizeof (lsd->lsd_uuid));
-        lsd->lsd_last_transno     = le64_to_cpu(buf->lsd_last_transno);
-        lsd->lsd_compat14         = le64_to_cpu(buf->lsd_compat14);
-        lsd->lsd_mount_count      = le64_to_cpu(buf->lsd_mount_count);
-        lsd->lsd_feature_compat   = le32_to_cpu(buf->lsd_feature_compat);
-        lsd->lsd_feature_rocompat = le32_to_cpu(buf->lsd_feature_rocompat);
-        lsd->lsd_feature_incompat = le32_to_cpu(buf->lsd_feature_incompat);
-        lsd->lsd_server_size      = le32_to_cpu(buf->lsd_server_size);
-        lsd->lsd_client_start     = le32_to_cpu(buf->lsd_client_start);
-        lsd->lsd_client_size      = le16_to_cpu(buf->lsd_client_size);
-        lsd->lsd_subdir_count     = le16_to_cpu(buf->lsd_subdir_count);
-        lsd->lsd_catalog_oid      = le64_to_cpu(buf->lsd_catalog_oid);
-        lsd->lsd_catalog_ogen     = le32_to_cpu(buf->lsd_catalog_ogen);
-        memcpy(lsd->lsd_peeruuid, buf->lsd_peeruuid, sizeof(lsd->lsd_peeruuid));
-        lsd->lsd_ost_index        = le32_to_cpu(buf->lsd_ost_index);
-        lsd->lsd_mdt_index        = le32_to_cpu(buf->lsd_mdt_index);
-        lsd->lsd_start_epoch      = le32_to_cpu(buf->lsd_start_epoch);
-        for (i = 0; i < LR_EXPIRE_INTERVALS; i++)
-                lsd->lsd_trans_table[i] = le64_to_cpu(buf->lsd_trans_table[i]);
-        lsd->lsd_trans_table_time = le32_to_cpu(buf->lsd_trans_table_time);
-        lsd->lsd_expire_intervals = le32_to_cpu(buf->lsd_expire_intervals);
+       int i;
+       memcpy(lsd->lsd_uuid, buf->lsd_uuid, sizeof(lsd->lsd_uuid));
+       lsd->lsd_last_transno     = le64_to_cpu(buf->lsd_last_transno);
+       lsd->lsd_compat14         = le64_to_cpu(buf->lsd_compat14);
+       lsd->lsd_mount_count      = le64_to_cpu(buf->lsd_mount_count);
+       lsd->lsd_feature_compat   = le32_to_cpu(buf->lsd_feature_compat);
+       lsd->lsd_feature_rocompat = le32_to_cpu(buf->lsd_feature_rocompat);
+       lsd->lsd_feature_incompat = le32_to_cpu(buf->lsd_feature_incompat);
+       lsd->lsd_server_size      = le32_to_cpu(buf->lsd_server_size);
+       lsd->lsd_client_start     = le32_to_cpu(buf->lsd_client_start);
+       lsd->lsd_client_size      = le16_to_cpu(buf->lsd_client_size);
+       lsd->lsd_subdir_count     = le16_to_cpu(buf->lsd_subdir_count);
+       lsd->lsd_catalog_oid      = le64_to_cpu(buf->lsd_catalog_oid);
+       lsd->lsd_catalog_ogen     = le32_to_cpu(buf->lsd_catalog_ogen);
+       memcpy(lsd->lsd_peeruuid, buf->lsd_peeruuid, sizeof(lsd->lsd_peeruuid));
+       lsd->lsd_osd_index        = le32_to_cpu(buf->lsd_osd_index);
+       lsd->lsd_padding1        = le32_to_cpu(buf->lsd_padding1);
+       lsd->lsd_start_epoch      = le32_to_cpu(buf->lsd_start_epoch);
+       for (i = 0; i < LR_EXPIRE_INTERVALS; i++)
+               lsd->lsd_trans_table[i] = le64_to_cpu(buf->lsd_trans_table[i]);
+       lsd->lsd_trans_table_time = le32_to_cpu(buf->lsd_trans_table_time);
+       lsd->lsd_expire_intervals = le32_to_cpu(buf->lsd_expire_intervals);
 }
 
 static inline void lsd_cpu_to_le(struct lr_server_data *lsd,
                                  struct lr_server_data *buf)
 {
-        int i;
-        memcpy(buf->lsd_uuid, lsd->lsd_uuid, sizeof (buf->lsd_uuid));
-        buf->lsd_last_transno     = cpu_to_le64(lsd->lsd_last_transno);
-        buf->lsd_compat14         = cpu_to_le64(lsd->lsd_compat14);
-        buf->lsd_mount_count      = cpu_to_le64(lsd->lsd_mount_count);
-        buf->lsd_feature_compat   = cpu_to_le32(lsd->lsd_feature_compat);
-        buf->lsd_feature_rocompat = cpu_to_le32(lsd->lsd_feature_rocompat);
-        buf->lsd_feature_incompat = cpu_to_le32(lsd->lsd_feature_incompat);
-        buf->lsd_server_size      = cpu_to_le32(lsd->lsd_server_size);
-        buf->lsd_client_start     = cpu_to_le32(lsd->lsd_client_start);
-        buf->lsd_client_size      = cpu_to_le16(lsd->lsd_client_size);
-        buf->lsd_subdir_count     = cpu_to_le16(lsd->lsd_subdir_count);
-        buf->lsd_catalog_oid      = cpu_to_le64(lsd->lsd_catalog_oid);
-        buf->lsd_catalog_ogen     = cpu_to_le32(lsd->lsd_catalog_ogen);
-        memcpy(buf->lsd_peeruuid, lsd->lsd_peeruuid, sizeof(buf->lsd_peeruuid));
-        buf->lsd_ost_index        = cpu_to_le32(lsd->lsd_ost_index);
-        buf->lsd_mdt_index        = cpu_to_le32(lsd->lsd_mdt_index);
-        buf->lsd_start_epoch      = cpu_to_le32(lsd->lsd_start_epoch);
-        for (i = 0; i < LR_EXPIRE_INTERVALS; i++)
-                buf->lsd_trans_table[i] = cpu_to_le64(lsd->lsd_trans_table[i]);
-        buf->lsd_trans_table_time = cpu_to_le32(lsd->lsd_trans_table_time);
-        buf->lsd_expire_intervals = cpu_to_le32(lsd->lsd_expire_intervals);
+       int i;
+       memcpy(buf->lsd_uuid, lsd->lsd_uuid, sizeof(buf->lsd_uuid));
+       buf->lsd_last_transno     = cpu_to_le64(lsd->lsd_last_transno);
+       buf->lsd_compat14         = cpu_to_le64(lsd->lsd_compat14);
+       buf->lsd_mount_count      = cpu_to_le64(lsd->lsd_mount_count);
+       buf->lsd_feature_compat   = cpu_to_le32(lsd->lsd_feature_compat);
+       buf->lsd_feature_rocompat = cpu_to_le32(lsd->lsd_feature_rocompat);
+       buf->lsd_feature_incompat = cpu_to_le32(lsd->lsd_feature_incompat);
+       buf->lsd_server_size      = cpu_to_le32(lsd->lsd_server_size);
+       buf->lsd_client_start     = cpu_to_le32(lsd->lsd_client_start);
+       buf->lsd_client_size      = cpu_to_le16(lsd->lsd_client_size);
+       buf->lsd_subdir_count     = cpu_to_le16(lsd->lsd_subdir_count);
+       buf->lsd_catalog_oid      = cpu_to_le64(lsd->lsd_catalog_oid);
+       buf->lsd_catalog_ogen     = cpu_to_le32(lsd->lsd_catalog_ogen);
+       memcpy(buf->lsd_peeruuid, lsd->lsd_peeruuid, sizeof(buf->lsd_peeruuid));
+       buf->lsd_osd_index        = cpu_to_le32(lsd->lsd_osd_index);
+       buf->lsd_padding1         = cpu_to_le32(lsd->lsd_padding1);
+       buf->lsd_start_epoch      = cpu_to_le32(lsd->lsd_start_epoch);
+       for (i = 0; i < LR_EXPIRE_INTERVALS; i++)
+               buf->lsd_trans_table[i] = cpu_to_le64(lsd->lsd_trans_table[i]);
+       buf->lsd_trans_table_time = cpu_to_le32(lsd->lsd_trans_table_time);
+       buf->lsd_expire_intervals = cpu_to_le32(lsd->lsd_expire_intervals);
 }
 
 static inline void lcd_le_to_cpu(struct lsd_client_data *buf,
@@ -536,27 +533,35 @@ struct los_ondisk {
 /****************** prototypes *********************/
 
 #ifdef __KERNEL__
-
 /* obd_mount.c */
+int server_name2fsname(const char *svname, char *fsname, const char **endptr);
+int server_name2index(const char *svname, __u32 *idx, const char **endptr);
+int server_name2svname(const char *label, char *svname, const char **endptr,
+                      size_t svsize);
+
+int lustre_put_lsi(struct super_block *sb);
+int lustre_start_simple(char *obdname, char *type, char *uuid,
+                       char *s1, char *s2, char *s3, char *s4);
+int lustre_start_mgc(struct super_block *sb);
 void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb,
-                                                  struct vfsmount *mnt));
+                                                 struct vfsmount *mnt));
 void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb));
-
-
 int lustre_common_put_super(struct super_block *sb);
-struct lustre_mount_info *server_find_mount_locked(const char *name);
+
+# ifdef HAVE_SERVER_SUPPORT
+/* obd_mount_server.c */
+int server_fill_super(struct super_block *sb);
 struct lustre_mount_info *server_get_mount(const char *name);
 struct lustre_mount_info *server_get_mount_2(const char *name);
 int server_put_mount(const char *name, struct vfsmount *mnt);
 int server_put_mount_2(const char *name, struct vfsmount *mnt);
 struct mgs_target_info;
-int server_mti_print(char *title, struct mgs_target_info *mti);
+int server_mti_print(const char *title, struct mgs_target_info *mti);
 void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
+# endif
 
-/* mgc_request.c */
 int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
-
-#endif
+#endif /* __KERNEL__ */
 
 /** @} disk */