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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 2b1ac8f..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;
@@ -73,10 +73,14 @@ extern int failover;
 #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 */
@@ -113,15 +117,38 @@ struct mount_opts {
 
 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))
 
@@ -154,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,
@@ -171,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,