LU-2237 tests: new test for re-recreating last_rcvd

[fs/lustre-release.git] / lustre / utils / mount_utils.h

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index e50e787..72e2f0a 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -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
@@ -81,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);
@@ -121,6 +144,9 @@ 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);
 
@@ -131,7 +157,24 @@ 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