X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=613dd65504aabc7ecef07a446a1400257fb88efe;hb=3344e648236778565a8838ca85c655446ee7028c;hp=427e4c5b7368629353f47d94e9c190e5217af72b;hpb=d10200a80770f0029d1d665af954187b9ad883df;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 427e4c5..613dd65 100644
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 
 #include <libcfs/util/list.h>
-#include <lustre_disk.h>
+#include <linux/lustre_disk.h>
 #include <lustre_param.h>
 
 extern char *progname;
@@ -72,10 +72,15 @@ extern int failover;
 #define MO_DRYRUN		0x08
 #define MO_QUOTA		0x10
 #define MO_NOHOSTID_CHECK	0x20
+#define MO_RENAME		0x40
+#define MO_ERASE_ALL		0x80
 
 #define MAX_LOOP_DEVICES	16
 #define INDEX_UNASSIGNED	0xFFFF
 
+/* Maximum length of on-disk parameters in the form key=<value> */
+#define PARAM_MAX		4096
+
 /* used to describe the options to format the lustre disk, not persistent */
 struct mkfs_opts {
 	struct lustre_disk_data	mo_ldd; /* to be written in MOUNT_DATA_FILE */
@@ -107,19 +112,43 @@ struct mount_opts {
 	int	 mo_have_mgsnid;
 	int	 mo_md_stripe_cache_size;
 	int	 mo_nosvc;
+	int	 mo_max_sectors_kb;
 };
 
 int get_mountdata(char *, struct lustre_disk_data *);
 
+static inline char *mt_str(enum ldd_mount_type mt)
+{
+	static char *mount_type_string[] = {
+		"ext3",
+		"ldiskfs",
+		"smfs",
+		"reiserfs",
+		"ldiskfs2",
+		"zfs",
+	};
+	return mount_type_string[mt];
+}
+
+static inline char *mt_type(enum ldd_mount_type mt)
+{
+	static char *mount_type_string[] = {
+		"osd-ldiskfs",
+		"osd-ldiskfs",
+		"osd-smfs",
+		"osd-reiserfs",
+		"osd-ldiskfs",
+		"osd-zfs",
+	};
+	return mount_type_string[mt];
+}
+
 #define MT_STR(data)   mt_str((data)->ldd_mount_type)
 
-#undef IS_MDT
 #define IS_MDT(data)   ((data)->ldd_flags & LDD_F_SV_TYPE_MDT)
-#undef IS_OST
 #define IS_OST(data)   ((data)->ldd_flags & LDD_F_SV_TYPE_OST)
-#undef IS_MGS
 #define IS_MGS(data)  ((data)->ldd_flags & LDD_F_SV_TYPE_MGS)
-#undef IS_SERVER
+#define IS_SEPARATED_MGS(data)	((data)->ldd_flags == LDD_F_SV_TYPE_MGS)
 #define IS_SERVER(data) ((data)->ldd_flags & (LDD_F_SV_TYPE_MGS | \
 			  LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST))
 
@@ -140,6 +169,8 @@ int update_utab_entry(struct mount_opts *mop);
 int check_mountfsoptions(char *mountopts, char *wanted_mountopts);
 void trim_mountfsoptions(char *s);
 __u64 get_device_size(char* device);
+int lustre_rename_fsname(struct mkfs_opts *mop, const char *mntpt,
+			 const char *oldname);
 
 /* loopback helper functions */
 int file_create(char *path, __u64 size);
@@ -150,6 +181,8 @@ int loop_cleanup(struct mkfs_opts *mop);
 /* generic target support */
 int osd_write_ldd(struct mkfs_opts *mop);
 int osd_read_ldd(char *dev, struct lustre_disk_data *ldd);
+int osd_erase_ldd(struct mkfs_opts *mop, char *param);
+void osd_print_ldd_params(struct mkfs_opts *mop);
 int osd_is_lustre(char *dev, unsigned *mount_type);
 int osd_make_lustre(struct mkfs_opts *mop);
 int osd_prepare_lustre(struct mkfs_opts *mop,
@@ -157,6 +190,7 @@ int osd_prepare_lustre(struct mkfs_opts *mop,
 int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len);
 int osd_tune_lustre(char *dev, struct mount_opts *mop);
 int osd_label_lustre(struct mount_opts *mop);
+int osd_rename_fsname(struct mkfs_opts *mop, const char *oldname);
 int osd_enable_quota(struct mkfs_opts *mop);
 int osd_init(void);
 void osd_fini(void);
@@ -166,6 +200,8 @@ struct module_backfs_ops {
 	void	(*fini)(void);
 	int	(*read_ldd)(char *ds,  struct lustre_disk_data *ldd);
 	int	(*write_ldd)(struct mkfs_opts *mop);
+	int	(*erase_ldd)(struct mkfs_opts *mop, char *param);
+	void	(*print_ldd_params)(struct mkfs_opts *mop);
 	int	(*is_lustre)(char *dev, enum ldd_mount_type *mount_type);
 	int	(*make_lustre)(struct mkfs_opts *mop);
 	int	(*prepare_lustre)(struct mkfs_opts *mop,
@@ -175,6 +211,7 @@ struct module_backfs_ops {
 	int	(*tune_lustre)(char *dev, struct mount_opts *mop);
 	int	(*label_lustre)(struct mount_opts *mop);
 	int	(*enable_quota)(struct mkfs_opts *mop);
+	int	(*rename_fsname)(struct mkfs_opts *mop, const char *oldname);
 	void   *dl_handle;
 };