* 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/
#include <string.h>
#include <sys/mount.h>
#include <sys/param.h>
-#include <lustre_ver.h>
+#include <linux/lustre/lustre_ver.h>
#include <ctype.h>
#include <limits.h>
-#include <lnet/nidstr.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"
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 10, 53, 0)
-/*
- * LU-1783
- * We only #include a kernel level include file here because
- * important MS_ flag #defines are missing from the SLES version
- * of sys/mount.h
- * In the future if SLES updates sys/mount.h to have a more complete
- * set of flag #defines we should stop including linux/fs.h
- */
-#if !defined(MS_RDONLY)
-#include <linux/fs.h>
-#endif
-#endif
-
#ifdef HAVE_LIBMOUNT
# define WITH_LIBMOUNT "(libmount)"
#else
void usage(FILE *out)
{
- 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 <mntopt>] <device> <mountpt>\n",
+ 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 disk device, or for a client:\n"
+ "\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<filesystem>: name of the Lustre filesystem (e.g. lustre1)\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 (updates /etc/mtab)\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"
- "\t<mntopt>: one or more comma separated of:\n"
- "\t\t(no)flock,(no)user_xattr,(no)acl\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 obds\n"
- "\t\tnomgs: only start target obds, using existing MGS\n"
- "\t\tnoscrub: NOT auto start OI scrub unless start explicitly\n"
- "\t\tskip_lfsck: NOT auto resume the paused/crashed LFSCK\n"
- "\t\texclude=<ostname>[:<ostname>] : colon-separated list of "
- "inactive OSTs (e.g. lustre-OST0001)\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 to a file or directory of"
- "key configuration files to load into the kernel keyring\n"
+ "\t\tskpath=<file|directory>: path of keys to load into kernel keyring\n"
#endif
- "\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");
+ "\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);
}
#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;
}
/*****************************************************************************
*
****************************************************************************/
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[] = {
{ .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 size_t merge_strings(char *dst, const char *src, size_t size)
+{
+ 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 = strlcat(options, ",", options_len);
+ rc = merge_strings(options, ",", options_len);
if (rc >= options_len)
goto out_err;
}
- rc = strlcat(options, param, options_len);
+
+ rc = merge_strings(options, param, options_len);
if (rc >= options_len)
goto out_err;
- if (value != NULL) {
- rc = strlcat(options, value, options_len);
+
+ if (value) {
+ rc = merge_strings(options, value, options_len);
if (rc >= options_len)
goto out_err;
}
return E2BIG;
}
-/* Replace options with subset of Lustre-specific options, and
- fill in mount flags */
+/*
+ * 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)
{
int rc = 0;
options = calloc(strlen(orig_options) + 1, 1);
+ if (!options)
+ return ENOMEM;
+
*flagp = 0;
nextopt = orig_options;
while ((opt = strsep(&nextopt, ","))) {
/* empty option */
continue;
- /* Handle retries in a slightly different
- * manner */
+ /* Handle retries in a slightly different manner */
arg = opt;
val = strchr(opt, '=');
- /* please note that some ldiskfs mount options are also in
+ /*
+ * 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. */
+ * 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 &&
"%s: shared key path too long\n",
progname);
free(options);
- return -1;
+ return EINVAL;
}
- strncpy(mop->mo_skpath, val + 1, strlen(val + 1));
+ 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 */
*/
#warn "remove MS_STRICTATIME override if kernel updates atime from the future"
#endif
- /* set strictatime to default if NOATIME or RELATIME
- not given explicit */
+ /*
+ * set strictatime to default if NOATIME or RELATIME
+ * not given explicit
+ */
if (!(*flagp & (MS_NOATIME | MS_RELATIME)))
*flagp |= MS_STRICTATIME;
#endif
return rc;
}
+#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)
while ((ptr = strstr(ptr, PARAM_MGSNODE)) != NULL) {
sep = strchr(ptr, ' ');
- if (sep != NULL) {
+ if (sep) {
tmp = *sep;
*sep = '\0';
}
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) {
+ if (strlen(source) > sizeof(mkop.mo_device) - 1) {
fatal();
fprintf(stderr, "Device name too long: %s\n", source);
return -E2BIG;
ret = errno;
fatal();
fprintf(stderr, "Can't access device %s: %s\n",
- source, strerror(ret));
+ source, strerror(ret));
return ret;
}
if (ret) {
fatal();
fprintf(stderr, "Loop device setup for %s failed: %s\n",
- mkop.mo_device, strerror(ret));
+ mkop.mo_device, strerror(ret));
return ret;
}
}
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);
+ 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) : "");
+ 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",
+ fprintf(stderr,
+ "%s: %s has no index assigned (probably formatted with old mkfs)\n",
progname, source);
return EINVAL;
}
- if (ldd->ldd_flags & LDD_F_UPGRADE14) {
- fprintf(stderr, "%s: we cannot upgrade %s from this (very old) "
- "Lustre version\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->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 == NULL) {
+ if (!temp_options) {
fprintf(stderr, "%s: can't allocate memory for temp_options\n",
progname);
return ENOMEM;
} 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 */
return rc;
if (!mop->mo_have_mgsnid) {
- /* Only use disk data if mount -o mgsnode=nid wasn't
- * specified */
+ /*
+ * 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)
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 */
+ /*
+ * 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++;
+ while (*start == ' ')
+ start++;
if (*start == '\0')
break;
cur = start;
return rc;
}
+#endif /* HAVE_SERVER_SUPPORT */
static void set_defaults(struct mount_opts *mop)
{
return 0;
default:
fprintf(stderr, "%s: unknown option '%c'\n",
- progname, opt);
+ progname, opt);
usage(stderr);
break;
}
}
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
*/
if (realpath(mop->mo_usource, real_path) != NULL) {
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);
}
}
ptr = strstr(mop->mo_usource, ":/");
- if (ptr != NULL) {
+ if (ptr) {
mop->mo_source = convert_hostnames(mop->mo_usource);
if (!mop->mo_source)
usage(stderr);
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;
}
-/* change label from <fsname>:<index> to
+#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 */
+ * 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)) {
+ 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. */
+ /*
+ * 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);
}
}
}
+#endif /* HAVE_SERVER_SUPPORT */
int main(int argc, char *const argv[])
{
}
options = malloc(maxopt_len);
- if (options == NULL) {
+ if (!options) {
fprintf(stderr, "can't allocate memory for options\n");
rc = ENOMEM;
goto out_mo_source;
strcpy(options, mop.mo_orig_options);
rc = parse_options(&mop, options, &flags, maxopt_len);
- if (rc) {
- fprintf(stderr, "%s: can't parse options: %s\n",
- progname, options);
- rc = EINVAL;
+ 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);
+ 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);
+ }
+ 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)
+ }
+ }
+ if (flags & MS_REMOUNT)
mop.mo_nomtab++;
rc = access(mop.mo_target, F_OK);
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. */
+ /*
+ * 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;
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);
+ 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",
+ 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
+ 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. */
+ * does not.
+ */
for (i = 0, rc = -EAGAIN; i <= mop.mo_retry && rc != 0; i++) {
- rc = mount(mop.mo_source, mop.mo_target, "lustre",
+ rc = mount(mop.mo_source, mop.mo_target, fstype,
flags, (void *)options);
- if (rc == 0) {
- if (!client)
- label_lustre(&mop);
- } else {
- if (verbose) {
- fprintf(stderr, "%s: mount %s at %s "
- "failed: %s retries left: "
- "%d\n", basename(progname),
+ 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) {
- int limit = i/2 > 5 ? i/2 : 5;
+ int limit = i / 2 > 5 ? i / 2 : 5;
sleep(1 << limit);
} else {
rc = errno;
}
+#ifdef HAVE_SERVER_SUPPORT
+ } else {
+ if (!client)
+ label_lustre(&mop);
+#endif
}
}
}
- if (rc) {
- char *cli;
+ if (rc) {
+ char *cli;
- rc = errno;
+ 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 == 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 */
+ 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);
- }
+ 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
+ /*
+ * 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 */
+ * mount by prevent some rare cases
+ */
if (strstr(mop.mo_usource, ":/") != NULL)
update_utab_entry(&mop);
if (!mop.mo_nomtab) {
}
out_osd:
+#ifdef HAVE_SERVER_SUPPORT
if (!client)
osd_fini();
-
+#endif
out_options:
free(options);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff