LU-8551 test: Use mds1 rather than mds to operate on MDT0000

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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 48afe0b..bcacce4 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -58,6 +58,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <libcfs/util/list.h>
 #include <lustre_disk.h>
 #include <lustre_param.h>
 
@@ -74,6 +75,7 @@ extern int failover;
 #define MO_FAILOVER            0x04
 #define MO_DRYRUN              0x08
 #define MO_QUOTA               0x10
+#define MO_NOHOSTID_CHECK      0x20
 
 #define MAX_LOOP_DEVICES       16
 #define INDEX_UNASSIGNED       0xFFFF
@@ -99,6 +101,9 @@ struct mount_opts {
        char    *mo_usource;            /* user-specified mount device */
        char    *mo_source;             /* our mount device name */
        char     mo_target[PATH_MAX];   /* mount directory */
+#ifdef HAVE_GSS
+       char     mo_skpath[PATH_MAX];   /* shared key file/directory */
+#endif
        int      mo_nomtab;
        int      mo_fake;
        int      mo_force;
@@ -118,6 +123,10 @@ int get_mountdata(char *, struct lustre_disk_data *);
 #define IS_OST(data)   ((data)->ldd_flags & LDD_F_SV_TYPE_OST)
 #undef IS_MGS
 #define IS_MGS(data)  ((data)->ldd_flags & LDD_F_SV_TYPE_MGS)
+#undef IS_SERVER
+#define IS_SERVER(data) ((data)->ldd_flags & (LDD_F_SV_TYPE_MGS | \
+                         LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST))
+
 
 /* mkfs/mount helper functions */
 void fatal(void);
@@ -131,6 +140,7 @@ char *strscpy(char *dst, char *src, int buflen);
 int check_mtab_entry(char *spec1, char *spec2, char *mntpt, char *type);
 int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts,
                      int flags, int freq, int pass);
+int update_utab_entry(struct mount_opts *mop);
 int check_mountfsoptions(char *mountopts, char *wanted_mountopts);
 void trim_mountfsoptions(char *s);
 __u64 get_device_size(char* device);
@@ -174,5 +184,5 @@ struct module_backfs_ops {
 
 struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type);
 void unload_backfs_ops(struct module_backfs_ops *ops);
-
+int load_shared_keys(struct mount_opts *mop);
 #endif