X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.c;h=15b0b309ad6f603c51a183c28b167eafe12371cc;hb=refs%2Fchanges%2F13%2F19113%2F3;hp=83a571f7ffdf2af4f1d02ac861b50548df315423;hpb=21d716e6c16424d9deb646456758ebbaa9c70fec;p=fs%2Flustre-release.git diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c index 83a571f..15b0b30 100644 --- a/lustre/utils/mount_utils.c +++ b/lustre/utils/mount_utils.c @@ -26,7 +26,8 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. - * Copyright (c) 2012, 2013, Intel Corporation. + * + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,18 +38,24 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ -#include "mount_utils.h" +#include +#include +#include #include #include #include +#include #include #include #include +#include #include #include #include #include +#include "mount_utils.h" + extern char *progname; extern int verbose; @@ -144,6 +151,43 @@ int get_param(char *buf, char *key, char **val) return ENOENT; } +int append_param(char *buf, char *key, char *val, char sep) +{ + int key_len, i, offset, old_val_len; + char *ptr = NULL, str[1024]; + + if (key) + ptr = strstr(buf, key); + + /* key doesn't exist yet, so just add it */ + if (ptr == NULL) + return add_param(buf, key, val); + + key_len = strlen(key); + + /* Copy previous values to str */ + for (i = 0; i < sizeof(str); ++i) { + if ((ptr[i+key_len] == ' ') || (ptr[i+key_len] == '\0')) + break; + str[i] = ptr[i+key_len]; + } + if (i == sizeof(str)) + return E2BIG; + old_val_len = i; + + offset = old_val_len+key_len; + + /* Move rest of buf to overwrite previous key and value */ + for (i = 0; ptr[i+offset] != '\0'; ++i) + ptr[i] = ptr[i+offset]; + + ptr[i] = '\0'; + + snprintf(str+old_val_len, sizeof(str)-old_val_len, "%c%s", sep, val); + + return add_param(buf, key, str); +} + char *strscat(char *dst, char *src, int buflen) { dst[buflen - 1] = 0; @@ -198,6 +242,52 @@ static int mtab_is_proc(const char *mtab) return 1; } +#ifdef HAVE_LIBMOUNT + +# include + +/* + * The libmount is part of util-linux since 2.18. + * We use it to update utab to avoid umount would + * blocked in some rare case. + */ +int update_utab_entry(struct mount_opts *mop) +{ + struct libmnt_fs *fs = mnt_new_fs(); + struct libmnt_update *upd; + int rc; + + mnt_fs_set_source(fs, mop->mo_source); + mnt_fs_set_target(fs, mop->mo_target); + mnt_fs_set_fstype(fs, "lustre"); + mnt_fs_set_attributes(fs, "lustre"); + + upd = mnt_new_update(); + if (!upd) + return -ENOMEM; + + rc = mnt_update_set_fs(upd, mop->mo_nomtab ? MS_REMOUNT : 0, NULL, fs); + if (rc == 1) /* update is unnecessary */ + rc = 0; + if (rc) { + fprintf(stderr, + "error: failed to save utab entry: rc = %d\n", rc); + } else { + rc = mnt_update_table(upd, NULL); + } + + mnt_free_update(upd); + mnt_free_fs(fs); + + return rc; +} +#else +int update_utab_entry(struct mount_opts *mop) +{ + return 0; +} +#endif /* HAVE_LIBMOUNT */ + int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts, int flags, int freq, int pass) { @@ -257,8 +347,7 @@ static int in_mntlist(char *opt, char *mntlist) * present in mountopts. The justwarn boolean toggles between error and * warning message. Return an error count. */ -int check_mountfsoptions(char *mountopts, char *wanted_mountopts, - int justwarn) +int check_mountfsoptions(char *mountopts, char *wanted_mountopts) { char *ml, *mlp, *item, *ctx = NULL; int errors = 0; @@ -270,9 +359,8 @@ int check_mountfsoptions(char *mountopts, char *wanted_mountopts, mlp = ml; while ((item = strtok_r(mlp, ",", &ctx))) { if (!in_mntlist(item, mountopts)) { - fprintf(stderr, "%s: %s mount option `%s' is missing\n", - progname, justwarn ? "Warning: default" - : "Error: mandatory", item); + fprintf(stderr, "%s: Error: mandatory mount option" + " '%s' is missing\n", progname, item); errors++; } mlp = NULL; @@ -326,7 +414,7 @@ int loop_setup(struct mkfs_opts *mop) char cmd[PATH_MAX]; int cmdsz = sizeof(cmd); -#ifdef LOOP_CTL_GET_FREE +#ifdef HAVE_LOOP_CTL_GET_FREE ret = open("/dev/loop-control", O_RDWR); if (ret < 0) { fprintf(stderr, "%s: can't access loop control\n", progname); @@ -450,7 +538,7 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) /* This deals with duplicate ldd_mount_types resolving to same OSD layer * plugin (e.g. ext3/ldiskfs/ldiskfs2 all being ldiskfs) */ - strlcpy(fsname, mt_type(mount_type), sizeof(fsname)); + strncpy(fsname, mt_type(mount_type), sizeof(fsname)); name = fsname + sizeof("osd-") - 1; /* change osd- to osd_ */ @@ -506,6 +594,10 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) free(ops); return NULL; } + + /* optional methods */ + DLSYM(name, ops, fix_mountopts); + return ops; } @@ -532,7 +624,7 @@ int backfs_mount_type_okay(enum ldd_mount_type mount_type) } if (backfs_ops[mount_type] == NULL) { fatal(); - fprintf(stderr, "unhandled fs type %d '%s'\n", + fprintf(stderr, "unhandled/unloaded fs type %d '%s'\n", mount_type, mt_str(mount_type)); return 0; } @@ -603,16 +695,14 @@ int osd_make_lustre(struct mkfs_opts *mop) } int osd_prepare_lustre(struct mkfs_opts *mop, - char *default_mountopts, int default_len, - char *always_mountopts, int always_len) + char *wanted_mountopts, size_t len) { struct lustre_disk_data *ldd = &mop->mo_ldd; int ret; if (backfs_mount_type_okay(ldd->ldd_mount_type)) ret = backfs_ops[ldd->ldd_mount_type]->prepare_lustre(mop, - default_mountopts, default_len, - always_mountopts, always_len); + wanted_mountopts, len); else ret = EINVAL; @@ -620,6 +710,20 @@ int osd_prepare_lustre(struct mkfs_opts *mop, return ret; } +int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len) +{ + struct lustre_disk_data *ldd = &mop->mo_ldd; + + if (!backfs_mount_type_okay(ldd->ldd_mount_type)) + return EINVAL; + + if (backfs_ops[ldd->ldd_mount_type]->fix_mountopts == NULL) + return 0; + + return backfs_ops[ldd->ldd_mount_type]->fix_mountopts(mop, mountopts, + len); +} + int osd_tune_lustre(char *dev, struct mount_opts *mop) { struct lustre_disk_data *ldd = &mop->mo_ldd; @@ -665,14 +769,19 @@ int osd_enable_quota(struct mkfs_opts *mop) int osd_init(void) { - int i, ret = 0; + int i, rc, ret = EINVAL; for (i = 0; i < LDD_MT_LAST; ++i) { + rc = 0; backfs_ops[i] = load_backfs_module(i); if (backfs_ops[i] != NULL) - ret = backfs_ops[i]->init(); - if (ret) - break; + rc = backfs_ops[i]->init(); + if (rc != 0) { + backfs_ops[i]->fini(); + unload_backfs_module(backfs_ops[i]); + backfs_ops[i] = NULL; + } else + ret = 0; } return ret; @@ -721,7 +830,7 @@ __u64 get_device_size(char* device) return 0; } - vprint("device size = "LPU64"MB\n", size >> 20); + vprint("device size = %juMB\n", (uintmax_t)(size >> 20)); /* return value in KB */ return size >> 10; } @@ -738,8 +847,9 @@ int file_create(char *path, __u64 size) */ size_max = (off_t)1 << (_FILE_OFFSET_BITS - 1 - 10); if (size >= size_max) { - fprintf(stderr, "%s: "LPU64" KB: Backing store size must be " - "smaller than "LPU64" KB\n", progname, size, size_max); + fprintf(stderr, "%s: %ju KB: Backing store size must be " + "smaller than %ju KB\n", progname, (uintmax_t) size, + (uintmax_t)size_max); return EFBIG; }