X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmount_utils.c;h=37f292f95da6a016a409c3749bd02077fa6d57c2;hb=76bea6ca661609e3788d1cfe7e08e4a63af0a349;hp=3ee400d3fcd2a2c28c0702880e8cc024e4070e5f;hpb=7b596ad0b36ec5f0281be368b67b7e624457de18;p=fs%2Flustre-release.git diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c index 3ee400d..37f292f 100644 --- a/lustre/utils/mount_utils.c +++ b/lustre/utils/mount_utils.c @@ -23,11 +23,10 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. */ #if HAVE_CONFIG_H @@ -42,8 +41,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -51,6 +49,10 @@ #include #include #include +#include +#include +#include +#include #ifdef HAVE_GSS #include @@ -59,61 +61,61 @@ #include "mount_utils.h" -extern char *progname; -extern int verbose; - #define vprint(fmt, arg...) if (verbose > 0) printf(fmt, ##arg) #define verrprint(fmt, arg...) if (verbose >= 0) fprintf(stderr, fmt, ##arg) +#ifdef HAVE_SERVER_SUPPORT static struct module_backfs_ops *backfs_ops[LDD_MT_LAST]; +#endif void fatal(void) { - verbose = 0; - fprintf(stderr, "\n%s FATAL: ", progname); + verbose = 0; + fprintf(stderr, "\n%s FATAL: ", progname); } int run_command(char *cmd, int cmdsz) { - char log[] = "/tmp/run_command_logXXXXXX"; - int fd = -1, rc; - - if ((cmdsz - strlen(cmd)) < 6) { - fatal(); - fprintf(stderr, "Command buffer overflow: %.*s...\n", - cmdsz, cmd); - return ENOMEM; - } - - if (verbose > 1) { - printf("cmd: %s\n", cmd); - } else { - if ((fd = mkstemp(log)) >= 0) { - close(fd); - strcat(cmd, " >"); - strcat(cmd, log); - } - } - strcat(cmd, " 2>&1"); - - /* Can't use popen because we need the rv of the command */ - rc = system(cmd); - if (rc && (fd >= 0)) { - char buf[128]; - FILE *fp; - fp = fopen(log, "r"); - if (fp) { - while (fgets(buf, sizeof(buf), fp) != NULL) { - printf(" %s", buf); - } - fclose(fp); - } - } - if (fd >= 0) - remove(log); - return rc; + char log[] = "/tmp/run_command_logXXXXXX"; + int fd = -1, rc; + + if ((cmdsz - strlen(cmd)) < 6) { + fatal(); + fprintf(stderr, "Command buffer overflow: %.*s...\n", + cmdsz, cmd); + return ENOMEM; + } + + if (verbose > 1) { + printf("cmd: %s\n", cmd); + } else { + if ((fd = mkstemp(log)) >= 0) { + close(fd); + strcat(cmd, " >"); + strcat(cmd, log); + } + } + strcat(cmd, " 2>&1"); + + /* Can't use popen because we need the rv of the command */ + rc = system(cmd); + if (rc && (fd >= 0)) { + char buf[128]; + FILE *fp; + + fp = fopen(log, "r"); + if (fp) { + while (fgets(buf, sizeof(buf), fp)) + printf(" %s", buf); + fclose(fp); + } + } + if (fd >= 0) + remove(log); + return rc; } +#ifdef HAVE_SERVER_SUPPORT int add_param(char *buf, char *key, char *val) { int end = sizeof(((struct lustre_disk_data *)0)->ldd_params); @@ -140,7 +142,7 @@ int get_param(char *buf, char *key, char **val) ptr = strstr(buf, key); if (ptr) { *val = strdup(ptr + key_len); - if (*val == NULL) + if (!(*val)) return ENOMEM; for (i = 0; i < strlen(*val); i++) @@ -163,40 +165,43 @@ int append_param(char *buf, char *key, char *val, char sep) ptr = strstr(buf, key); /* key doesn't exist yet, so just add it */ - if (ptr == NULL) + if (!ptr) 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')) + if ((ptr[i + key_len] == ' ') || (ptr[i + key_len] == '\0')) break; - str[i] = ptr[i+key_len]; + str[i] = ptr[i + key_len]; } if (i == sizeof(str)) return E2BIG; old_val_len = i; - offset = old_val_len+key_len; + 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]; + 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); + snprintf(str + old_val_len, sizeof(str) - old_val_len, + "%c%s", sep, val); return add_param(buf, key, str); } +#endif char *strscat(char *dst, char *src, int buflen) { dst[buflen - 1] = 0; if (strlen(dst) + strlen(src) >= buflen) { - fprintf(stderr, "string buffer overflow (max %d): '%s' + '%s'" - "\n", buflen, dst, src); + fprintf(stderr, + "string buffer overflow (max %d): '%s' + '%s'\n", + buflen, dst, src); exit(EOVERFLOW); } return strcat(dst, src); @@ -214,16 +219,16 @@ int check_mtab_entry(char *spec1, char *spec2, char *mtpt, char *type) struct mntent *mnt; fp = setmntent(MOUNTED, "r"); - if (fp == NULL) + if (!fp) return 0; while ((mnt = getmntent(fp)) != NULL) { if ((strcmp(mnt->mnt_fsname, spec1) == 0 || strcmp(mnt->mnt_fsname, spec2) == 0) && - (mtpt == NULL || strcmp(mnt->mnt_dir, mtpt) == 0) && - (type == NULL || strcmp(mnt->mnt_type, type) == 0)) { + (!mtpt || strcmp(mnt->mnt_dir, mtpt) == 0) && + (!type || strcmp(mnt->mnt_type, type) == 0)) { endmntent(fp); - return(EEXIST); + return EEXIST; } } endmntent(fp); @@ -237,6 +242,7 @@ int check_mtab_entry(char *spec1, char *spec2, char *mtpt, char *type) static int mtab_is_proc(const char *mtab) { struct statfs s; + if (statfs(mtab, &s) < 0) return 0; @@ -290,7 +296,7 @@ int update_utab_entry(struct mount_opts *mop) #endif /* HAVE_LIBMOUNT */ int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts, - int flags, int freq, int pass) + int flags, int freq, int pass) { FILE *fp; struct mntent mnt; @@ -308,14 +314,14 @@ int update_mtab_entry(char *spec, char *mtpt, char *type, char *opts, mnt.mnt_passno = pass; fp = setmntent(MOUNTED, "a+"); - if (fp == NULL) { + if (!fp) { fprintf(stderr, "%s: setmntent(%s): %s\n", - progname, MOUNTED, strerror (errno)); + progname, MOUNTED, strerror(errno)); rc = 16; } else { if ((addmntent(fp, &mnt)) == 1) { fprintf(stderr, "%s: addmntent: %s\n", - progname, strerror (errno)); + progname, strerror(errno)); rc = 16; } endmntent(fp); @@ -392,6 +398,7 @@ void trim_mountfsoptions(char *s) *p-- = '\0'; } +#ifdef HAVE_SERVER_SUPPORT /* Setup a file in the first unused loop_device */ int loop_setup(struct mkfs_opts *mop) { @@ -415,25 +422,22 @@ int loop_setup(struct mkfs_opts *mop) char cmd[PATH_MAX]; int cmdsz = sizeof(cmd); -#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); + fprintf(stderr, "%s: can't access loop control\n", + progname); return EACCES; } /* find or allocate a free loop device to use */ i = ioctl(ret, LOOP_CTL_GET_FREE); close(ret); if (i < 0) { - fprintf(stderr, "%s: access loop control error\n", progname); + fprintf(stderr, "%s: access loop control error\n", + progname); return EACCES; } sprintf(l_device, "%s%d", loop_base, i); -#else - sprintf(l_device, "%s%d", loop_base, i); - if (access(l_device, F_OK | R_OK)) - break; -#endif + snprintf(cmd, cmdsz, "losetup %s > /dev/null 2>&1", l_device); ret = system(cmd); @@ -444,8 +448,10 @@ int loop_setup(struct mkfs_opts *mop) mop->mo_device); ret = run_command(cmd, cmdsz); if (ret == 256) - /* someone else picked up this loop device - * behind our back */ + /* + * someone else picked up this loop device + * behind our back + */ continue; if (ret) { fprintf(stderr, "%s: error %d on losetup: %s\n", @@ -492,12 +498,12 @@ int loop_format(struct mkfs_opts *mop) if (mop->mo_device_kb == 0) { fatal(); - fprintf(stderr, "loop device requires a --device-size= " - "param\n"); + fprintf(stderr, + "loop device requires a --device-size= param\n"); return EINVAL; } - fd = creat(mop->mo_device, S_IRUSR|S_IWUSR); + fd = creat(mop->mo_device, 0600); if (fd < 0) { fatal(); fprintf(stderr, "%s: Unable to create backing store: %s\n", @@ -517,12 +523,14 @@ int loop_format(struct mkfs_opts *mop) return 0; } +#ifdef PLUGIN_DIR #define DLSYM(prefix, sym, func) \ do { \ - char _fname[64]; \ + char _fname[PATH_MAX]; \ snprintf(_fname, sizeof(_fname), "%s_%s", prefix, #func); \ sym->func = (typeof(sym->func))dlsym(sym->dl_handle, _fname); \ } while (0) +#endif /* PLUGIN_DIR */ /** * Load plugin for a given mount_type from ${pkglibdir}/mount_osd_FSTYPE.so and @@ -534,12 +542,15 @@ int loop_format(struct mkfs_opts *mop) */ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) { - void *handle; - char *error, filename[512], fsname[512], *name; struct module_backfs_ops *ops; +#ifdef PLUGIN_DIR + char *error, filename[PATH_MAX], fsname[512], *name; + void *handle; - /* This deals with duplicate ldd_mount_types resolving to same OSD layer - * plugin (e.g. ext3/ldiskfs/ldiskfs2 all being ldiskfs) */ + /* + * This deals with duplicate ldd_mount_types resolving to same OSD layer + * plugin (e.g. ext3/ldiskfs/ldiskfs2 all being ldiskfs) + */ strncpy(fsname, mt_type(mount_type), sizeof(fsname)); name = fsname + sizeof("osd-") - 1; @@ -550,26 +561,28 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) handle = dlopen(filename, RTLD_LAZY); - /* Check for $LUSTRE environment variable from test-framework. + /* + * Check for $LUSTRE environment variable from test-framework. * This allows using locally built modules to be used. */ - if (handle == NULL) { + if (!handle) { char *dirname; + dirname = getenv("LUSTRE"); if (dirname) { snprintf(filename, sizeof(filename), - "%s/utils/.libs/mount_%s.so", + "%s/utils/mount_%s.so", dirname, fsname); handle = dlopen(filename, RTLD_LAZY); } } /* Do not clutter up console with missing types */ - if (handle == NULL) + if (!handle) return NULL; ops = malloc(sizeof(*ops)); - if (ops == NULL) { + if (!ops) { dlclose(handle); return NULL; } @@ -581,15 +594,18 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) DLSYM(name, ops, fini); DLSYM(name, ops, read_ldd); DLSYM(name, ops, write_ldd); + DLSYM(name, ops, erase_ldd); + DLSYM(name, ops, print_ldd_params); DLSYM(name, ops, is_lustre); DLSYM(name, ops, make_lustre); DLSYM(name, ops, prepare_lustre); DLSYM(name, ops, tune_lustre); DLSYM(name, ops, label_lustre); + DLSYM(name, ops, rename_fsname); DLSYM(name, ops, enable_quota); error = dlerror(); - if (error != NULL) { + if (error) { fatal(); fprintf(stderr, "%s\n", error); dlclose(handle); @@ -599,7 +615,23 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) /* optional methods */ DLSYM(name, ops, fix_mountopts); - +#else + switch (mount_type) { +#ifdef HAVE_LDISKFS_OSD + case LDD_MT_LDISKFS: + ops = &ldiskfs_ops; + break; +#endif /* HAVE_LDISKFS_OSD */ +#ifdef HAVE_ZFS_OSD + case LDD_MT_ZFS: + ops = &zfs_ops; + break; +#endif /* HAVE_ZFS_OSD */ + default: + ops = NULL; + break; + } +#endif return ops; } @@ -609,22 +641,24 @@ struct module_backfs_ops *load_backfs_module(enum ldd_mount_type mount_type) */ void unload_backfs_module(struct module_backfs_ops *ops) { - if (ops == NULL) +#ifdef PLUGIN_DIR + if (!ops) return; dlclose(ops->dl_handle); free(ops); +#endif } /* Return true if backfs_ops has operations for the given mount_type. */ int backfs_mount_type_okay(enum ldd_mount_type mount_type) { - if (unlikely(mount_type >= LDD_MT_LAST || mount_type < 0)) { + if (mount_type >= LDD_MT_LAST || mount_type < 0) { fatal(); fprintf(stderr, "fs type out of range %d\n", mount_type); return 0; } - if (backfs_ops[mount_type] == NULL) { + if (!backfs_ops[mount_type]) { fatal(); fprintf(stderr, "unhandled/unloaded fs type %d '%s'\n", mount_type, mt_str(mount_type)); @@ -660,15 +694,38 @@ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd) return ret; } +/* Erase param from the server config files */ +int osd_erase_ldd(struct mkfs_opts *mop, char *param) +{ + 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]->erase_ldd(mop, param); + else + ret = EINVAL; + + return ret; +} + +/* Print ldd_params */ +void osd_print_ldd_params(struct mkfs_opts *mop) +{ + struct lustre_disk_data *ldd = &mop->mo_ldd; + + if (backfs_mount_type_okay(ldd->ldd_mount_type)) + backfs_ops[ldd->ldd_mount_type]->print_ldd_params(mop); +} + /* Was this device formatted for Lustre */ -int osd_is_lustre(char *dev, unsigned *mount_type) +int osd_is_lustre(char *dev, unsigned int *mount_type) { int i; vprint("checking for existing Lustre data: "); for (i = 0; i < LDD_MT_LAST; ++i) { - if (backfs_ops[i] != NULL && + if (backfs_ops[i] && backfs_ops[i]->is_lustre(dev, mount_type)) { vprint("found\n"); return 1; @@ -715,7 +772,7 @@ int osd_fix_mountopts(struct mkfs_opts *mop, char *mountopts, size_t len) if (!backfs_mount_type_okay(ldd->ldd_mount_type)) return EINVAL; - if (backfs_ops[ldd->ldd_mount_type]->fix_mountopts == NULL) + if (!backfs_ops[ldd->ldd_mount_type]->fix_mountopts) return 0; return backfs_ops[ldd->ldd_mount_type]->fix_mountopts(mop, mountopts, @@ -748,6 +805,21 @@ int osd_label_lustre(struct mount_opts *mop) return ret; } +/* Rename filesystem fsname */ +int osd_rename_fsname(struct mkfs_opts *mop, const char *oldname) +{ + 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]->rename_fsname(mop, + oldname); + else + ret = EINVAL; + + return ret; +} + /* Enable quota accounting */ int osd_enable_quota(struct mkfs_opts *mop) { @@ -769,14 +841,16 @@ int osd_init(void) for (i = 0; i < LDD_MT_LAST; ++i) { rc = 0; backfs_ops[i] = load_backfs_module(i); - if (backfs_ops[i] != NULL) + if (backfs_ops[i]) { 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; + if (rc != 0) { + backfs_ops[i]->fini(); + unload_backfs_module(backfs_ops[i]); + backfs_ops[i] = NULL; + } else { + ret = 0; + } + } } return ret; @@ -787,7 +861,7 @@ void osd_fini(void) int i; for (i = 0; i < LDD_MT_LAST; ++i) { - if (backfs_ops[i] != NULL) { + if (backfs_ops[i]) { backfs_ops[i]->fini(); unload_backfs_module(backfs_ops[i]); backfs_ops[i] = NULL; @@ -795,7 +869,7 @@ void osd_fini(void) } } -__u64 get_device_size(char* device) +__u64 get_device_size(char *device) { int ret, fd; __u64 size = 0; @@ -809,12 +883,12 @@ __u64 get_device_size(char* device) #ifdef BLKGETSIZE64 /* size in bytes. bz5831 */ - ret = ioctl(fd, BLKGETSIZE64, (void*)&size); + ret = ioctl(fd, BLKGETSIZE64, (void *)&size); #else { __u32 lsize = 0; /* size in blocks */ - ret = ioctl(fd, BLKGETSIZE, (void*)&lsize); + ret = ioctl(fd, BLKGETSIZE, (void *)&lsize); size = (__u64)lsize * 512; } #endif @@ -829,6 +903,7 @@ __u64 get_device_size(char* device) /* return value in KB */ return size >> 10; } +#endif int file_create(char *path, __u64 size) { @@ -842,9 +917,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: %ju KB: Backing store size must be " - "smaller than %ju KB\n", progname, (uintmax_t) size, - (uintmax_t)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; } @@ -855,7 +930,7 @@ int file_create(char *path, __u64 size) return errno; } - fd = creat(path, S_IRUSR|S_IWUSR); + fd = creat(path, 0600); if (fd < 0) { fatal(); fprintf(stderr, "%s: Unable to create backing store: %s\n", @@ -875,6 +950,199 @@ int file_create(char *path, __u64 size) return 0; } +#ifdef HAVE_SERVER_SUPPORT +struct lustre_cfg_entry { + struct list_head lce_list; + char lce_name[0]; +}; + +static struct lustre_cfg_entry *lustre_cfg_entry_init(const char *name) +{ + struct lustre_cfg_entry *lce; + int len = strlen(name) + 1; + + lce = malloc(sizeof(*lce) + len); + if (lce) { + INIT_LIST_HEAD(&lce->lce_list); + memcpy(lce->lce_name, name, len); + } + + return lce; +} + +static void lustre_cfg_entry_fini(struct lustre_cfg_entry *lce) +{ + free(lce); +} + +int lustre_rename_fsname(struct mkfs_opts *mop, const char *mntpt, + const char *oldname) +{ + struct lustre_disk_data *ldd = &mop->mo_ldd; + struct lr_server_data lsd; + char filepnm[132]; + char cfg_dir[128]; + DIR *dir = NULL; + struct dirent64 *dirent; + struct lustre_cfg_entry *lce; + struct list_head cfg_list; + int old_namelen = strlen(oldname); + int new_namelen = strlen(ldd->ldd_fsname); + int ret; + int fd; + + INIT_LIST_HEAD(&cfg_list); + + snprintf(filepnm, sizeof(filepnm), "%s/%s", mntpt, LAST_RCVD); + fd = open(filepnm, O_RDWR); + if (fd < 0) { + if (errno == ENOENT) + goto config; + + if (errno != 0) + ret = errno; + else + ret = fd; + fprintf(stderr, "Unable to open %s: %s\n", + filepnm, strerror(ret)); + return ret; + } + + ret = read(fd, &lsd, sizeof(lsd)); + if (ret != sizeof(lsd)) { + if (errno != 0) + ret = errno; + fprintf(stderr, "Unable to read %s: %s\n", + filepnm, strerror(ret)); + close(fd); + return ret; + } + + ret = lseek(fd, 0, SEEK_SET); + if (ret) { + if (errno != 0) + ret = errno; + fprintf(stderr, "Unable to lseek %s: %s\n", + filepnm, strerror(ret)); + close(fd); + return ret; + } + + /* replace fsname in lr_server_data::lsd_uuid. */ + if (old_namelen > new_namelen) + memmove(lsd.lsd_uuid + new_namelen, + lsd.lsd_uuid + old_namelen, + sizeof(lsd.lsd_uuid) - old_namelen); + else if (old_namelen < new_namelen) + memmove(lsd.lsd_uuid + new_namelen, + lsd.lsd_uuid + old_namelen, + sizeof(lsd.lsd_uuid) - new_namelen); + memcpy(lsd.lsd_uuid, ldd->ldd_fsname, new_namelen); + ret = write(fd, &lsd, sizeof(lsd)); + if (ret != sizeof(lsd)) { + if (errno != 0) + ret = errno; + fprintf(stderr, "Unable to write %s: %s\n", + filepnm, strerror(ret)); + close(fd); + return ret; + } + + close(fd); + +config: + snprintf(cfg_dir, sizeof(cfg_dir), "%s/%s", mntpt, MOUNT_CONFIGS_DIR); + dir = opendir(cfg_dir); + if (!dir) { + if (errno != 0) + ret = errno; + else + ret = EINVAL; + fprintf(stderr, "Unable to opendir %s: %s\n", + cfg_dir, strerror(ret)); + return ret; + } + + while ((dirent = readdir64(dir)) != NULL) { + char *ptr; + + if (strlen(dirent->d_name) <= old_namelen) + continue; + + ptr = strrchr(dirent->d_name, '-'); + if (!ptr || (ptr - dirent->d_name) != old_namelen) + continue; + + if (strncmp(dirent->d_name, oldname, old_namelen) != 0) + continue; + + lce = lustre_cfg_entry_init(dirent->d_name); + if (!lce) { + if (errno != 0) + ret = errno; + else + ret = EINVAL; + + fprintf(stderr, "Fail to init item for %s: %s\n", + dirent->d_name, strerror(ret)); + goto out; + } + + list_add(&lce->lce_list, &cfg_list); + } + + closedir(dir); + dir = NULL; + ret = 0; + + while (!list_empty(&cfg_list) && ret == 0) { + lce = list_entry(cfg_list.next, struct lustre_cfg_entry, + lce_list); + list_del(&lce->lce_list); + snprintf(filepnm, sizeof(filepnm), "%s/%s", cfg_dir, + lce->lce_name); + if (IS_MGS(ldd)) + /* + * Store the new fsname in the XATTR_TARGET_RENAME EA. + * When the MGS start, it will scan config logs, and + * for the ones which have the XATTR_TARGET_RENAME EA, + * it will replace old fsname with the new fsname in + * the config log by some shared kernel level config + * logs {fork,erase} functionalities automatically. + */ + ret = setxattr(filepnm, XATTR_TARGET_RENAME, + ldd->ldd_fsname, + strlen(ldd->ldd_fsname), 0); + else + ret = unlink(filepnm); + + if (ret) { + if (errno != 0) + ret = errno; + + fprintf(stderr, "Fail to %s %s: %s\n", + IS_MGS(ldd) ? "setxattr" : "unlink", + filepnm, strerror(ret)); + } + + lustre_cfg_entry_fini(lce); + } + +out: + if (dir) + closedir(dir); + + while (!list_empty(&cfg_list)) { + lce = list_entry(cfg_list.next, struct lustre_cfg_entry, + lce_list); + list_del(&lce->lce_list); + lustre_cfg_entry_fini(lce); + } + + return ret; +} +#endif /* HAVE_SERVER_SUPPORT */ + #ifdef HAVE_GSS #ifdef HAVE_OPENSSL_SSK int load_shared_keys(struct mount_opts *mop) @@ -884,7 +1152,6 @@ int load_shared_keys(struct mount_opts *mop) struct stat sbuf; char fullpath[PATH_MAX]; char *path = mop->mo_skpath; - int type = 0; int rc; /* init logging */ @@ -897,40 +1164,28 @@ int load_shared_keys(struct mount_opts *mop) return -errno; } - if (IS_SERVER(&mop->mo_ldd)) { - if (IS_MGS(&mop->mo_ldd)) - type |= SK_TYPE_MGS; - if (IS_MDT(&mop->mo_ldd) || IS_OST(&mop->mo_ldd)) - type |= SK_TYPE_SERVER; - } else { - type |= SK_TYPE_CLIENT; - if (!S_ISREG(sbuf.st_mode)) { - fprintf(stderr, "Invalid shared key path, must be a " - "file for client mounts: %s\n", path); - return -EINVAL; - } - } - /* Load individual keys or a directory of them */ if (S_ISREG(sbuf.st_mode)) { - return sk_load_keyfile(path, type); + return sk_load_keyfile(path); } else if (!S_ISDIR(sbuf.st_mode)) { fprintf(stderr, "Invalid shared key path: %s\n", path); return -ENOKEY; } dir = opendir(path); - if (dir == NULL) { + if (!dir) { fprintf(stderr, "Unable to open shared key directory: %s\n", path); return -ENOENT; } - /* Loop through the files in the directory attempting to load them. + /* + * Loop through the files in the directory attempting to load them. * Any issue with loading the keyfile is treated as an error although * the loop continues until all files have been attempted. This will * allow all errors be reported at once rather then requiring - * incremental corrections to fix each one and try again. */ + * incremental corrections to fix each one and try again. + */ while ((dentry = readdir(dir)) != NULL) { if (strcmp(".", dentry->d_name) == 0 || strcmp("..", dentry->d_name) == 0) @@ -956,10 +1211,9 @@ int load_shared_keys(struct mount_opts *mop) if (!S_ISREG(sbuf.st_mode)) continue; - rc = sk_load_keyfile(fullpath, type); - if (rc) { + rc = sk_load_keyfile(fullpath); + if (rc) fprintf(stderr, "Failed to load key %s\n", fullpath); - } } closedir(dir);