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 744d106..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_
@@ -84,43 +83,20 @@ extern int failover;
 #define PARAM_MAX              4096
 
 #ifdef HAVE_SERVER_SUPPORT
-/* On-disk configuration file. In host-endian order. */
-struct lustre_disk_data {
-       __u32 ldd_magic;
-       __u32 ldd_feature_compat;       /* compatible feature flags */
-       __u32 ldd_feature_rocompat;     /* read-only compatible feature flags */
-       __u32 ldd_feature_incompat;     /* incompatible feature flags */
-
-       __u32 ldd_config_ver;           /* config rewrite count - not used */
-       __u32 ldd_flags;                /* LDD_SV_TYPE */
-       __u32 ldd_svindex;              /* server index (0001), must match
-                                        * svname
-                                        */
-       __u32 ldd_mount_type;           /* target fs type LDD_MT_* */
-       char  ldd_fsname[64];           /* filesystem this server is part of,
-                                        * MTI_NAME_MAXLEN
-                                        */
-       char  ldd_svname[64];           /* this server's name (lustre-mdt0001)*/
-       __u8  ldd_uuid[40];             /* server UUID (COMPAT_146) */
-
-       char  ldd_userdata[1024 - 200]; /* arbitrary user string '200' */
-       __u8  ldd_padding[4096 - 1024]; /* 1024 */
-       char  ldd_mount_opts[4096];     /* target fs mount opts '4096' */
-       char  ldd_params[4096];         /* key=value pairs '8192' */
-};
-
 /* 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
 
@@ -149,9 +125,9 @@ struct mount_opts {
 #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",
@@ -162,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",
@@ -249,8 +225,8 @@ 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);