LU-8837 utils: move lustre_disk_data back to lustre_disk.h

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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 251a1fc..7c130c4 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -23,11 +23,10 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _MOUNT_UTILS_H_
@@ -55,8 +54,10 @@
 #include <sys/stat.h>
 
 #include <libcfs/util/list.h>
-#include <linux/lustre_disk.h>
-#include <linux/lustre_param.h>
+#include <linux/lustre/lustre_param.h>
+#ifdef HAVE_SERVER_SUPPORT
+#include <linux/lustre/lustre_disk.h>
+#endif
 
 extern char *progname;
 extern int verbose;
@@ -81,23 +82,29 @@ extern int failover;
 /* Maximum length of on-disk parameters in the form key=<value> */
 #define PARAM_MAX              4096
 
+#ifdef HAVE_SERVER_SUPPORT
 /* used to describe the options to format the lustre disk, not persistent */
 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 */
-       char    *mo_mountopts;    /* mount options for backing fs */
-       __u64   mo_device_kb;     /* in KB */
-       int     mo_stripe_count;
-       int     mo_flags;
-       int     mo_mgs_failnodes;
+       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 for backing-store mkfs */
+       char            *mo_mountopts;    /* mount options for backing fs */
+       long long       mo_device_kb;     /* in KB */
+       int             mo_blocksize_kb;  /* blocksize in KB */
+       int             mo_stripe_count;
+       int             mo_flags;
+       int             mo_mgs_failnodes;
+       int             mo_inode_size;
 };
+#endif
 
 /* used to describe the options to mount the lustre disk */
 struct mount_opts {
+#ifdef HAVE_SERVER_SUPPORT
        struct lustre_disk_data  mo_ldd;
+#endif
        char    *mo_orig_options;
        char    *mo_usource;            /* user-specified mount device */
        char    *mo_source;             /* our mount device name */
@@ -115,11 +122,12 @@ struct mount_opts {
        int      mo_max_sectors_kb;
 };
 
+#ifdef HAVE_SERVER_SUPPORT
 int get_mountdata(char *, struct lustre_disk_data *);
 
-static inline char *mt_str(enum ldd_mount_type mt)
+static inline const char *mt_str(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "ext3",
                "ldiskfs",
                "smfs",
@@ -130,9 +138,9 @@ static inline char *mt_str(enum ldd_mount_type mt)
        return mount_type_string[mt];
 }
 
-static inline char *mt_type(enum ldd_mount_type mt)
+static inline const char *mt_type(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "osd-ldiskfs",
                "osd-ldiskfs",
                "osd-smfs",
@@ -142,6 +150,7 @@ static inline char *mt_type(enum ldd_mount_type mt)
        };
        return mount_type_string[mt];
 }
+#endif /* HAVE_SERVER_SUPPORT */
 
 #define MT_STR(data)   mt_str((data)->ldd_mount_type)
 
@@ -168,6 +177,7 @@ int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
 int update_utab_entry(struct mount_opts *mop);
 int check_mountfsoptions(char *mountopts, char *wanted_mountopts);
 void trim_mountfsoptions(char *s);
+#ifdef HAVE_SERVER_SUPPORT
 __u64 get_device_size(char* device);
 int lustre_rename_fsname(struct mkfs_opts *mop, const char *mntpt,
                         const char *oldname);
@@ -215,11 +225,13 @@ struct module_backfs_ops {
        void   *dl_handle;
 };
 
-struct module_backfs_ops zfs_ops;
-struct module_backfs_ops ldiskfs_ops;
+extern struct module_backfs_ops zfs_ops;
+extern struct module_backfs_ops ldiskfs_ops;
 
 struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type);
 void unload_backfs_ops(struct module_backfs_ops *ops);
+#endif
+
 #ifdef HAVE_OPENSSL_SSK
 int load_shared_keys(struct mount_opts *mop);
 #else