X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=72e2f0a0bd43847f09040817984a1e3a4b5f97f7;hb=c49ff6ff89725052a29aa91d780a881e7829dfa2;hp=a698cb51748e09060ae3116919c8f5d1e05d8e1f;hpb=cfef7958178b4e2981a44b1977da6577cc152ce4;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index a698cb5..72e2f0a 100644
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -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
@@ -82,10 +94,20 @@ 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);
@@ -124,6 +146,7 @@ int osd_prepare_lustre(struct mkfs_opts *mop,
 		       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);
 
@@ -136,6 +159,7 @@ int ldiskfs_prepare_lustre(struct mkfs_opts *mop,
 			   char *always_mountopts, int always_len);
 int ldiskfs_tune_lustre(char *dev, struct mount_opts *mop);
 int ldiskfs_label_lustre(struct mount_opts *mop);
+int ldiskfs_enable_quota(struct mkfs_opts *mop);
 int ldiskfs_init(void);
 void ldiskfs_fini(void);