X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=e50e7873856535b6d619bdbb7aa044f279919d7d;hb=2d7e03100adb7975601a194e476bee50d8e2413c;hp=671de7eeb284fbec32f641e15cc9e4f22b885e12;hpb=495c2c6b6de9b307d2a90d3b33053685a77a3fad;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 671de7e..e50e787 100644
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -59,6 +59,7 @@ extern int failover;
 struct mkfs_opts {
 	struct lustre_disk_data	mo_ldd; /* to be written in MOUNT_DATA_FILE */
 	char	mo_device[128];   /* disk device name */
+	char	**mo_pool_vdevs;  /* list of pool vdevs */
 	char	mo_loopdev[128];  /* in case a loop dev is needed */
 	char	mo_mkfsopts[512]; /* options to the backing-store mkfs */
 	__u64	mo_device_sz;     /* in KB */
@@ -67,6 +68,21 @@ struct mkfs_opts {
 	int	mo_mgs_failnodes;
 };
 
+/* used to describe the options to mount the lustre disk */
+struct mount_opts {
+	struct lustre_disk_data	 mo_ldd;
+	char	*mo_orig_options;
+	char	*mo_usource;		/* user-specified mount device */
+	char	*mo_source;		/* our mount device name */
+	char	 mo_target[PATH_MAX];	/* mount directory */
+	int	 mo_nomtab;
+	int	 mo_fake;
+	int	 mo_force;
+	int	 mo_retry;
+	int	 mo_have_mgsnid;
+	int	 mo_md_stripe_cache_size;
+};
+
 int get_mountdata(char *, struct lustre_disk_data *);
 
 /* mkfs/mount helper functions */
@@ -77,6 +93,9 @@ int add_param(char *buf, char *key, char *val);
 int get_param(char *buf, char *key, char **val);
 char *strscat(char *dst, char *src, int buflen);
 char *strscpy(char *dst, char *src, int buflen);
+int check_mtab_entry(char *spec1, char *spec2, char *mntpt, char *type);
+int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
+		      int flags, int freq, int pass);
 int check_mountfsoptions(char *mountopts, char *wanted_mountopts, int justwarn);
 void trim_mountfsoptions(char *s);
 __u64 get_device_size(char* device);
@@ -94,4 +113,25 @@ int loop_format(struct mkfs_opts *mop);
 int loop_setup(struct mkfs_opts *mop);
 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_is_lustre(char *dev, unsigned *mount_type);
+int osd_make_lustre(struct mkfs_opts *mop);
+int osd_prepare_lustre(struct mkfs_opts *mop,
+		       char *default_mountopts, int default_len,
+		       char *always_mountopts, int always_len);
+int osd_init(void);
+void osd_fini(void);
+
+int ldiskfs_write_ldd(struct mkfs_opts *mop);
+int ldiskfs_read_ldd(char *dev, struct lustre_disk_data *ldd);
+int ldiskfs_is_lustre(char *dev, unsigned *mount_type);
+int ldiskfs_make_lustre(struct mkfs_opts *mop);
+int ldiskfs_prepare_lustre(struct mkfs_opts *mop,
+			   char *default_mountopts, int default_len,
+			   char *always_mountopts, int always_len);
+int ldiskfs_init(void);
+void ldiskfs_fini(void);
+
 #endif