X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fmount_lustre.c;h=7671da38acdaa645e0d674590079bba3a41e9c16;hp=6b7cfe5a703897ab1a4d7d563f3e2c26f2493ae1;hb=281671b5ee43c2aea5d5b708aadf10fd1df45b16;hpb=e2107b406c5222d2c2583a053e217a2b1b75b3f4 diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c index 6b7cfe5..7671da3 100644 --- a/lustre/utils/mount_lustre.c +++ b/lustre/utils/mount_lustre.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +26,8 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,33 +42,36 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include "mount_utils.h" #include #include #include #include #include #include -#include -#include -#include #include "obdctl.h" #include -#include #include #include -#include "mount_utils.h" +#include +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 10, 51, 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 + */ +#warn remove kernel include +#elif !defined(MS_RDONLY) +#include +#endif -#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" +#define MAXOPT 4096 #define MAX_RETRIES 99 int verbose = 0; -int nomtab = 0; -int fake = 0; -int force = 0; -int retry = 0; -int md_stripe_cache_size = 16384; char *progname = NULL; void usage(FILE *out) @@ -102,61 +105,6 @@ void usage(FILE *out) exit((out != stdout) ? EINVAL : 0); } -static int check_mtab_entry(char *spec1, char *spec2, char *mtpt, char *type) -{ - FILE *fp; - struct mntent *mnt; - - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) - return(0); - - while ((mnt = getmntent(fp)) != NULL) { - if ((strcmp(mnt->mnt_fsname, spec1) == 0 || - strcmp(mnt->mnt_fsname, spec2) == 0) && - strcmp(mnt->mnt_dir, mtpt) == 0 && - strcmp(mnt->mnt_type, type) == 0) { - endmntent(fp); - return(EEXIST); - } - } - endmntent(fp); - - return(0); -} - -static int -update_mtab_entry(char *spec, char *mtpt, char *type, char *opts, - int flags, int freq, int pass) -{ - FILE *fp; - struct mntent mnt; - int rc = 0; - - mnt.mnt_fsname = spec; - mnt.mnt_dir = mtpt; - mnt.mnt_type = type; - mnt.mnt_opts = opts ? opts : ""; - mnt.mnt_freq = freq; - mnt.mnt_passno = pass; - - fp = setmntent(MOUNTED, "a+"); - if (fp == NULL) { - fprintf(stderr, "%s: setmntent(%s): %s:", - progname, MOUNTED, strerror (errno)); - rc = 16; - } else { - if ((addmntent(fp, &mnt)) == 1) { - fprintf(stderr, "%s: addmntent: %s:", - progname, strerror (errno)); - rc = 16; - } - endmntent(fp); - } - - return rc; -} - /* Get rid of symbolic hostnames for tcp, since kernel can't do lookups */ #define MAXNIDSTR 1024 static char *convert_hostnames(char *s1) @@ -233,6 +181,9 @@ static const struct opt_map opt_map[] = { { "relatime", 0, MS_RELATIME }, /* set file access time on read */ { "norelatime",1,MS_RELATIME }, /* do not set file access time on read */ #endif +#ifdef MS_STRICTATIME + { "strictatime",0,MS_STRICTATIME }, /* update access time strictly */ +#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 */ @@ -275,7 +226,7 @@ static void append_option(char *options, const char *one) /* Replace options with subset of Lustre-specific options, and fill in mount flags */ -int parse_options(char *orig_options, int *flagp) +int parse_options(struct mount_opts *mop, char *orig_options, int *flagp) { char *options, *opt, *nextopt, *arg, *val; @@ -295,372 +246,477 @@ int parse_options(char *orig_options, int *flagp) * 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); + mop->mo_md_stripe_cache_size = atoi(val + 1); } else if (val && strncmp(arg, "retry", 5) == 0) { - retry = atoi(val + 1); - if (retry > MAX_RETRIES) - retry = MAX_RETRIES; - else if (retry < 0) - retry = 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 (strncmp(opt, "force", 5) == 0) { + } else if (strncmp(arg, "nosvc", 5) == 0) { + mop->mo_nosvc = 1; + append_option(options, opt); + } else if (strcmp(opt, "force") == 0) { //XXX special check for 'force' option - ++force; - printf("force: %d\n", force); + ++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 MS_STRICTATIME +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 10, 51, 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 +#endif + /* 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); free(options); return 0; } - -int read_file(char *path, char *buf, int size) +/* Add mgsnids from ldd params */ +static int add_mgsnids(struct mount_opts *mop, char *options, + const char *params) { - 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; + + while ((ptr = strstr(ptr, PARAM_MGSNODE)) != NULL) { + sep = strchr(ptr, ' '); + if (sep != NULL) { + tmp = *sep; + *sep = '\0'; + } + append_option(options, ptr); + mop->mo_have_mgsnid++; + if (sep) { + *sep = tmp; + ptr = sep; + } else { + break; + } + } + + return 0; } -int write_file(char *path, char *buf) +static int clear_update_ondisk(char *source, struct lustre_disk_data *ldd) { - FILE *fd; - - fd = fopen(path, "w"); - if (fd == NULL) - return errno; - - fputs(buf, fd); - fclose(fd); - return 0; + char always_mountopts[512] = ""; + char default_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; + 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, + default_mountopts, sizeof(default_mountopts), + always_mountopts, sizeof(always_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)); + } + + ret2 = loop_cleanup(&mkop); + if (ret == 0) + ret = ret2; + + 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) +static int parse_ldd(char *source, struct mount_opts *mop, char *options) { - glob_t glob_info; - struct stat stat_buf; - char *chk_major, *chk_minor; - char *savept, *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 */ - 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"); - 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 rc; - } - - 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; - } + struct lustre_disk_data *ldd = &mop->mo_ldd; + char *cur, *start; + int rc; + + 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_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); + + /* svname of the form lustre:OST1234 means never registered */ + rc = strlen(ldd->ldd_svname); + 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; + } + + /* backend osd type */ + append_option(options, "osd="); + strcat(options, mt_type(ldd->ldd_mount_type)); + + append_option(options, ldd->ldd_mount_opts); + + 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) { + append_option(options, "mgs"); + mop->mo_have_mgsnid++; + } else { + add_mgsnids(mop, options, ldd->ldd_params); + } + } + /* Better have an mgsnid by now */ + if (!mop->mo_have_mgsnid) { + fprintf(stderr, "%s: missing option mgsnode=\n", + progname); + return EINVAL; + } + + if (ldd->ldd_flags & LDD_F_VIRGIN) + append_option(options, "virgin"); + if (ldd->ldd_flags & LDD_F_UPDATE) + append_option(options, "update"); + if (ldd->ldd_flags & LDD_F_WRITECONF) + append_option(options, "writeconf"); + if (ldd->ldd_flags & LDD_F_NO_PRIMNODE) + append_option(options, "noprimnode"); + + /* 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++; + } + append_option(options, "param="); + strcat(options, cur); + } + + /* svname must be last option */ + append_option(options, "svname="); + strcat(options, ldd->ldd_svname); + + return 0; +} - 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)); - return rc; - } +static void set_defaults(struct mount_opts *mop) +{ + memset(mop, 0, sizeof(*mop)); + mop->mo_usource = NULL; + mop->mo_source = NULL; + mop->mo_nomtab = 0; + mop->mo_fake = 0; + mop->mo_force = 0; + mop->mo_retry = 0; + mop->mo_have_mgsnid = 0; + mop->mo_md_stripe_cache_size = 16384; + mop->mo_orig_options = ""; + mop->mo_nosvc = 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 && verbose) - fprintf(stderr, "warning: writing to %s: %s\n", - real_path, strerror(errno)); - } - return rc; +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} + }; + char real_path[PATH_MAX] = {'\0'}; + FILE *f; + char path[256], name[256]; + size_t sz; + char *ptr; + int opt, rc; + + while ((opt = getopt_long(argc, argv, "fhno:v", + long_opt, NULL)) != EOF){ + switch (opt) { + case 1: + ++mop->mo_force; + printf("force: %d\n", mop->mo_force); + break; + case 'f': + ++mop->mo_fake; + printf("fake: %d\n", mop->mo_fake); + break; + case 'h': + usage(stdout); + break; + case 'n': + ++mop->mo_nomtab; + printf("nomtab: %d\n", mop->mo_nomtab); + break; + case 'o': + mop->mo_orig_options = optarg; + break; + case 'v': + ++verbose; + break; + default: + fprintf(stderr, "%s: unknown option '%c'\n", + progname, opt); + usage(stderr); + break; + } + } + + if (optind + 2 > argc) { + fprintf(stderr, "%s: too few arguments\n", progname); + usage(stderr); + } + + mop->mo_usource = argv[optind]; + 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) { + 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 ((f = fopen(path, "r"))) { + /* read "\n" from sysfs */ + if (fgets(name, sizeof(name), f) && (sz = strlen(name)) > 1) { + name[sz - 1] = '\0'; + snprintf(real_path, sizeof(real_path), "/dev/mapper/%s", name); + } + fclose(f); + } + } + mop->mo_usource = strdup(real_path); + } + + ptr = strstr(mop->mo_usource, ":/"); + if (ptr != NULL) { + 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)); + return rc; + } + + return 0; } int main(int argc, char *const argv[]) { - char default_options[] = ""; - char *usource, *source; - char target[PATH_MAX] = {'\0'}; - char *options, *optcopy, *orig_options = default_options; - int i, nargs = 3, opt, rc, flags, optlen; - 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} - }; - - progname = strrchr(argv[0], '/'); - progname = progname ? progname + 1 : argv[0]; - - while ((opt = getopt_long(argc, argv, "fhno:v", - long_opt, NULL)) != EOF){ - switch (opt) { - case 1: - ++force; - printf("force: %d\n", force); - nargs++; - break; - case 'f': - ++fake; - printf("fake: %d\n", fake); - nargs++; - break; - case 'h': - usage(stdout); - break; - case 'n': - ++nomtab; - printf("nomtab: %d\n", nomtab); - nargs++; - break; - case 'o': - orig_options = optarg; - nargs++; - break; - case 'v': - ++verbose; - nargs++; - break; - default: - fprintf(stderr, "%s: unknown option '%c'\n", - progname, opt); - usage(stderr); - break; - } - } + struct mount_opts mop; + char *options; + int i, rc, flags; - if (optind + 2 > argc) { - fprintf(stderr, "%s: too few arguments\n", progname); - usage(stderr); - } + progname = strrchr(argv[0], '/'); + progname = progname ? progname + 1 : argv[0]; - usource = argv[optind]; - if (!usource) { - usage(stderr); - } + set_defaults(&mop); - source = convert_hostnames(usource); - if (!source) { - usage(stderr); - } + rc = osd_init(); + if (rc) + return rc; - if (realpath(argv[optind + 1], target) == NULL) { - rc = errno; - fprintf(stderr, "warning: %s: cannot resolve: %s\n", - argv[optind + 1], strerror(errno)); - return rc; - } + rc = parse_opts(argc, argv, &mop); + if (rc) + return rc; if (verbose) { for (i = 0; i < argc; i++) printf("arg[%d] = %s\n", i, argv[i]); - printf("source = %s (%s), target = %s\n", usource, source, - target); - printf("options = %s\n", orig_options); + 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(strlen(orig_options) + 1); + options = malloc(MAXOPT); if (options == NULL) { fprintf(stderr, "can't allocate memory for options\n"); return -1; } - strcpy(options, orig_options); - rc = parse_options(options, &flags); + 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); } - if (!force) { - rc = check_mtab_entry(usource, source, target, "lustre"); + 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, usource, target); + "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, usource, target); + "not already mounted on %s\n", progname, MOUNTED, + mop.mo_usource, mop.mo_target); return(ENOENT); } } if (flags & MS_REMOUNT) - nomtab++; + mop.mo_nomtab++; - rc = access(target, F_OK); + rc = access(mop.mo_target, F_OK); if (rc) { rc = errno; - fprintf(stderr, "%s: %s inaccessible: %s\n", progname, target, - strerror(errno)); + fprintf(stderr, "%s: %s inaccessible: %s\n", progname, + mop.mo_target, strerror(errno)); return rc; } + if (!strstr(mop.mo_usource, ":/")) { + rc = parse_ldd(mop.mo_source, &mop, options); + if (rc) + 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(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, source); + append_option(options, "device="); + strcat(options, mop.mo_source); if (verbose) printf("mounting device %s at %s, flags=%#x options=%s\n", - source, target, flags, optcopy); + mop.mo_source, mop.mo_target, flags, options); - if (!strstr(usource, ":/") && set_blockdev_tunables(source)) { - if (verbose) - fprintf(stderr, "%s: unable to set tunables for %s" - " (may cause reduced IO performance)\n", - argv[0], source); - } - - register_service_tags(usource, source, target); + if (!strstr(mop.mo_usource, ":/") && + 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); + } - if (!fake) { + 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 <= retry && rc != 0; i++) { - rc = mount(source, target, "lustre", flags, - (void *)optcopy); - if (rc) { + for (i = 0, rc = -EAGAIN; i <= mop.mo_retry && rc != 0; i++) { + rc = mount(mop.mo_source, mop.mo_target, "lustre", + flags, (void *)options); + if (rc == 0) { + /* change label from : to + * - to indicate the device has + * been registered. only if the label is + * supposed to be changed and target service + * is supposed to start */ + if (mop.mo_ldd.ldd_flags & + (LDD_F_VIRGIN | LDD_F_WRITECONF)) { + if (mop.mo_nosvc == 0) + (void)osd_label_lustre(&mop); + } + } else { if (verbose) { fprintf(stderr, "%s: mount %s at %s " "failed: %s retries left: " "%d\n", basename(progname), - usource, target, - strerror(errno), retry-i); + mop.mo_usource, mop.mo_target, + strerror(errno), + mop.mo_retry - i); } - if (retry) { + if (mop.mo_retry) { sleep(1 << max((i/2), 5)); } else { @@ -675,19 +731,21 @@ int main(int argc, char *const argv[]) rc = errno; - cli = strrchr(usource, ':'); + cli = strrchr(mop.mo_usource, ':'); if (cli && (strlen(cli) > 2)) cli += 2; else cli = NULL; fprintf(stderr, "%s: mount %s at %s failed: %s\n", progname, - usource, target, strerror(errno)); + 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" - "\nNote 'alias lustre llite' should be removed" - " from modprobe.conf\n"); + "Check /etc/modprobe.conf and " + "/proc/filesystems\n"); if (errno == ENOTBLK) fprintf(stderr, "Do you need -o loop?\n"); if (errno == ENOMEDIUM) @@ -701,16 +759,16 @@ int main(int argc, char *const argv[]) } if (errno == EALREADY) fprintf(stderr, "The target service is already running." - " (%s)\n", usource); + " (%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", usource); + "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", usource); + "in use. (%s)\n", mop.mo_usource); if (errno == EINVAL) { fprintf(stderr, "This may have multiple causes.\n"); if (cli) @@ -721,22 +779,26 @@ int main(int argc, char *const argv[]) } /* May as well try to clean up loop devs */ - if (strncmp(usource, "/dev/loop", 9) == 0) { + if (strncmp(mop.mo_usource, "/dev/loop", 9) == 0) { char cmd[256]; int ret; - sprintf(cmd, "/sbin/losetup -d %s", usource); + 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 (!nomtab) { - rc = update_mtab_entry(usource, target, "lustre", orig_options, - 0,0,0); - } + } else if (!mop.mo_nomtab) { + rc = update_mtab_entry(mop.mo_usource, mop.mo_target, "lustre", + mop.mo_orig_options, 0,0,0); + } + + free(options); + /* mo_usource should be freed, but we can rely on the kernel */ + free(mop.mo_source); + + osd_fini(); - free(optcopy); - free(source); return rc; }