LU-9934 build: address issues raised by gcc7

[fs/lustre-release.git] / lustre / include / lustre_disk.h

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 92206ef..c34a833 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,6 +49,7 @@
 #include <linux/list.h>
 #include <libcfs/libcfs.h>
 #include <uapi/linux/lustre/lustre_disk.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 
 #define IS_MDT(data)           ((data)->lsi_flags & LDD_F_SV_TYPE_MDT)
 #define IS_OST(data)           ((data)->lsi_flags & LDD_F_SV_TYPE_OST)
@@ -119,8 +120,10 @@ struct lustre_sb_info {
        struct dt_device         *lsi_dt_dev;  /* dt device to access disk fs*/
        atomic_t                  lsi_mounts;  /* references to the srv_mnt */
        char                      lsi_svname[MTI_NAME_MAXLEN];
-       char                      lsi_osd_obdname[64];
-       char                      lsi_osd_uuid[64];
+       /* lsi_osd_obdname format = 'lsi->ls_svname'-osd */
+       char                      lsi_osd_obdname[MTI_NAME_MAXLEN + 4];
+       /* lsi_osd_uuid format = 'lsi->ls_osd_obdname'_UUID */
+       char                      lsi_osd_uuid[MTI_NAME_MAXLEN + 9];
        struct obd_export        *lsi_osd_exp;
        char                      lsi_osd_type[16];
        char                      lsi_fstype[16];
@@ -132,7 +135,6 @@ struct lustre_sb_info {
 };
 
 #define LSI_UMOUNT_FAILOVER              0x00200000
-#define LSI_BDI_INITIALIZED              0x00400000
 
 #define     s2lsi(sb)        ((struct lustre_sb_info *)((sb)->s_fs_info))
 #define     s2lsi_nocast(sb) ((sb)->s_fs_info)
@@ -325,6 +327,7 @@ int server_name2fsname(const char *svname, char *fsname, const char **endptr);
 
 int server_name2svname(const char *label, char *svname, const char **endptr,
                       size_t svsize);
+void obdname2fsname(const char *tgt, char *fsname, size_t buflen);
 
 #ifdef HAVE_SERVER_SUPPORT
 int server_name_is_ost(const char *svname);