LU-10937 sptlrpc: split sptlrpc_process_config()

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

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index d48aaba..47ad428 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/
@@ -111,6 +111,7 @@ struct lustre_mount_data {
 
 /****************** superblock additional info *********************/
 struct ll_sb_info;
+struct kobject;
 
 struct lustre_sb_info {
        int                       lsi_flags;
@@ -119,9 +120,12 @@ struct lustre_sb_info {
        struct ll_sb_info        *lsi_llsbi;   /* add'l client sbi info */
        struct dt_device         *lsi_dt_dev;  /* dt device to access disk fs*/
        atomic_t                  lsi_mounts;  /* references to the srv_mnt */
+       struct kobject           *lsi_kobj;
        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];
@@ -319,14 +323,18 @@ struct lustre_mount_info {
 
 /****************** prototypes *********************/
 
-/* obd_mount.c */
-int server_name2fsname(const char *svname, char *fsname, const char **endptr);
-#endif /* HAVE_SERVER_SUPPORT */
+/* obd_mount_server.c */
+int server_fill_super(struct super_block *sb);
+struct lustre_mount_info *server_get_mount(const char *name);
+int server_put_mount(const char *name, bool dereg_mnt);
+struct mgs_target_info;
+int server_mti_print(const char *title, struct mgs_target_info *mti);
+void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
 
+/* obd_mount.c */
 int server_name2svname(const char *label, char *svname, const char **endptr,
                       size_t svsize);
 
-#ifdef HAVE_SERVER_SUPPORT
 int server_name_is_ost(const char *svname);
 int target_name2index(const char *svname, u32 *idx, const char **endptr);
 
@@ -335,21 +343,14 @@ int lustre_start_simple(char *obdname, char *type, char *uuid,
                        char *s1, char *s2, char *s3, char *s4);
 int lustre_start_mgc(struct super_block *sb);
 #endif /* HAVE_SERVER_SUPPORT */
+int server_name2fsname(const char *svname, char *fsname, const char **endptr);
+void obdname2fsname(const char *tgt, char *fsname, size_t fslen);
+
 void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb,
                                                  struct vfsmount *mnt));
 void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb));
 int lustre_common_put_super(struct super_block *sb);
 
-# ifdef HAVE_SERVER_SUPPORT
-/* obd_mount_server.c */
-int server_fill_super(struct super_block *sb);
-struct lustre_mount_info *server_get_mount(const char *name);
-int server_put_mount(const char *name, bool dereg_mnt);
-struct mgs_target_info;
-int server_mti_print(const char *title, struct mgs_target_info *mti);
-void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
-# endif
-
 int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
 int mgc_logname2resid(char *fsname, struct ldlm_res_id *res_id, int type);