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

This patch moves struct lustre_disk_data from mount_utils.h
back to lustre_disk.h so that it can be used in other codes
without including mount_utils.h.

Fixes: d62efba975d2 ("LU-8837 utils: make tools lightweight for lustre clients")
Change-Id: I589da2710e3cbe7d93a59928143f2b5cac955e6e
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44829
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_disk.h b/lustre/include/uapi/linux/lustre/lustre_disk.h
index 73f800c..54f73fd 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_disk.h
+++ b/lustre/include/uapi/linux/lustre/lustre_disk.h
@@ -70,6 +70,31 @@
 #define INDEX_BACKUP_DIR       "index_backup"
 #define MDT_ORPHAN_DIR         "PENDING"
 
+/* 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' */
+};
+
 /****************** persistent mount data *********************/
 
 #define LDD_F_SV_TYPE_MDT      0x0001

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index d7e4f6e..7c130c4 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -83,31 +83,6 @@ 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 */