X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=4fac57fc805d5079172d830623ef7c0a0c9cb3fd;hb=6460ae59bf6e5175797dc66ecbe560eebc8b6333;hp=8fb8494276730fb652c89a474c653e3f34d8836a;hpb=bae418cb53f30c14d2e07201360df267f3652746;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 8fb8494..4fac57f 100644
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,6 +37,17 @@
 #ifndef _MOUNT_UTILS_H_
 #define _MOUNT_UTILS_H_
 
+/* Some of the userland headers for libzfs also require
+ * zfs/spl linux kernel headers, but including these pull
+ * in linux kernel headers which conflicts with the
+ * userland version of libcfs. So the solution is tell the
+ * libzfs user land headrs that the zfs/spl kernel headers
+ * are already included even if this is not the case.
+ */
+#ifdef HAVE_ZFS_OSD
+#define _SPL_ZFS_H
+#define _SPL_SIGNAL_H
+#endif
 #include <lustre_disk.h>
 #include <lustre_param.h>
 
@@ -52,6 +63,7 @@ extern int failover;
 #define MO_FORCEFORMAT		0x02
 #define MO_FAILOVER		0x04
 #define MO_DRYRUN		0x08
+#define MO_QUOTA		0x10
 
 #define MAX_LOOP_DEVICES	16
 #define INDEX_UNASSIGNED	0xFFFF
@@ -63,7 +75,7 @@ struct mkfs_opts {
 	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 */
+	__u64	mo_device_kb;     /* in KB */
 	int	mo_stripe_count;
 	int	mo_flags;
 	int	mo_mgs_failnodes;
@@ -82,15 +94,26 @@ struct mount_opts {
 	int	 mo_retry;
 	int	 mo_have_mgsnid;
 	int	 mo_md_stripe_cache_size;
+	int	 mo_nosvc;
 };
 
 int get_mountdata(char *, struct lustre_disk_data *);
 
+#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)
+
 /* mkfs/mount helper functions */
 void fatal(void);
 int run_command_err(char *cmd, int cmdsz, char *error_msg);
 int run_command(char *cmd, int cmdsz);
 int add_param(char *buf, char *key, char *val);
+int append_param(char *buf, char *key, char *val, char sep);
 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);
@@ -101,15 +124,8 @@ int check_mountfsoptions(char *mountopts, char *wanted_mountopts, int justwarn);
 void trim_mountfsoptions(char *s);
 __u64 get_device_size(char* device);
 
-int is_block(char *devname);
-void disp_old_e2fsprogs_msg(const char *feature, int make_backfs);
-int make_lustre_backfs(struct mkfs_opts *mop);
-int write_local_files(struct mkfs_opts *mop);
-int read_local_files(struct mkfs_opts *mop);
-int is_lustre_target(struct mkfs_opts *mop);
-
 /* loopback helper functions */
-int file_create(char *path, int size);
+int file_create(char *path, __u64 size);
 int loop_format(struct mkfs_opts *mop);
 int loop_setup(struct mkfs_opts *mop);
 int loop_cleanup(struct mkfs_opts *mop);
@@ -122,17 +138,29 @@ 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_tune_lustre(char *dev, struct mount_opts *mop);
+int osd_label_lustre(struct mount_opts *mop);
+int osd_enable_quota(struct mkfs_opts *mop);
 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);
+struct module_backfs_ops {
+	int	(*init)(void);
+	void	(*fini)(void);
+	int	(*read_ldd)(char *ds,  struct lustre_disk_data *ldd);
+	int	(*write_ldd)(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,
+				  char *default_mountopts, int default_len,
+				  char *always_mountopts, int always_len);
+	int	(*tune_lustre)(char *dev, struct mount_opts *mop);
+	int	(*label_lustre)(struct mount_opts *mop);
+	int	(*enable_quota)(struct mkfs_opts *mop);
+	void   *dl_handle;
+};
+
+struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type);
+void unload_backfs_ops(struct module_backfs_ops *ops);
 
 #endif