LU-8257 utils: fix mtab symlink logic

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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 8a26c5e..7fd9b34 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -48,6 +48,16 @@
 #define _SPL_ZFS_H
 #define _SPL_SIGNAL_H
 #endif
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include <lustre_disk.h>
 #include <lustre_param.h>
 
@@ -64,6 +74,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
@@ -75,6 +86,7 @@ struct mkfs_opts {
        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;
@@ -88,6 +100,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;
@@ -107,19 +122,25 @@ 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);
 int run_command_err(char *cmd, int cmdsz, char *error_msg);
 int run_command(char *cmd, int cmdsz);
 int add_param(char *buf, char *key, char *val);
+int append_param(char *buf, char *key, char *val, char sep);
 int get_param(char *buf, char *key, char **val);
 char *strscat(char *dst, char *src, int buflen);
 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 check_mountfsoptions(char *mountopts, char *wanted_mountopts, int justwarn);
+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);
 
@@ -135,8 +156,8 @@ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd);
 int osd_is_lustre(char *dev, unsigned *mount_type);
 int osd_make_lustre(struct mkfs_opts *mop);
 int osd_prepare_lustre(struct mkfs_opts *mop,
-                      char *default_mountopts, int default_len,
-                      char *always_mountopts, int always_len);
+                      char *wanted_mountopts, size_t len);
+int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len);
 int osd_tune_lustre(char *dev, struct mount_opts *mop);
 int osd_label_lustre(struct mount_opts *mop);
 int osd_enable_quota(struct mkfs_opts *mop);
@@ -151,8 +172,9 @@ struct module_backfs_ops {
        int     (*is_lustre)(char *dev, enum ldd_mount_type *mount_type);
        int     (*make_lustre)(struct mkfs_opts *mop);
        int     (*prepare_lustre)(struct mkfs_opts *mop,
-                                 char *default_mountopts, int default_len,
-                                 char *always_mountopts, int always_len);
+                                 char *wanted_mountopts, size_t len);
+       int     (*fix_mountopts)(struct mkfs_opts *mop,
+                                char *mountopts, size_t len);
        int     (*tune_lustre)(char *dev, struct mount_opts *mop);
        int     (*label_lustre)(struct mount_opts *mop);
        int     (*enable_quota)(struct mkfs_opts *mop);
@@ -161,5 +183,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