X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.h;h=ce220c19067f67a1018b40dab91f8585f93b8273;hb=f1eaf5e99aa9093b7a0fac7ae11e741560f64c31;hp=ad2f2666503e3c4978551fb1ab23d2d5951ab1ce;hpb=fd4cee4cc545679d2a00c2a20939564e36700631;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index ad2f266..ce220c1 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, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,7 +37,19 @@
 #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>
 
 extern char *progname;
 extern int verbose;
@@ -51,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
@@ -59,16 +72,42 @@ 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 */
+	__u64	mo_device_kb;     /* in KB */
 	int	mo_stripe_count;
 	int	mo_flags;
 	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	 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);
@@ -92,24 +131,50 @@ 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);
 
 /* 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_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_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);
+
+#ifdef HAVE_ZFS_OSD
+int zfs_write_ldd(struct mkfs_opts *mop);
+int zfs_read_ldd(char *ds,  struct lustre_disk_data *ldd);
+int zfs_is_lustre(char *dev, unsigned *mount_type);
+int zfs_make_lustre(struct mkfs_opts *mop);
+int zfs_prepare_lustre(struct mkfs_opts *mop,
+		       char *default_mountopts, int default_len,
+		       char *always_mountopts, int always_len);
+int zfs_tune_lustre(char *dev, struct mount_opts *mop);
+int zfs_label_lustre(struct mount_opts *mop);
+int zfs_init(void);
+void zfs_fini(void);
+#endif
 
 #endif