Whamcloud - gitweb
LU-14090 mgs: no local logs flag
[fs/lustre-release.git] / lustre / utils / mount_lustre.c
index d5d897c..7b363a5 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+#include <getopt.h>
+#include <mntent.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
-#include "obdctl.h"
-#include <lustre_ver.h>
-#include <glob.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <linux/lustre/lustre_ver.h>
 #include <ctype.h>
 #include <limits.h>
+#if defined(HAVE_LUSTRE_CRYPTO) && defined(HAVE_LIBKEYUTILS)
+#include <keyutils.h>
+#endif
+#include <linux/lnet/nidstr.h>
+#include <libcfs/util/string.h>
+
+#include "obdctl.h"
 #include "mount_utils.h"
 
-#define MAX_HW_SECTORS_KB_PATH  "queue/max_hw_sectors_kb"
-#define MAX_SECTORS_KB_PATH     "queue/max_sectors_kb"
-#define STRIPE_CACHE_SIZE       "md/stripe_cache_size"
+#ifdef HAVE_LIBMOUNT
+# define WITH_LIBMOUNT "(libmount)"
+#else
+# define WITH_LIBMOUNT ""
+#endif
+
 #define MAX_RETRIES 99
 
-int          verbose = 0;
-int          md_stripe_cache_size = 16384;
-char         *progname = NULL;
+int    verbose;
+int    version;
+char   *progname;
 
 void usage(FILE *out)
 {
-        fprintf(out, "%s v"LUSTRE_VERSION_STRING"\n", progname);
-        fprintf(out, "\nThis mount helper should only be invoked via the "
-                "mount (8) command,\ne.g. mount -t lustre dev dir\n\n");
-        fprintf(out, "usage: %s [-fhnv] [-o <mntopt>] <device> <mountpt>\n",
-                progname);
-        fprintf(out,
-                "\t<device>: the disk device, or for a client:\n"
-                "\t\t<mgmtnid>[:<altmgtnid>...]:/<filesystem>-client\n"
-                "\t<filesystem>: name of the Lustre filesystem (e.g. lustre1)\n"
-                "\t<mountpt>: filesystem mountpoint (e.g. /mnt/lustre)\n"
-                "\t-f|--fake: fake mount (updates /etc/mtab)\n"
-                "\t-o force|--force: force mount even if already in /etc/mtab\n"
-                "\t-h|--help: print this usage message\n"
-                "\t-n|--nomtab: do not update /etc/mtab after mount\n"
-                "\t-v|--verbose: print verbose config settings\n"
-                "\t<mntopt>: one or more comma separated of:\n"
-                "\t\t(no)flock,(no)user_xattr,(no)acl\n"
-                "\t\tabort_recov: abort server recovery handling\n"
-                "\t\tnosvc: only start MGC/MGS obds\n"
-                "\t\tnomgs: only start target obds, using existing MGS\n"
-                "\t\texclude=<ostname>[:<ostname>] : colon-separated list of "
-                "inactive OSTs (e.g. lustre-OST0001)\n"
-                "\t\tretry=<num>: number of times mount is retried by client\n"
-                "\t\tmd_stripe_cache_size=<num>: set the raid stripe cache "
-                "size for the underlying raid if present\n"
-                );
-        exit((out != stdout) ? EINVAL : 0);
+       fprintf(out,
+               "\nThis mount helper should only be invoked via the mount (8) command,\ne.g. mount -t lustre dev dir\n\n");
+       fprintf(out, "usage: %s [-fhnvV] [-o <srvopt>] <device> <mountpt>\n",
+               progname);
+       fprintf(out, "usage: %s [-fhnvV] [-o <cliopt>] <mgstarget> <mountpt>\n",
+               progname);
+       fprintf(out,
+               "\t<device>: the local disk device when mounting a server\n"
+               "\t<mgstarget>: the server MGS and filesystem for a client:\n"
+               "\t\t<mgsnid>[:<altmgsnid>...]:/<filesystem>[/<subdir>]\n"
+               "\t\t\t<mgsnid>: MGS LNet Node Identifier (e.g. mgs01@o2ib)\n"
+               "\t\t\t<filesystem>: Lustre filesystem name (e.g. lustre1)\n"
+               "\t\t\t<subdir>: subdirectory of the filesystem to mount\n"
+               "\t<mountpt>: filesystem mountpoint (e.g. /mnt/lustre)\n"
+               "\t-f|--fake: fake mount (only update /etc/mtab)\n"
+               "\t-o force|--force: force mount even if already in /etc/mtab\n"
+               "\t-h|--help: print this usage message\n"
+               "\t-n|--nomtab: do not update /etc/mtab after mount\n"
+               "\t-v|--verbose: print verbose config settings\n"
+               "\t-V|--version: output build version of the utility and exit\n"
+               "\tdefault options are marked below with '*'\n"
+               "\t\t(no)flock: disable* or enable POSIX flock support\n"
+               "\t\t(no)user_xattr: disable or enable* user xattr namespace\n"
+               "\t<srvopt>: one or more comma separated server options:\n"
+               "\t\t(no)acl: disable or enable* POSIX ACL support completely\n"
+               "\t\tabort_recov: abort server recovery handling\n"
+               "\t\tnosvc: only start MGC/MGS without starting MDS/OSS\n"
+               "\t\tnomgs: only start target MDS/OSS, using existing MGS\n"
+               "\t\tnoscrub: do NOT auto start OI scrub unless requested\n"
+               "\t\tskip_lfsck: do NOT auto resume paused/crashed LFSCK\n"
+               "\t\tmd_stripe_cache_size=<num>: set MD RAID device stripe cache size\n"
+               "\t<cliopt>: one or more comma separated client options:\n"
+               "\t\texclude=<ostname>[:<ostname>]: list of inactive OSTs (e.g. lustre-OST0001)\n"
+               "\t\tlocalflock: enable POSIX flock only on local client\n"
+               "\t\tretry=<num>: number of times mount is retried by client\n"
+#ifdef HAVE_GSS
+               "\t\tskpath=<file|directory>: path of keys to load into kernel keyring\n"
+#endif
+               "\t\t(no)user_fid2path: disable* or enable user $MOUNT/.lustre/fid access\n"
+               "\t\t(no)checksum: disable or enable* data checksums\n"
+               "\t\t(no)lruresize: disable or enable* LDLM dynamic LRU size\n"
+               "\t\t(no)lazystatfs: disable or enable* statfs to work if OST is unavailable\n"
+               "\t\t32bitapi: return only 32-bit inode numbers to userspace\n"
+               "\t\t(no)verbose: disable or enable* messages at filesystem (un,re)mount\n"
+#ifdef HAVE_LUSTRE_CRYPTO
+#ifdef HAVE_LIBKEYUTILS
+               "\t\ttest_dummy_encryption: enable test dummy encryption mode\n"
+#endif
+               "\t\tnoencrypt: disable client side encryption\n"
+#endif
+               );
+       exit((out != stdout) ? EINVAL : 0);
 }
 
 /* Get rid of symbolic hostnames for tcp, since kernel can't do lookups */
 #define MAXNIDSTR 1024
 static char *convert_hostnames(char *s1)
 {
-        char *converted, *s2 = 0, *c;
-        char sep;
-        int left = MAXNIDSTR;
-        lnet_nid_t nid;
-
-        converted = malloc(left);
-        if (converted == NULL) {
-                fprintf(stderr, "out of memory: needed %d bytes\n",
-                        MAXNIDSTR);
-                return NULL;
-        }
-        c = converted;
-        while ((left > 0) && (*s1 != '/')) {
-                s2 = strpbrk(s1, ",:");
-                if (!s2)
-                        goto out_free;
-                sep = *s2;
-                *s2 = '\0';
-                nid = libcfs_str2nid(s1);
-                *s2 = sep;                      /* back to original string */
-                if (nid == LNET_NID_ANY)
-                        goto out_free;
-                c += snprintf(c, left, "%s%c", libcfs_nid2str(nid), sep);
-                left = converted + MAXNIDSTR - c;
-                s1 = s2 + 1;
-        }
-        snprintf(c, left, "%s", s1);
-        return converted;
+       char *converted, *s2 = 0, *c;
+       char sep;
+       int left = MAXNIDSTR;
+       lnet_nid_t nid;
+
+       converted = malloc(left);
+       if (!converted) {
+               fprintf(stderr, "out of memory: needed %d bytes\n",
+                       MAXNIDSTR);
+               return NULL;
+       }
+       c = converted;
+       while ((left > 0) && (*s1 != '/')) {
+               s2 = strpbrk(s1, ",:");
+               if (!s2)
+                       goto out_free;
+               sep = *s2;
+               *s2 = '\0';
+               nid = libcfs_str2nid(s1);
+               *s2 = sep;                      /* back to original string */
+               if (nid == LNET_NID_ANY)
+                       goto out_free;
+               c += scnprintf(c, left, "%s%c", libcfs_nid2str(nid), sep);
+               left = converted + MAXNIDSTR - c;
+               s1 = s2 + 1;
+       }
+       snprintf(c, left, "%s", s1);
+       return converted;
 out_free:
-        fprintf(stderr, "%s: Can't parse NID '%s'\n", progname, s1);
-        free(converted);
-        return NULL;
+       fprintf(stderr, "%s: Can't parse NID '%s'\n", progname, s1);
+       free(converted);
+       return NULL;
 }
 
 /*****************************************************************************
@@ -141,348 +175,507 @@ out_free:
  *
  ****************************************************************************/
 struct opt_map {
-        const char *opt;        /* option name */
-        int inv;                /* true if flag value should be inverted */
-        int mask;               /* flag mask value */
+       const char *opt;        /* option name */
+       int inv;                /* true if flag value should be inverted */
+       int mask;               /* flag mask value */
 };
 
 static const struct opt_map opt_map[] = {
-  /*"optname", inv,ms_mask */
-  /* These flags are parsed by mount, not lustre */
-  { "defaults", 0, 0         },      /* default options */
-  { "remount",  0, MS_REMOUNT},      /* remount with different options */
-  { "rw",       1, MS_RDONLY },      /* read-write */
-  { "ro",       0, MS_RDONLY },      /* read-only */
-  { "exec",     1, MS_NOEXEC },      /* permit execution of binaries */
-  { "noexec",   0, MS_NOEXEC },      /* don't execute binaries */
-  { "suid",     1, MS_NOSUID },      /* honor suid executables */
-  { "nosuid",   0, MS_NOSUID },      /* don't honor suid executables */
-  { "dev",      1, MS_NODEV  },      /* interpret device files  */
-  { "nodev",    0, MS_NODEV  },      /* don't interpret devices */
-  { "sync",     0, MS_SYNCHRONOUS},  /* synchronous I/O */
-  { "async",    1, MS_SYNCHRONOUS},  /* asynchronous I/O */
-  { "atime",    1, MS_NOATIME  },    /* set file access time on read */
-  { "noatime",  0, MS_NOATIME  },    /* do not set file access time on read */
+/* these flags are parsed by mount, not Lustre */
+{ .opt = "async",   .mask = MS_SYNCHRONOUS, .inv = 1 }, /* asynchronous I/O */
+{ .opt = "atime",   .mask = MS_NOATIME,            .inv = 1 }, /* set access time */
+{ .opt = "auto" },                                     /* allow auto mount */
+{ .opt = "defaults" },                                 /* default options */
+{ .opt = "dev",            .mask = MS_NODEV,       .inv = 1 }, /* interpret devs */
+{ .opt = "exec",    .mask = MS_NOEXEC,     .inv = 1 }, /* allow execution */
+{ .opt = "loop" },
+{ .opt = "noatime", .mask = MS_NOATIME },              /* do not set atime */
+{ .opt = "noauto" },                                   /* mount explicitly */
+{ .opt = "nodev",   .mask = MS_NODEV },                        /* no interpret devs */
+{ .opt = "noowner",                        .inv = 1 }, /* no special privs */
+{ .opt = "nosuid",  .mask = MS_NOSUID },               /* do not honor suid */
+{ .opt = "nouser",                         .inv = 1 }, /* users cannot mount */
+{ .opt = "nousers",                        .inv = 1 }, /* users cannot mount */
+{ .opt = "_netdev" },                                  /* network only */
+{ .opt = "noexec",  .mask = MS_NOEXEC },               /* no execute */
+{ .opt = "remount", .mask = MS_REMOUNT },              /* remount */
+{ .opt = "ro",     .mask = MS_RDONLY },                /* read-only */
+{ .opt = "rw",     .mask = MS_RDONLY,      .inv = 1 }, /* read-write */
+{ .opt = "suid",    .mask = MS_NOSUID,     .inv = 1 }, /* honor suid */
+{ .opt = "sync",    .mask = MS_SYNCHRONOUS },          /* synchronous I/O */
 #ifdef MS_NODIRATIME
-  { "diratime", 1, MS_NODIRATIME },  /* set file access time on read */
-  { "nodiratime",0,MS_NODIRATIME },  /* do not set file access time on read */
+{ .opt = "diratime",                                   /* set access time */
+                   .mask = MS_NODIRATIME,  .inv = 1 }, /* on read */
+{ .opt = "nodiratime",                                 /* do not set access */
+                   .mask = MS_NODIRATIME },            /* time on read */
 #endif
 #ifdef MS_RELATIME
-  { "relatime", 0, MS_RELATIME },  /* set file access time on read */
-  { "norelatime",1,MS_RELATIME },  /* do not set file access time on read */
+{ .opt = "norelatime",                                 /* do not set rel */
+                   .mask = MS_RELATIME,    .inv = 1 }, /* access time */
+{ .opt = "relatime",                                   /* set relative */
+                   .mask = MS_RELATIME },              /* access time */
 #endif
 #ifdef MS_STRICTATIME
-  { "strictatime",0,MS_STRICTATIME },  /* update access time strictly */
+{ .opt = "strictatime",
+                   .mask = MS_STRICTATIME },           /* strict access time */
 #endif
-  { "auto",     0, 0         },      /* Can be mounted using -a */
-  { "noauto",   0, 0         },      /* Can only be mounted explicitly */
-  { "nousers",  1, 0         },      /* Forbid ordinary user to mount */
-  { "nouser",   1, 0         },      /* Forbid ordinary user to mount */
-  { "noowner",  1, 0         },      /* Device owner has no special privs */
-  { "_netdev",  0, 0         },      /* Device accessible only via network */
-  { "loop",     0, 0         },
-  { NULL,       0, 0         }
-};
+{ .opt = NULL } };
 /****************************************************************************/
 
-/* 1  = don't pass on to lustre
-   0  = pass on to lustre */
+/*
+ * 1  = don't pass on to lustre
+ * 0  = pass on to lustre
+ */
 static int parse_one_option(const char *check, int *flagp)
 {
-        const struct opt_map *opt;
-
-        for (opt = &opt_map[0]; opt->opt != NULL; opt++) {
-                if (strncmp(check, opt->opt, strlen(opt->opt)) == 0) {
-                        if (opt->mask) {
-                                if (opt->inv)
-                                        *flagp &= ~(opt->mask);
-                                else
-                                        *flagp |= opt->mask;
-                        }
-                        return 1;
-                }
-        }
-        /* Assume any unknown options are valid and pass them on.  The mount
-           will fail if lmd_parse, ll_options or ldiskfs doesn't recognize it.*/
-        return 0;
+       const struct opt_map *opt;
+
+       for (opt = &opt_map[0]; opt->opt != NULL; opt++) {
+               if (strncmp(check, opt->opt, strlen(opt->opt)) == 0) {
+                       if (opt->mask) {
+                               if (opt->inv)
+                                       *flagp &= ~(opt->mask);
+                               else
+                                       *flagp |= opt->mask;
+                       }
+                       return 1;
+               }
+       }
+       /*
+        * Assume any unknown options are valid and pass them on.  The mount
+        * will fail if lmd_parse, ll_options or ldiskfs doesn't recognize it.
+        */
+       return 0;
 }
 
-static void append_option(char *options, const char *one)
+static size_t merge_strings(char *dst, const char *src, size_t size)
 {
-        if (*options)
-                strcat(options, ",");
-        strcat(options, one);
+       size_t dsize = strlen(dst);
+       size_t len = strlen(src);
+       size_t ret = dsize + len;
+
+       dst  += dsize;
+       size -= dsize;
+       if (len >= size)
+               len = size - 1;
+       memcpy(dst, src, len);
+       dst[len] = '\0';
+       return ret;
+}
+
+static int append_option(char *options, size_t options_len,
+                        const char *param, const char *value)
+{
+       int rc;
+
+       if (options[0] != '\0') {
+               rc = merge_strings(options, ",", options_len);
+               if (rc >= options_len)
+                       goto out_err;
+       }
+
+       rc = merge_strings(options, param, options_len);
+       if (rc >= options_len)
+               goto out_err;
+
+       if (value) {
+               rc = merge_strings(options, value, options_len);
+               if (rc >= options_len)
+                       goto out_err;
+       }
+       return 0;
+out_err:
+       fprintf(stderr, "error: mount options %s%s too long\n", param, value);
+       return E2BIG;
 }
 
-/* Replace options with subset of Lustre-specific options, and
-   fill in mount flags */
-int parse_options(struct mount_opts *mop, char *orig_options, int *flagp)
+/*
+ * Replace options with subset of Lustre-specific options, and
+ * fill in mount flags
+ */
+int parse_options(struct mount_opts *mop, char *orig_options,
+                 int *flagp, size_t options_len)
 {
-        char *options, *opt, *nextopt, *arg, *val;
-
-        options = calloc(strlen(orig_options) + 1, 1);
-        *flagp = 0;
-        nextopt = orig_options;
-        while ((opt = strsep(&nextopt, ","))) {
-                if (!*opt)
-                        /* empty option */
-                        continue;
-
-                /* Handle retries in a slightly different
-                 * manner */
-                arg = opt;
-                val = strchr(opt, '=');
-                /* please note that some ldiskfs mount options are also in the form
-                 * of param=value. We should pay attention not to remove those
-                 * mount options, see bug 22097. */
-                if (val && strncmp(arg, "md_stripe_cache_size", 20) == 0) {
-                        md_stripe_cache_size = atoi(val + 1);
-                } else if (val && strncmp(arg, "retry", 5) == 0) {
+       char *options, *opt, *nextopt, *arg, *val;
+       int rc = 0;
+
+       options = calloc(strlen(orig_options) + 1, 1);
+       if (!options)
+               return ENOMEM;
+
+       *flagp = 0;
+       nextopt = orig_options;
+       while ((opt = strsep(&nextopt, ","))) {
+               if (!*opt)
+                       /* empty option */
+                       continue;
+
+               /* Handle retries in a slightly different manner */
+               arg = opt;
+               val = strchr(opt, '=');
+               /*
+                * please note that some ldiskfs mount options are also in
+                * the form of param=value. We should pay attention not to
+                * remove those mount options, see bug 22097.
+                */
+               if (val && strncmp(arg, "max_sectors_kb", 14) == 0) {
+                       mop->mo_max_sectors_kb = atoi(val + 1);
+               } else if (val &&
+                          strncmp(arg, "md_stripe_cache_size", 20) == 0) {
+                       mop->mo_md_stripe_cache_size = atoi(val + 1);
+               } else if (val && strncmp(arg, "retry", 5) == 0) {
                        mop->mo_retry = atoi(val + 1);
                        if (mop->mo_retry > MAX_RETRIES)
                                mop->mo_retry = MAX_RETRIES;
                        else if (mop->mo_retry < 0)
                                mop->mo_retry = 0;
-                } else if (val && strncmp(arg, "mgssec", 6) == 0) {
-                        append_option(options, opt);
-                } else if (strcmp(opt, "force") == 0) {
-                        //XXX special check for 'force' option
+               } else if (val && strncmp(arg, "mgssec", 6) == 0) {
+                       rc = append_option(options, options_len, opt, NULL);
+                       if (rc != 0)
+                               goto out_options;
+               } else if (strncmp(arg, "nosvc", 5) == 0) {
+                       mop->mo_nosvc = 1;
+                       rc = append_option(options, options_len, opt, NULL);
+                       if (rc != 0)
+                               goto out_options;
+               } else if (strcmp(opt, "force") == 0) {
+                       /* XXX special check for 'force' option */
                        ++mop->mo_force;
                        printf("force: %d\n", mop->mo_force);
-                } else if (parse_one_option(opt, flagp) == 0) {
-                        /* pass this on as an option */
-                        append_option(options, opt);
-                }
-        }
+#ifdef HAVE_GSS
+               } else if (val && strncmp(opt, "skpath=", 7) == 0) {
+                       if (strlen(val) + 1 >= sizeof(mop->mo_skpath)) {
+                               fprintf(stderr,
+                                       "%s: shared key path too long\n",
+                                       progname);
+                               free(options);
+                               return EINVAL;
+                       }
+                       strncpy(mop->mo_skpath, val + 1,
+                               sizeof(mop->mo_skpath) - 1);
+#endif
+#ifdef HAVE_LUSTRE_CRYPTO
+               } else if (strncmp(arg, "test_dummy_encryption", 21) == 0) {
+#ifdef HAVE_LIBKEYUTILS
+                       /* Using dummy encryption mode requires inserting a
+                        * special dummy key into the session keyring.
+                        * Key type is "logon", key description is
+                        * "fscrypt:4242424242424242", and key payload has to be
+                        * in the form <mode><raw><size>, where:
+                        * <mode> is "\x00\x00\x00\x00"
+                        * <raw> is "$(printf ""\\\\x%02x"" {0..63})"
+                        * <size> is "\x40\x00\x00\x00" for little endian,
+                        * "\x00\x00\x00\x40" for big endian.
+                        */
+                       char payload[72];
+                       int *p = (int *)payload;
+                       char *q = (char *)(p + 1);
+                       int i = 0;
+                       key_serial_t key;
+
+                       *p = 0;
+                       while (i < 0x40)
+                               *(q++) = i++;
+                       p = (int *)q;
+                       *p = 0x40;
+
+                       key = add_key("logon", "fscrypt:4242424242424242",
+                                     (const void *)payload, sizeof(payload),
+                                     KEY_SPEC_SESSION_KEYRING);
+
+                       if (key == -1) {
+                               fprintf(stderr,
+                                       "%s: test dummy encryption option ignored: could not insert dummy encryption key into session keyring\n",
+                                       progname);
+                       } else {
+                               /* pass this on as an option */
+                               rc = append_option(options, options_len, opt,
+                                                  NULL);
+                               if (rc != 0)
+                                       goto out_options;
+                       }
+#else /* HAVE_LIBKEYUTILS */
+                       fprintf(stderr,
+                               "%s: test dummy encryption option ignored: Lustre not built with libkeyutils support\n",
+                               progname);
+#endif
+#endif
+               } else if (parse_one_option(opt, flagp) == 0) {
+                       /* pass this on as an option */
+                       rc = append_option(options, options_len, opt, NULL);
+                       if (rc != 0)
+                               goto out_options;
+               }
+       }
 #ifdef MS_STRICTATIME
-                /* set strictatime to default if NOATIME or RELATIME
-                   not given explicit */
-        if (!(*flagp & (MS_NOATIME | MS_RELATIME)))
-                *flagp |= MS_STRICTATIME;
+#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(3, 2, 53, 0)
+       /*
+        * LU-1783
+        * In the future when upstream fixes land in all supported kernels
+        * we should stop forcing MS_STRICTATIME in lustre mounts.
+        * We override the kernel level default of MS_RELATIME for now
+        * due to a kernel vfs level bug in atime updates that fails
+        * to reset timestamps from the future.
+        */
+#warn "remove MS_STRICTATIME override if kernel updates atime from the future"
 #endif
-        strcpy(orig_options, options);
-        free(options);
-        return 0;
-}
+       /*
+        * set strictatime to default if NOATIME or RELATIME
+        * not given explicit
+        */
+       if (!(*flagp & (MS_NOATIME | MS_RELATIME)))
+               *flagp |= MS_STRICTATIME;
+#endif
+       strcpy(orig_options, options);
 
+out_options:
+       free(options);
+       return rc;
+}
 
-int read_file(char *path, char *buf, int size)
+#ifdef HAVE_SERVER_SUPPORT
+/* Add mgsnids from ldd params */
+static int add_mgsnids(struct mount_opts *mop, char *options,
+                      const char *params, size_t options_len)
 {
-        FILE *fd;
-
-        fd = fopen(path, "r");
-        if (fd == NULL)
-                return errno;
-
-        /* should not ignore fgets(3)'s return value */
-        if (!fgets(buf, size, fd)) {
-                fprintf(stderr, "reading from %s: %s", path, strerror(errno));
-                fclose(fd);
-                return 1;
-        }
-        fclose(fd);
-        return 0;
+       char *ptr = (char *)params;
+       char tmp, *sep;
+       int rc = 0;
+
+       while ((ptr = strstr(ptr, PARAM_MGSNODE)) != NULL) {
+               sep = strchr(ptr, ' ');
+               if (sep) {
+                       tmp = *sep;
+                       *sep = '\0';
+               }
+               rc = append_option(options, options_len, ptr, NULL);
+               if (rc != 0)
+                       goto out;
+               mop->mo_have_mgsnid++;
+               if (sep) {
+                       *sep = tmp;
+                       ptr = sep;
+               } else {
+                       break;
+               }
+       }
+
+out:
+       return rc;
 }
 
-int write_file(char *path, char *buf)
+static int clear_update_ondisk(char *source, struct lustre_disk_data *ldd)
 {
-        FILE *fd;
+       char wanted_mountopts[512] = "";
+       struct mkfs_opts mkop;
+       int ret;
+       int ret2;
+
+       memset(&mkop, 0, sizeof(mkop));
+       mkop.mo_ldd = *ldd;
+       mkop.mo_ldd.ldd_flags &= ~LDD_F_UPDATE;
+       mkop.mo_flags = MO_NOHOSTID_CHECK; /* Ignore missing hostid */
+       if (strlen(source) > sizeof(mkop.mo_device) - 1) {
+               fatal();
+               fprintf(stderr, "Device name too long: %s\n", source);
+               return -E2BIG;
+       }
+       strncpy(mkop.mo_device, source, sizeof(mkop.mo_device));
+
+       ret = osd_prepare_lustre(&mkop,
+                                wanted_mountopts, sizeof(wanted_mountopts));
+       if (ret) {
+               fatal();
+               fprintf(stderr, "Can't prepare device %s: %s\n",
+                       source, strerror(ret));
+               return ret;
+       }
+
+       /* Create the loopback file */
+       if (mkop.mo_flags & MO_IS_LOOP) {
+               ret = access(mkop.mo_device, F_OK);
+               if (ret) {
+                       ret = errno;
+                       fatal();
+                       fprintf(stderr, "Can't access device %s: %s\n",
+                               source, strerror(ret));
+                       return ret;
+               }
+
+               ret = loop_setup(&mkop);
+               if (ret) {
+                       fatal();
+                       fprintf(stderr, "Loop device setup for %s failed: %s\n",
+                               mkop.mo_device, strerror(ret));
+                       return ret;
+               }
+       }
+       ret = osd_write_ldd(&mkop);
+       if (ret != 0) {
+               fatal();
+               fprintf(stderr, "failed to write local files: %s\n",
+                       strerror(ret));
+       }
 
-        fd = fopen(path, "w");
-        if (fd == NULL)
-                return errno;
+       ret2 = loop_cleanup(&mkop);
+       if (ret == 0)
+               ret = ret2;
 
-        fputs(buf, fd);
-        fclose(fd);
-        return 0;
+       return ret;
 }
 
-/* This is to tune the kernel for good SCSI performance.
- * For that we set the value of /sys/block/{dev}/queue/max_sectors_kb
- * to the value of /sys/block/{dev}/queue/max_hw_sectors_kb */
-int set_blockdev_tunables(char *source, int fan_out)
+static int parse_ldd(char *source, struct mount_opts *mop,
+                    char *options, size_t options_len)
 {
-        glob_t glob_info = { 0 };
-        struct stat stat_buf;
-        char *chk_major, *chk_minor;
-        char *savept = NULL, *dev;
-        char *ret_path;
-        char buf[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
-        char real_path[PATH_MAX] = {'\0'};
-        int i, rc = 0;
-        int major, minor;
-
-        if (!source)
-                return -EINVAL;
-
-        ret_path = realpath(source, real_path);
-        if (ret_path == NULL) {
-                if (verbose)
-                        fprintf(stderr, "warning: %s: cannot resolve: %s\n",
-                                source, strerror(errno));
-                return -EINVAL;
-        }
-
-        if (strncmp(real_path, "/dev/loop", 9) == 0)
-                return 0;
-
-        if ((real_path[0] != '/') && (strpbrk(real_path, ",:") != NULL))
-                return 0;
-
-        snprintf(path, sizeof(path), "/sys/block%s", real_path + 4);
-        if (access(path, X_OK) == 0)
-                goto set_params;
-
-        /* The name of the device say 'X' specified in /dev/X may not
-         * match any entry under /sys/block/. In that case we need to
-         * match the major/minor number to find the entry under
-         * sys/block corresponding to /dev/X */
-
-        /* Don't chop tail digit on /dev/mapper/xxx, LU-478 */
-        if (strncmp(real_path, "/dev/mapper", 11) != 0) {
-                dev = real_path + strlen(real_path);
-                while (--dev > real_path && isdigit(*dev))
-                        *dev = 0;
-
-                if (strncmp(real_path, "/dev/md_", 8) == 0)
-                        *dev = 0;
-        }
-
-        rc = stat(real_path, &stat_buf);
-        if (rc) {
-                if (verbose)
-                        fprintf(stderr, "warning: %s, device %s stat failed\n",
-                                strerror(errno), real_path);
-                return rc;
-        }
-
-        major = major(stat_buf.st_rdev);
-        minor = minor(stat_buf.st_rdev);
-        rc = glob("/sys/block/*", GLOB_NOSORT, NULL, &glob_info);
-        if (rc) {
-                if (verbose)
-                        fprintf(stderr, "warning: failed to read entries under "
-                                "/sys/block\n");
-                globfree(&glob_info);
-                return rc;
-        }
-
-        for (i = 0; i < glob_info.gl_pathc; i++){
-                snprintf(path, sizeof(path), "%s/dev", glob_info.gl_pathv[i]);
-
-                rc = read_file(path, buf, sizeof(buf));
-                if (rc)
-                        continue;
-
-                if (buf[strlen(buf) - 1] == '\n')
-                        buf[strlen(buf) - 1] = '\0';
-
-                chk_major = strtok_r(buf, ":", &savept);
-                chk_minor = savept;
-                if (major == atoi(chk_major) &&minor == atoi(chk_minor))
-                        break;
-        }
-
-        if (i == glob_info.gl_pathc) {
-                if (verbose)
-                        fprintf(stderr,"warning: device %s does not match any "
-                                "entry under /sys/block\n", real_path);
-                globfree(&glob_info);
-                return -EINVAL;
-        }
-
-        /* Chop off "/dev" from path we found */
-        path[strlen(glob_info.gl_pathv[i])] = '\0';
-        globfree(&glob_info);
-
-set_params:
-        if (strncmp(real_path, "/dev/md", 7) == 0) {
-                snprintf(real_path, sizeof(real_path), "%s/%s", path,
-                         STRIPE_CACHE_SIZE);
-
-                rc = read_file(real_path, buf, sizeof(buf));
-                if (rc) {
-                        if (verbose)
-                                fprintf(stderr, "warning: opening %s: %s\n",
-                                        real_path, strerror(errno));
-                        return 0;
-                }
-
-                if (atoi(buf) >= md_stripe_cache_size)
-                        return 0;
-
-                if (strlen(buf) - 1 > 0) {
-                        snprintf(buf, sizeof(buf), "%d", md_stripe_cache_size);
-                        rc = write_file(real_path, buf);
-                        if (rc && verbose)
-                                fprintf(stderr, "warning: opening %s: %s\n",
-                                        real_path, strerror(errno));
-                }
-                /* Return since raid and disk tunables are different */
-                return rc;
-        }
-
-        snprintf(real_path, sizeof(real_path), "%s/%s", path,
-                 MAX_HW_SECTORS_KB_PATH);
-        rc = read_file(real_path, buf, sizeof(buf));
-        if (rc) {
-                if (verbose)
-                        fprintf(stderr, "warning: opening %s: %s\n",
-                                real_path, strerror(errno));
-                /* No MAX_HW_SECTORS_KB_PATH isn't necessary an
-                 * error for some device. */
-                rc = 0;
-        }
-
-        if (strlen(buf) - 1 > 0) {
-                snprintf(real_path, sizeof(real_path), "%s/%s", path,
-                         MAX_SECTORS_KB_PATH);
-                rc = write_file(real_path, buf);
-                if (rc) {
-                        if (verbose)
-                                fprintf(stderr, "warning: writing to %s: %s\n",
-                                        real_path, strerror(errno));
-                        /* No MAX_SECTORS_KB_PATH isn't necessary an
-                         * error for some device. */
-                        rc = 0;
-                }
-        }
-
-        if (fan_out) {
-                char *slave = NULL;
-                glob_info.gl_pathc = 0;
-                glob_info.gl_offs = 0;
-                /* if device is multipath device, tune its slave devices */
-                snprintf(real_path, sizeof(real_path), "%s/slaves/*", path);
-                rc = glob(real_path, GLOB_NOSORT, NULL, &glob_info);
-
-                for (i = 0; rc == 0 && i < glob_info.gl_pathc; i++){
-                        slave = basename(glob_info.gl_pathv[i]);
-                        snprintf(real_path, sizeof(real_path), "/dev/%s", slave);
-                        rc = set_blockdev_tunables(real_path, 0);
-                }
-
-                if (rc == GLOB_NOMATCH) {
-                        /* no slave device is not an error */
-                        rc = 0;
-                } else if (rc && verbose) {
-                        if (slave == NULL) {
-                                fprintf(stderr, "warning: %s, failed to read"
-                                        " entries under %s/slaves\n",
-                                        strerror(errno), path);
-                        } else {
-                                fprintf(stderr, "unable to set tunables for"
-                                        " slave device %s (slave would be"
-                                        " unable to handle IO request from"
-                                        " master %s)\n",
-                                        real_path, source);
-                        }
-                }
-                globfree(&glob_info);
-        }
-
-        return rc;
+       struct lustre_disk_data *ldd = &mop->mo_ldd;
+       char *cur, *start;
+       char *temp_options;
+       int rc = 0;
+
+       rc = osd_is_lustre(source, &ldd->ldd_mount_type);
+       if (rc == 0) {
+               fprintf(stderr,
+                       "%s: %s has not been formatted with mkfs.lustre or the backend filesystem type is not supported by this tool\n",
+                       progname, source);
+               return ENODEV;
+       }
+
+       rc = osd_read_ldd(source, ldd);
+       if (rc) {
+               fprintf(stderr,
+                       "%s: %s failed to read permanent mount data: %s\n",
+                       progname, source, rc >= 0 ? strerror(rc) : "");
+               return rc;
+       }
+
+       if ((IS_MDT(ldd) || IS_OST(ldd)) &&
+           (ldd->ldd_flags & LDD_F_NEED_INDEX)) {
+               fprintf(stderr,
+                       "%s: %s has no index assigned (probably formatted with old mkfs)\n",
+                       progname, source);
+               return EINVAL;
+       }
+
+       if (ldd->ldd_flags & LDD_F_UPDATE)
+               clear_update_ondisk(source, ldd);
+
+       /* Since we never rewrite ldd, ignore temp flags */
+       ldd->ldd_flags &= ~(LDD_F_VIRGIN | LDD_F_WRITECONF |
+                           LDD_F_NO_LOCAL_LOGS);
+
+       /* This is to make sure default options go first */
+       temp_options = strdup(options);
+       if (!temp_options) {
+               fprintf(stderr, "%s: can't allocate memory for temp_options\n",
+                       progname);
+               return ENOMEM;
+       }
+       strncpy(options, ldd->ldd_mount_opts, options_len);
+       rc = append_option(options, options_len, temp_options, NULL);
+       free(temp_options);
+       if (rc != 0)
+               return rc;
+
+       /* svname of the form lustre:OST1234 means never registered */
+       rc = strlen(ldd->ldd_svname);
+       if (strcmp(ldd->ldd_svname, "MGS") != 0) {
+               if (rc < 8) {
+                       fprintf(stderr, "%s: invalid name '%s'\n",
+                               progname, ldd->ldd_svname);
+                       return EINVAL;
+               } else if (ldd->ldd_svname[rc - 8] == ':') {
+                       ldd->ldd_svname[rc - 8] = '-';
+                       ldd->ldd_flags |= LDD_F_VIRGIN;
+               } else if (ldd->ldd_svname[rc - 8] == '=') {
+                       ldd->ldd_svname[rc - 8] = '-';
+                       ldd->ldd_flags |= LDD_F_WRITECONF;
+               } else if (ldd->ldd_svname[rc - 8] == '+') {
+                       ldd->ldd_svname[rc - 8] = '-';
+                       ldd->ldd_flags |= LDD_F_NO_LOCAL_LOGS;
+               }
+       }
+       /* backend osd type */
+       rc = append_option(options, options_len, "osd=",
+                          mt_type(ldd->ldd_mount_type));
+       if (rc != 0)
+               return rc;
+
+       if (!mop->mo_have_mgsnid) {
+               /*
+                * Only use disk data if mount -o mgsnode=nid wasn't
+                * specified
+                */
+               if (ldd->ldd_flags & LDD_F_SV_TYPE_MGS) {
+                       rc = append_option(options, options_len, "mgs", NULL);
+                       if (rc != 0)
+                               return rc;
+                       mop->mo_have_mgsnid++;
+               } else {
+                       if (add_mgsnids(mop, options, ldd->ldd_params,
+                                       options_len))
+                               return E2BIG;
+               }
+       }
+       /* Better have an mgsnid by now */
+       if (!mop->mo_have_mgsnid) {
+               fprintf(stderr, "%s: missing option mgsnode=<nid>\n",
+                       progname);
+               return EINVAL;
+       }
+
+       if (ldd->ldd_flags & LDD_F_VIRGIN) {
+               rc = append_option(options, options_len, "virgin", NULL);
+               if (rc != 0)
+                       return rc;
+       }
+       if (ldd->ldd_flags & LDD_F_UPDATE) {
+               rc = append_option(options, options_len, "update", NULL);
+               if (rc != 0)
+                       return rc;
+       }
+       if (ldd->ldd_flags & LDD_F_WRITECONF) {
+               rc = append_option(options, options_len, "writeconf", NULL);
+               if (rc != 0)
+                       return rc;
+       }
+       if (ldd->ldd_flags & LDD_F_NO_LOCAL_LOGS) {
+               rc = append_option(options, options_len, "nolocallogs", NULL);
+               if (rc != 0)
+                       return rc;
+       }
+       if (ldd->ldd_flags & LDD_F_NO_PRIMNODE) {
+               rc = append_option(options, options_len, "noprimnode", NULL);
+               if (rc != 0)
+                       return rc;
+       }
+
+       /*
+        * prefix every lustre parameter with param= so that in-kernel
+        * mount can recognize them properly and send to MGS at registration
+        */
+       start = ldd->ldd_params;
+       while (start && *start != '\0') {
+               while (*start == ' ')
+                       start++;
+               if (*start == '\0')
+                       break;
+               cur = start;
+               start = strchr(cur, ' ');
+               if (start) {
+                       *start = '\0';
+                       start++;
+               }
+               rc = append_option(options, options_len, "param=", cur);
+               if (rc != 0)
+                       return rc;
+       }
+
+       /* svname must be last option */
+       rc = append_option(options, options_len, "svname=", ldd->ldd_svname);
+
+       return rc;
 }
+#endif /* HAVE_SERVER_SUPPORT */
 
 static void set_defaults(struct mount_opts *mop)
 {
@@ -496,19 +689,21 @@ static void set_defaults(struct mount_opts *mop)
        mop->mo_have_mgsnid = 0;
        mop->mo_md_stripe_cache_size = 16384;
        mop->mo_orig_options = "";
+       mop->mo_nosvc = 0;
+       mop->mo_max_sectors_kb = -1;
 }
 
 static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
 {
-       static struct option long_opt[] = {
-               {"fake", 0, 0, 'f'},
-               {"force", 0, 0, 1},
-               {"help", 0, 0, 'h'},
-               {"nomtab", 0, 0, 'n'},
-               {"options", 1, 0, 'o'},
-               {"verbose", 0, 0, 'v'},
-               {0, 0, 0, 0}
-       };
+       static struct option long_opts[] = {
+       { .val = 1,     .name = "force",        .has_arg = no_argument },
+       { .val = 'f',   .name = "fake",         .has_arg = no_argument },
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'n',   .name = "nomtab",       .has_arg = no_argument },
+       { .val = 'o',   .name = "options",      .has_arg = required_argument },
+       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
+       { .val = 'V',   .name = "version",      .has_arg = no_argument },
+       { .name = NULL } };
        char real_path[PATH_MAX] = {'\0'};
        FILE *f;
        char path[256], name[256];
@@ -516,8 +711,8 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
        char *ptr;
        int opt, rc;
 
-       while ((opt = getopt_long(argc, argv, "fhno:v",
-                                 long_opt, NULL)) != EOF){
+       while ((opt = getopt_long(argc, argv, "fhno:vV",
+                                 long_opts, NULL)) != EOF){
                switch (opt) {
                case 1:
                        ++mop->mo_force;
@@ -540,9 +735,14 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
                case 'v':
                        ++verbose;
                        break;
+               case 'V':
+                       ++version;
+                       fprintf(stdout, "%s %s %s\n", progname,
+                               LUSTRE_VERSION_STRING, WITH_LIBMOUNT);
+                       return 0;
                default:
                        fprintf(stderr, "%s: unknown option '%c'\n",
-                                       progname, opt);
+                               progname, opt);
                        usage(stderr);
                        break;
                }
@@ -554,228 +754,371 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
        }
 
        mop->mo_usource = argv[optind];
-       if (!mop->mo_usource) {
+       if (!mop->mo_usource)
                usage(stderr);
-       }
 
        /**
         * Try to get the real path to the device, in case it is a
         * symbolic link for instance
         */
        if (realpath(mop->mo_usource, real_path) != NULL) {
-               mop->mo_usource = strdup(real_path);
-
                ptr = strrchr(real_path, '/');
-               if (ptr && strncmp(ptr, "/dm-", 4) == 0 && isdigit(*(ptr + 4))) {
-                       snprintf(path, sizeof(path), "/sys/block/%s/dm/name", ptr+1);
+               if (ptr && strncmp(ptr, "/dm-", 4) == 0 &&
+                   isdigit(*(ptr + 4))) {
+                       snprintf(path, sizeof(path), "/sys/block/%s/dm/name",
+                                ptr + 1);
                        if ((f = fopen(path, "r"))) {
                                /* read "<name>\n" from sysfs */
-                               if (fgets(name, sizeof(name), f) && (sz = strlen(name)) > 1) {
+                               if (fgets(name, sizeof(name), f) &&
+                                   (sz = strlen(name)) > 1) {
                                        name[sz - 1] = '\0';
-                                       snprintf(real_path, sizeof(real_path), "/dev/mapper/%s", name);
+                                       snprintf(real_path, sizeof(real_path),
+                                                "/dev/mapper/%s", name);
                                }
                                fclose(f);
                        }
                }
+               mop->mo_usource = strdup(real_path);
        }
 
-       mop->mo_source = convert_hostnames(mop->mo_usource);
-       if (!mop->mo_source) {
-               usage(stderr);
+       ptr = strstr(mop->mo_usource, ":/");
+       if (ptr) {
+               mop->mo_source = convert_hostnames(mop->mo_usource);
+               if (!mop->mo_source)
+                       usage(stderr);
+       } else {
+               mop->mo_source = strdup(mop->mo_usource);
        }
 
        if (realpath(argv[optind + 1], mop->mo_target) == NULL) {
                rc = errno;
                fprintf(stderr, "warning: %s: cannot resolve: %s\n",
-                               argv[optind + 1], strerror(errno));
+                       argv[optind + 1], strerror(errno));
                return rc;
        }
 
        return 0;
 }
 
+#ifdef HAVE_SERVER_SUPPORT
+/*
+ * change label from <fsname>:<index> to
+ * <fsname>-<index> to indicate the device has
+ * been registered. only if the label is
+ * supposed to be changed and target service
+ * is supposed to start
+ */
+static void label_lustre(struct mount_opts *mop)
+{
+       if (mop->mo_nosvc)
+               return;
+
+       if (mop->mo_ldd.ldd_flags & (LDD_F_VIRGIN | LDD_F_WRITECONF |
+           LDD_F_NO_LOCAL_LOGS)) {
+               (void)osd_label_lustre(mop);
+       } else {
+               struct lustre_disk_data ldd;
+               int rc;
+
+               /*
+                * device label could be changed after journal recovery,
+                * it should also be relabeled for mount has succeeded.
+                */
+               memset(&ldd, 0, sizeof(ldd));
+               ldd.ldd_mount_type = mop->mo_ldd.ldd_mount_type;
+               rc = osd_read_ldd(mop->mo_source, &ldd);
+               if (rc == 0) {
+                       rc = strlen(ldd.ldd_svname);
+                       if (rc >= 8 && ldd.ldd_svname[rc - 8] != '-')
+                               (void)osd_label_lustre(mop);
+               }
+       }
+}
+#endif /* HAVE_SERVER_SUPPORT */
+
 int main(int argc, char *const argv[])
 {
        struct mount_opts mop;
-       char *options, *optcopy;
-       int i, rc, flags, optlen;
+       char *options;
+       int i, flags;
+       int rc;
+       bool client;
+       size_t maxopt_len;
+       size_t g_pagesize;
 
        progname = strrchr(argv[0], '/');
        progname = progname ? progname + 1 : argv[0];
 
        set_defaults(&mop);
 
+       g_pagesize = sysconf(_SC_PAGESIZE);
+       if (g_pagesize == -1) {
+               rc = errno;
+               printf("error: %d failed to get page size.\n", rc);
+               return rc;
+       }
+       maxopt_len = MIN(g_pagesize, 64 * 1024);
+
        rc = parse_opts(argc, argv, &mop);
-       if (rc)
+       if (rc || version)
                return rc;
 
-        if (verbose) {
-                for (i = 0; i < argc; i++)
-                        printf("arg[%d] = %s\n", i, argv[i]);
+       if (verbose) {
+               for (i = 0; i < argc; i++)
+                       printf("arg[%d] = %s\n", i, argv[i]);
                printf("source = %s (%s), target = %s\n", mop.mo_usource,
                       mop.mo_source, mop.mo_target);
                printf("options = %s\n", mop.mo_orig_options);
-        }
+       }
+
+       options = malloc(maxopt_len);
+       if (!options) {
+               fprintf(stderr, "can't allocate memory for options\n");
+               rc = ENOMEM;
+               goto out_mo_source;
+       }
+
+       if (strlen(mop.mo_orig_options) >= maxopt_len) {
+               fprintf(stderr, "error: mount options too long\n");
+               rc = E2BIG;
+               goto out_options;
+       }
 
-       options = malloc(strlen(mop.mo_orig_options) + 1);
-        if (options == NULL) {
-                fprintf(stderr, "can't allocate memory for options\n");
-                return -1;
-        }
        strcpy(options, mop.mo_orig_options);
-       rc = parse_options(&mop, options, &flags);
-        if (rc) {
-                fprintf(stderr, "%s: can't parse options: %s\n",
-                        progname, options);
-                return(EINVAL);
-        }
+       rc = parse_options(&mop, options, &flags, maxopt_len);
+       if (rc) {
+               fprintf(stderr, "%s: can't parse options: %s\n",
+                       progname, options);
+               goto out_options;
+       }
 
        if (!mop.mo_force) {
                rc = check_mtab_entry(mop.mo_usource, mop.mo_source,
                                      mop.mo_target, "lustre");
-                if (rc && !(flags & MS_REMOUNT)) {
-                        fprintf(stderr, "%s: according to %s %s is "
-                               "already mounted on %s\n", progname, MOUNTED,
-                               mop.mo_usource, mop.mo_target);
-                        return(EEXIST);
-                }
-                if (!rc && (flags & MS_REMOUNT)) {
-                        fprintf(stderr, "%s: according to %s %s is "
-                               "not already mounted on %s\n", progname, MOUNTED,
-                               mop.mo_usource, mop.mo_target);
-                        return(ENOENT);
-                }
-        }
-        if (flags & MS_REMOUNT)
+               if (rc && !(flags & MS_REMOUNT)) {
+                       fprintf(stderr,
+                               "%s: according to %s %s is already mounted on %s\n",
+                               progname, MOUNTED, mop.mo_usource,
+                               mop.mo_target);
+                       rc = EEXIST;
+                       goto out_options;
+               }
+               if (!rc && (flags & MS_REMOUNT)) {
+                       fprintf(stderr,
+                               "%s: according to %s %s is not already mounted on %s\n",
+                               progname, MOUNTED, mop.mo_usource,
+                               mop.mo_target);
+                       rc = ENOENT;
+                       goto out_options;
+               }
+       }
+       if (flags & MS_REMOUNT)
                mop.mo_nomtab++;
 
        rc = access(mop.mo_target, F_OK);
-        if (rc) {
-                rc = errno;
+       if (rc) {
+               rc = errno;
                fprintf(stderr, "%s: %s inaccessible: %s\n", progname,
                        mop.mo_target, strerror(errno));
-                return rc;
-        }
-
-        /* In Linux 2.4, the target device doesn't get passed to any of our
-           functions.  So we'll stick it on the end of the options. */
-       optlen = strlen(options) + strlen(",device=") + strlen(mop.mo_source) + 1;
-        optcopy = malloc(optlen);
-        if (optcopy == NULL) {
-                fprintf(stderr, "can't allocate memory to optcopy\n");
-                return -1;
-        }
-        strcpy(optcopy, options);
-        if (*optcopy)
-                strcat(optcopy, ",");
-        strcat(optcopy, "device=");
-       strcat(optcopy, mop.mo_source);
-
-        if (verbose)
-                printf("mounting device %s at %s, flags=%#x options=%s\n",
-                      mop.mo_source, mop.mo_target, flags, optcopy);
-
-       if (!strstr(mop.mo_usource, ":/") && set_blockdev_tunables(mop.mo_source, 1)) {
-                if (verbose)
-                        fprintf(stderr, "%s: unable to set tunables for %s"
-                                " (may cause reduced IO performance)\n",
+               goto out_options;
+       }
+
+       client = (strstr(mop.mo_usource, ":/") != NULL);
+       if (!client) {
+#ifdef HAVE_SERVER_SUPPORT
+               rc = osd_init();
+               if (rc)
+                       goto out_options;
+
+               rc = parse_ldd(mop.mo_source, &mop, options, maxopt_len);
+               if (rc)
+                       goto out_osd;
+#else
+               rc = EINVAL;
+               fprintf(stderr, "%s: cannot mount %s: no server support\n",
+                       progname, mop.mo_usource);
+               goto out_options;
+#endif
+       }
+
+       /*
+        * In Linux 2.4, the target device doesn't get passed to any of our
+        * functions.  So we'll stick it on the end of the options.
+        */
+       rc = append_option(options, maxopt_len, "device=", mop.mo_source);
+       if (rc != 0)
+               goto out_osd;
+
+       if (verbose)
+               printf("mounting device %s at %s, flags=%#x options=%s\n",
+                      mop.mo_source, mop.mo_target, flags, options);
+
+#ifdef HAVE_SERVER_SUPPORT
+       if (!client && osd_tune_lustre(mop.mo_source, &mop)) {
+               if (verbose)
+                       fprintf(stderr,
+                               "%s: unable to set tunables for %s (may cause reduced IO performance)\n",
                                argv[0], mop.mo_source);
-        }
+       }
+#endif
+#ifdef HAVE_GSS
+       if (mop.mo_skpath[0] != '\0') {
+               /* Treat shared key failures as fatal */
+               rc = load_shared_keys(&mop);
+               if (rc) {
+                       fprintf(stderr, "%s: Error loading shared keys: %s\n",
+                               progname, strerror(rc));
+                       goto out_osd;
+               }
+       }
+#endif /* HAVE_GSS */
 
        if (!mop.mo_fake) {
-                /* flags and target get to lustre_get_sb, but not
-                   lustre_fill_super.  Lustre ignores the flags, but mount
-                   does not. */
-                for (i = 0, rc = -EAGAIN; i <= mop.mo_retry && rc != 0; i++) {
-                       rc = mount(mop.mo_source, mop.mo_target, "lustre",
-                                  flags, (void *)optcopy);
-                        if (rc) {
-                                if (verbose) {
-                                        fprintf(stderr, "%s: mount %s at %s "
-                                                "failed: %s retries left: "
-                                                "%d\n", basename(progname),
+               char *fstype;
+
+               /* Prefer filesystem type given on mount command line
+                * so it appears correctly in the /proc/mounts output.
+                */
+               if (strstr(argv[0], "mount.lustre_tgt"))
+                       fstype = "lustre_tgt";
+               else
+                       fstype = "lustre";
+               /*
+                * flags and target get to lustre_get_sb(), but not
+                * lustre_fill_super().  Lustre ignores the flags, but mount
+                * does not.
+                */
+               for (i = 0, rc = -EAGAIN; i <= mop.mo_retry && rc != 0; i++) {
+                       rc = mount(mop.mo_source, mop.mo_target, fstype,
+                                  flags, (void *)options);
+                       if (rc != 0) {
+                               if (verbose) {
+                                       fprintf(stderr,
+                                               "%s: mount -t %s %s at %s failed: %s retries left: %d\n",
+                                               basename(progname), fstype,
                                                mop.mo_usource, mop.mo_target,
-                                                strerror(errno),
+                                               strerror(errno),
                                                mop.mo_retry - i);
-                                }
+                               }
+
+                               /* Pre-2.13 Lustre without 'lustre_tgt' type?
+                                * Try with 'lustre' instead.  Eventually this
+                                * can be removed (e.g. 2.18 or whenever).
+                                */
+                               if (errno == ENODEV &&
+                                   strcmp(fstype, "lustre_tgt") == 0) {
+                                       fstype = "lustre";
+                                       i--;
+                                       continue;
+                               }
 
-                                if (mop.mo_retry) {
-                                        sleep(1 << max((i/2), 5));
-                                }
-                                else {
-                                        rc = errno;
-                                }
-                        }
-                }
-        }
+                               if (mop.mo_retry) {
+                                       int limit = i / 2 > 5 ? i / 2 : 5;
 
-        if (rc) {
-                char *cli;
+                                       sleep(1 << limit);
+                               } else {
+                                       rc = errno;
+                               }
+#ifdef HAVE_SERVER_SUPPORT
+                       } else {
+                               if (!client)
+                                       label_lustre(&mop);
+#endif
+                       }
+               }
+       }
 
-                rc = errno;
+       if (rc) {
+               char *cli;
+
+               rc = errno;
 
                cli = strrchr(mop.mo_usource, ':');
-                if (cli && (strlen(cli) > 2))
-                        cli += 2;
-                else
-                        cli = NULL;
+               if (cli && (strlen(cli) > 2))
+                       cli += 2;
+               else
+                       cli = NULL;
 
-                fprintf(stderr, "%s: mount %s at %s failed: %s\n", progname,
+               fprintf(stderr, "%s: mount %s at %s failed: %s\n", progname,
                        mop.mo_usource, mop.mo_target, strerror(errno));
-                if (errno == ENODEV)
-                        fprintf(stderr, "Are the lustre modules loaded?\n"
-                                "Check /etc/modprobe.conf and "
-                                "/proc/filesystems\n");
-                if (errno == ENOTBLK)
-                        fprintf(stderr, "Do you need -o loop?\n");
-                if (errno == ENOMEDIUM)
-                        fprintf(stderr,
-                                "This filesystem needs at least 1 OST\n");
-                if (errno == ENOENT) {
-                        fprintf(stderr, "Is the MGS specification correct?\n");
-                        fprintf(stderr, "Is the filesystem name correct?\n");
-                        fprintf(stderr, "If upgrading, is the copied client log"
-                                " valid? (see upgrade docs)\n");
-                }
-                if (errno == EALREADY)
-                        fprintf(stderr, "The target service is already running."
-                               " (%s)\n", mop.mo_usource);
-                if (errno == ENXIO)
-                        fprintf(stderr, "The target service failed to start "
-                                "(bad config log?) (%s).  "
-                               "See /var/log/messages.\n", mop.mo_usource);
-                if (errno == EIO)
-                        fprintf(stderr, "Is the MGS running?\n");
-                if (errno == EADDRINUSE)
-                        fprintf(stderr, "The target service's index is already "
-                               "in use. (%s)\n", mop.mo_usource);
-                if (errno == EINVAL) {
-                        fprintf(stderr, "This may have multiple causes.\n");
-                        if (cli)
-                                fprintf(stderr, "Is '%s' the correct filesystem"
-                                        " name?\n", cli);
-                        fprintf(stderr, "Are the mount options correct?\n");
-                        fprintf(stderr, "Check the syslog for more info.\n");
-                }
-
-                /* May as well try to clean up loop devs */
+               if (errno == EBUSY)
+                       fprintf(stderr,
+                               "Is the backend filesystem mounted?\n Check /etc/mtab and /proc/mounts\n");
+               if (errno == ENODEV)
+                       fprintf(stderr,
+                               "Are the lustre modules loaded?\n Check /etc/modprobe.conf and /proc/filesystems\n");
+               if (errno == ENOTBLK)
+                       fprintf(stderr, "Do you need -o loop?\n");
+               if (errno == ENOMEDIUM)
+                       fprintf(stderr,
+                               "This filesystem needs at least 1 OST\n");
+               if (errno == ENOENT) {
+                       fprintf(stderr, "Is the MGS specification correct?\n");
+                       fprintf(stderr, "Is the filesystem name correct?\n");
+                       fprintf(stderr,
+                               "If upgrading, is the copied client log valid? (see upgrade docs)\n");
+               }
+               if (errno == EALREADY)
+                       fprintf(stderr,
+                               "The target service is already running. (%s)\n",
+                               mop.mo_usource);
+               if (errno == ENXIO)
+                       fprintf(stderr,
+                               "The target service failed to start (bad config log?) (%s).  See /var/log/messages.\n",
+                               mop.mo_usource);
+               if (errno == EIO)
+                       fprintf(stderr, "Is the MGS running?\n");
+               if (errno == EADDRINUSE)
+                       fprintf(stderr,
+                               "The target service's index is already in use. (%s)\n",
+                               mop.mo_usource);
+               if (errno == EINVAL) {
+                       fprintf(stderr, "This may have multiple causes.\n");
+                       if (cli)
+                               fprintf(stderr,
+                                       "Is '%s' the correct filesystem name?\n",
+                                       cli);
+                       fprintf(stderr, "Are the mount options correct?\n");
+                       fprintf(stderr, "Check the syslog for more info.\n");
+               }
+
+               /* May as well try to clean up loop devs */
                if (strncmp(mop.mo_usource, "/dev/loop", 9) == 0) {
-                        char cmd[256];
-                        int ret;
+                       char cmd[256];
+                       int ret;
+
                        sprintf(cmd, "/sbin/losetup -d %s", mop.mo_usource);
-                        if ((ret = system(cmd)) < 0)
-                                rc = errno;
-                        else if (ret > 0)
-                                rc = WEXITSTATUS(ret);
-                }
-
-       } else if (!mop.mo_nomtab) {
-               rc = update_mtab_entry(mop.mo_usource, mop.mo_target, "lustre",
-                                      mop.mo_orig_options, 0,0,0);
-        }
-
-        free(optcopy);
+                       if ((ret = system(cmd)) < 0)
+                               rc = errno;
+                       else if (ret > 0)
+                               rc = WEXITSTATUS(ret);
+               }
+
+       } else {
+               /*
+                * Deal with utab just for client. Note that we ignore
+                * the return value here since it is not worth to fail
+                * mount by prevent some rare cases
+                */
+               if (strstr(mop.mo_usource, ":/") != NULL)
+                       update_utab_entry(&mop);
+               if (!mop.mo_nomtab) {
+                       rc = update_mtab_entry(mop.mo_usource, mop.mo_target,
+                                              "lustre", mop.mo_orig_options,
+                                              0, 0, 0);
+               }
+       }
+
+out_osd:
+#ifdef HAVE_SERVER_SUPPORT
+       if (!client)
+               osd_fini();
+#endif
+out_options:
+       free(options);
+
+out_mo_source:
        /* mo_usource should be freed, but we can rely on the kernel */
        free(mop.mo_source);
-        return rc;
+       return rc;
 }