X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi.c;h=820d28d6d2335572fb392605a2c8ce59dd3e14fe;hp=fbcfb2de28a7144d755c13f3902fe5afb16567a3;hb=64b279c3ec0e7a9960b3d33db8a64e0a53af9e82;hpb=fd6f11c92e2f6f54384d1ebd3474a77b0c0ded95 diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index fbcfb2d..820d28d 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -15,11 +15,7 @@ * * 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) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -58,11 +54,12 @@ #include #include #include -#include #include +#include +#include #include +#include #include -#include #include /* for dirname() */ #ifdef HAVE_LINUX_UNISTD_H #include @@ -71,6 +68,7 @@ #endif #include +#include #include #include #include @@ -187,55 +185,67 @@ llapi_log_callback_t llapi_info_callback_set(llapi_log_callback_t cb) int llapi_parse_size(const char *optarg, unsigned long long *size, unsigned long long *size_units, int bytes_spec) { - char *end; - - if (strncmp(optarg, "-", 1) == 0) - return -1; - - if (*size_units == 0) - *size_units = 1; - - *size = strtoull(optarg, &end, 0); - - if (*end != '\0') { - if ((*end == 'b') && *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 9))) == 0 && - !bytes_spec) { - *size_units = 1 << 9; - } else if ((*end == 'b') && - *(end + 1) == '\0' && - bytes_spec) { - *size_units = 1; - } else if ((*end == 'k' || *end == 'K') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 10))) == 0) { - *size_units = 1 << 10; - } else if ((*end == 'm' || *end == 'M') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 20))) == 0) { - *size_units = 1 << 20; - } else if ((*end == 'g' || *end == 'G') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 30))) == 0) { - *size_units = 1 << 30; - } else if ((*end == 't' || *end == 'T') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 40))) == 0) { - *size_units = 1ULL << 40; - } else if ((*end == 'p' || *end == 'P') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 50))) == 0) { - *size_units = 1ULL << 50; - } else if ((*end == 'e' || *end == 'E') && - *(end + 1) == '\0' && - (*size & (~0ULL << (64 - 60))) == 0) { - *size_units = 1ULL << 60; - } else { - return -1; - } - } - *size *= *size_units; - return 0; + char *end; + char *argbuf = (char *)optarg; + unsigned long long frac = 0, frac_d = 1; + + if (strncmp(optarg, "-", 1) == 0) + return -1; + + if (*size_units == 0) + *size_units = 1; + + *size = strtoull(argbuf, &end, 0); + if (end != NULL && *end == '.') { + int i; + + argbuf = end + 1; + frac = strtoull(argbuf, &end, 10); + /* count decimal places */ + for (i = 0; i < (end - argbuf); i++) + frac_d *= 10; + } + + if (*end != '\0') { + if ((*end == 'b') && *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 9))) == 0 && + !bytes_spec) { + *size_units = 1 << 9; + } else if ((*end == 'b') && + *(end + 1) == '\0' && + bytes_spec) { + *size_units = 1; + } else if ((*end == 'k' || *end == 'K') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 10))) == 0) { + *size_units = 1 << 10; + } else if ((*end == 'm' || *end == 'M') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 20))) == 0) { + *size_units = 1 << 20; + } else if ((*end == 'g' || *end == 'G') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 30))) == 0) { + *size_units = 1 << 30; + } else if ((*end == 't' || *end == 'T') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 40))) == 0) { + *size_units = 1ULL << 40; + } else if ((*end == 'p' || *end == 'P') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 50))) == 0) { + *size_units = 1ULL << 50; + } else if ((*end == 'e' || *end == 'E') && + *(end + 1) == '\0' && + (*size & (~0ULL << (64 - 60))) == 0) { + *size_units = 1ULL << 60; + } else { + return -1; + } + } + *size = *size * *size_units + frac * *size_units / frac_d; + + return 0; } /* XXX: llapi_xxx() functions return negative values upon failure */ @@ -262,7 +272,7 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset, stripe_size, page_size); return rc; } - if (!llapi_stripe_offset_is_valid(stripe_offset)) { + if (!llapi_stripe_index_is_valid(stripe_offset)) { rc = -EINVAL; llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe offset %d", stripe_offset); @@ -284,67 +294,6 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset, return 0; } -/* return the first file matching this pattern */ -static int first_match(char *pattern, char *buffer) -{ - glob_t glob_info; - - if (glob(pattern, GLOB_BRACE, NULL, &glob_info)) - return -ENOENT; - - if (glob_info.gl_pathc < 1) { - globfree(&glob_info); - return -ENOENT; - } - - strcpy(buffer, glob_info.gl_pathv[0]); - - globfree(&glob_info); - return 0; -} - -static int find_target_obdpath(char *fsname, char *path) -{ - glob_t glob_info; - char pattern[PATH_MAX + 1]; - int rc; - - snprintf(pattern, PATH_MAX, - "/proc/fs/lustre/lov/%s-*/target_obd", - fsname); - rc = glob(pattern, GLOB_BRACE, NULL, &glob_info); - if (rc == GLOB_NOMATCH) - return -ENODEV; - else if (rc) - return -EINVAL; - - strcpy(path, glob_info.gl_pathv[0]); - globfree(&glob_info); - return 0; -} - -static int find_poolpath(char *fsname, char *poolname, char *poolpath) -{ - glob_t glob_info; - char pattern[PATH_MAX + 1]; - int rc; - - snprintf(pattern, PATH_MAX, - "/proc/fs/lustre/lov/%s-*/pools/%s", - fsname, poolname); - rc = glob(pattern, GLOB_BRACE, NULL, &glob_info); - /* If no pools, make sure the lov is available */ - if ((rc == GLOB_NOMATCH) && - (find_target_obdpath(fsname, poolpath) == -ENODEV)) - return -ENODEV; - if (rc) - return -EINVAL; - - strcpy(poolpath, glob_info.gl_pathv[0]); - globfree(&glob_info); - return 0; -} - /* * Trim a trailing newline from a string, if it exists. */ @@ -363,200 +312,11 @@ int llapi_chomp_string(char *buf) return '\n'; } -/** - * return a parameter string for a specific device type or mountpoint - * - * \param param_path the path to the file containing parameter data - * \param result buffer for parameter value string - * \param result_size size of buffer for return value - * - * The \param param_path is appended to /proc/{fs,sys}/{lnet,lustre} to - * complete the absolute path to the file containing the parameter data - * the user is requesting. If that file exist then the data is read from - * the file and placed into the \param result buffer that is passed by - * the user. Data is only copied up to the \param result_size to prevent - * overflow of the array. - * - * Return 0 for success, with a NUL-terminated string in \param result. - * Return -ve value for error. - */ -int get_param(const char *param_path, char *result, - unsigned int result_size) -{ - char file[PATH_MAX + 1], pattern[PATH_MAX + 1], buf[result_size]; - FILE *fp = NULL; - int rc = 0; - - snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s", - param_path); - rc = first_match(pattern, file); - if (rc != 0 || result == NULL) - return rc; - - fp = fopen(file, "r"); - if (fp != NULL) { - while (fgets(buf, result_size, fp) != NULL) - strcpy(result, buf); - fclose(fp); - } else { - rc = -errno; - } - return rc; -} - -#define DEVICES_LIST "/proc/fs/lustre/devices" - -/** - * return a parameter string for a specific device type or mountpoint - * - * \param fsname Lustre filesystem name (optional) - * \param file_path path to file in filesystem (optional, if fsname unset) - * \param obd_type Lustre OBD device type - * \param param_name parameter name to fetch - * \param value return buffer for parameter value string - * \param val_len size of buffer for return value - * - * If fsname is specified then the parameter will be from that filesystem - * (if it exists). If file_path is given and it is in a mounted Lustre - * filesystem, then the parameter will be otherwise the value may be - * from any mounted filesystem (if there is more than one). - * - * If "obd_type" matches a Lustre device then the first matching device - * (as with "lctl dl", constrained by \param fsname or \param mount_path) - * will be used to provide the return value, otherwise the first such - * device found will be used. - * - * Return 0 for success, with a NUL-terminated string in \param buffer. - * Return -ve value for error. - */ -static int get_param_obdvar(const char *fsname, const char *file_path, - const char *obd_type, const char *param_name, - char *value, unsigned int val_len) -{ - char devices[PATH_MAX]; - char dev[PATH_MAX] = "*"; - char fs[PATH_MAX]; - FILE *fp = NULL; - int rc = 0; - - fp = fopen(DEVICES_LIST, "r"); - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST); - goto out; - } - - if (fsname == NULL && file_path != NULL) { - rc = llapi_search_fsname(file_path, fs); - if (rc) { - llapi_error(LLAPI_MSG_ERROR, rc, - "'%s' is not on a Lustre filesystem", - file_path); - goto out; - } - } else if (fsname != NULL) { - rc = strlcpy(fs, fsname, sizeof(fs)); - if (rc >= sizeof(fs)) { - rc = -E2BIG; - goto out; - } - } - - while (fgets(devices, sizeof(devices) - 1, fp) != NULL) { - char *bufp = devices, *tmp; - - devices[sizeof(devices) - 1] = '\0'; - while (bufp[0] == ' ') - ++bufp; - - tmp = strstr(bufp, obd_type); - if (tmp != NULL) { - tmp += strlen(obd_type) + 1; - if (strcmp(tmp, fs)) - continue; - rc = strlcpy(dev, tmp, sizeof(dev)); - if (rc >= sizeof(dev)) { - rc = -E2BIG; - goto out; - } - - tmp = strchr(dev, ' '); - if (tmp != NULL) - *tmp = '\0'; - break; - } - } - - if (dev[0] == '*' && strlen(fs)) { - rc = snprintf(dev, sizeof(dev), "%s-*", fs); - if (rc >= sizeof(dev)) { - rc = -E2BIG; - goto out; - } - } - rc = snprintf(devices, sizeof(devices), "%s/%s/%s", obd_type, dev, - param_name); - if (rc >= sizeof(devices)) { - rc = -E2BIG; - goto out; - } - - fclose(fp); - return get_param(devices, value, val_len); -out: - if (fp != NULL) - fclose(fp); - return rc; -} - /* - * TYPE one of llite, lmv, lov. - * /proc/fs/lustre/TYPE/INST the directory of interest. + * Wrapper to grab parameter settings for lov.*-clilov-*.* values */ -static int get_param_cli(const char *type, const char *inst, - const char *param, char *buf, size_t buf_size) -{ - char param_path[PATH_MAX + 1]; - FILE *param_file = NULL; - int rc; - - snprintf(param_path, sizeof(param_path), - "/proc/fs/lustre/%s/%s/%s", type, inst, param); - - param_file = fopen(param_path, "r"); - if (param_file == NULL) { - rc = -errno; - goto out; - } - - if (fgets(buf, buf_size, param_file) == NULL) { - rc = -errno; - goto out; - } - - rc = 0; -out: - if (param_file != NULL) - fclose(param_file); - - return rc; -} - -static int get_param_llite(const char *path, - const char *param, char *buf, size_t buf_size) -{ - char inst[80]; - int rc; - - rc = llapi_getname(path, inst, sizeof(inst)); - if (rc != 0) - return rc; - - return get_param_cli("llite", inst, param, buf, buf_size); -} - -static int get_param_lov(const char *path, - const char *param, char *buf, size_t buf_size) +static int get_param_lov(const char *path, const char *param, + char *buf, size_t buf_size) { struct obd_uuid uuid; int rc; @@ -565,11 +325,15 @@ static int get_param_lov(const char *path, if (rc != 0) return rc; - return get_param_cli("lov", uuid.uuid, param, buf, buf_size); + return get_lustre_param_value("lov", uuid.uuid, FILTER_BY_EXACT, param, + buf, buf_size); } -static int get_param_lmv(const char *path, - const char *param, char *buf, size_t buf_size) +/* + * Wrapper to grab parameter settings for lmv.*-clilov-*.* values + */ +static int get_param_lmv(const char *path, const char *param, + char *buf, size_t buf_size) { struct obd_uuid uuid; int rc; @@ -578,26 +342,29 @@ static int get_param_lmv(const char *path, if (rc != 0) return rc; - return get_param_cli("lmv", uuid.uuid, param, buf, buf_size); + return get_lustre_param_value("lmv", uuid.uuid, FILTER_BY_EXACT, param, + buf, buf_size); } static int get_mds_md_size(const char *path) { + char buf[PATH_MAX], inst[PATH_MAX]; int md_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3); - char buf[80]; int rc; - /* Get the max ea size from llite proc. */ - rc = get_param_llite(path, "max_easize", buf, sizeof(buf)); + rc = llapi_getname(path, inst, sizeof(inst)); if (rc != 0) - goto out; + return md_size; + + /* Get the max ea size from llite parameters. */ + rc = get_lustre_param_value("llite", inst, FILTER_BY_EXACT, + "max_easize", buf, sizeof(buf)); + if (rc != 0) + return md_size; rc = atoi(buf); - if (rc > 0) - md_size = rc; -out: - return md_size; + return rc > 0 ? rc : md_size; } int llapi_get_agent_uuid(char *path, char *buf, size_t bufsize) @@ -614,23 +381,43 @@ int llapi_get_agent_uuid(char *path, char *buf, size_t bufsize) */ int llapi_search_ost(char *fsname, char *poolname, char *ostname) { - FILE *fd; - char buffer[PATH_MAX + 1]; - int len = 0, rc; + char buffer[PATH_MAX]; + size_t len = 0; + glob_t param; + FILE *fd; + int rc; - if (ostname != NULL) - len = strlen(ostname); + /* You need one or the other */ + if (poolname == NULL && fsname == NULL) + return -EINVAL; - if (poolname == NULL) { - if (len == 0) - rc = -EINVAL; - else - rc = find_target_obdpath(fsname, buffer); + if (ostname != NULL) + len = strlen(ostname); + + if (poolname == NULL && len == 0) + return -EINVAL; + + /* Search by poolname and fsname if is not NULL */ + if (poolname != NULL) { + rc = poolpath(¶m, fsname, NULL); + if (rc == 0) { + snprintf(buffer, sizeof(buffer), "%s/%s", + param.gl_pathv[0], poolname); + } + } else if (fsname != NULL) { + rc = get_lustre_param_path("lov", fsname, + FILTER_BY_FS_NAME, + "target_obd", ¶m); + if (rc == 0) { + strncpy(buffer, param.gl_pathv[0], + sizeof(buffer)); + } } else { - rc = find_poolpath(fsname, poolname, buffer); + return -EINVAL; } - if (rc) - return rc; + cfs_free_param_data(¶m); + if (rc) + return rc; fd = fopen(buffer, "r"); if (fd == NULL) @@ -822,8 +609,8 @@ retry_open: errmsg = strerror(errno); llapi_err_noerrno(LLAPI_MSG_ERROR, - "error on ioctl "LPX64" for '%s' (%d): %s", - (__u64)LL_IOC_LOV_SETSTRIPE, name, fd, + "error on ioctl %#jx for '%s' (%d): %s", + (uintmax_t)LL_IOC_LOV_SETSTRIPE, name, fd, errmsg); close(fd); @@ -1038,8 +825,8 @@ int llapi_direntry_remove(char *dname) if (ioctl(fd, LL_IOC_REMOVE_ENTRY, filename)) { char *errmsg = strerror(errno); llapi_err_noerrno(LLAPI_MSG_ERROR, - "error on ioctl "LPX64" for '%s' (%d): %s", - (__u64)LL_IOC_LMV_SETSTRIPE, filename, + "error on ioctl %#jx for '%s' (%d): %s", + (uintmax_t)LL_IOC_LMV_SETSTRIPE, filename, fd, errmsg); } out: @@ -1056,21 +843,21 @@ out: */ int get_root_path(int want, char *fsname, int *outfd, char *path, int index) { - struct mntent mnt; - char buf[PATH_MAX], mntdir[PATH_MAX]; - char *ptr; - FILE *fp; - int idx = 0, len = 0, mntlen, fd; - int rc = -ENODEV; + struct mntent mnt; + char buf[PATH_MAX], mntdir[PATH_MAX]; + char *ptr, *ptr_end; + FILE *fp; + int idx = 0, len = 0, mntlen, fd; + int rc = -ENODEV; /* get the mount point */ - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - rc = -EIO; - llapi_error(LLAPI_MSG_ERROR, rc, - "setmntent(%s) failed", MOUNTED); - return rc; - } + fp = setmntent(PROC_MOUNTS, "r"); + if (fp == NULL) { + rc = -EIO; + llapi_error(LLAPI_MSG_ERROR, rc, + "setmntent(%s) failed", PROC_MOUNTS); + return rc; + } while (1) { if (getmntent_r(fp, &mnt, buf, sizeof(buf)) == NULL) break; @@ -1082,58 +869,71 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index) continue; mntlen = strlen(mnt.mnt_dir); - ptr = strrchr(mnt.mnt_fsname, '/'); + ptr = strchr(mnt.mnt_fsname, '/'); + while (ptr && *ptr == '/') + ptr++; /* thanks to the call to llapi_is_lustre_mnt() above, * we are sure that mnt.mnt_fsname contains ":/", * so ptr should never be NULL */ if (ptr == NULL) continue; - ptr++; + ptr_end = ptr; + while (*ptr_end != '/' && *ptr_end != '\0') + ptr_end++; - /* Check the fsname for a match, if given */ + /* Check the fsname for a match, if given */ if (!(want & WANT_FSNAME) && fsname != NULL && - (strlen(fsname) > 0) && (strcmp(ptr, fsname) != 0)) + (strlen(fsname) > 0) && + (strncmp(ptr, fsname, ptr_end - ptr) != 0)) continue; /* If the path isn't set return the first one we find */ - if (path == NULL || strlen(path) == 0) { - strcpy(mntdir, mnt.mnt_dir); - if ((want & WANT_FSNAME) && fsname != NULL) - strcpy(fsname, ptr); - rc = 0; - break; - /* Otherwise find the longest matching path */ - } else if ((strlen(path) >= mntlen) && (mntlen >= len) && - (strncmp(mnt.mnt_dir, path, mntlen) == 0)) { - strcpy(mntdir, mnt.mnt_dir); - len = mntlen; - if ((want & WANT_FSNAME) && fsname != NULL) - strcpy(fsname, ptr); - rc = 0; - } - } - endmntent(fp); - - /* Found it */ - if (rc == 0) { - if ((want & WANT_PATH) && path != NULL) - strcpy(path, mntdir); - if (want & WANT_FD) { - fd = open(mntdir, O_RDONLY | O_DIRECTORY | O_NONBLOCK); - if (fd < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "error opening '%s'", mntdir); + if (path == NULL || strlen(path) == 0) { + strncpy(mntdir, mnt.mnt_dir, strlen(mnt.mnt_dir)); + mntdir[strlen(mnt.mnt_dir)] = '\0'; + if ((want & WANT_FSNAME) && fsname != NULL) { + strncpy(fsname, ptr, ptr_end - ptr); + fsname[ptr_end - ptr] = '\0'; + } + rc = 0; + break; + /* Otherwise find the longest matching path */ + } else if ((strlen(path) >= mntlen) && (mntlen >= len) && + (strncmp(mnt.mnt_dir, path, mntlen) == 0)) { + strncpy(mntdir, mnt.mnt_dir, strlen(mnt.mnt_dir)); + mntdir[strlen(mnt.mnt_dir)] = '\0'; + len = mntlen; + if ((want & WANT_FSNAME) && fsname != NULL) { + strncpy(fsname, ptr, ptr_end - ptr); + fsname[ptr_end - ptr] = '\0'; + } + rc = 0; + } + } + endmntent(fp); - } else { - *outfd = fd; - } - } - } else if (want & WANT_ERROR) - llapi_err_noerrno(LLAPI_MSG_ERROR, - "can't find fs root for '%s': %d", - (want & WANT_PATH) ? fsname : path, rc); - return rc; + /* Found it */ + if (rc == 0) { + if ((want & WANT_PATH) && path != NULL) { + strncpy(path, mntdir, strlen(mntdir)); + path[strlen(mntdir)] = '\0'; + } + if (want & WANT_FD) { + fd = open(mntdir, O_RDONLY | O_DIRECTORY | O_NONBLOCK); + if (fd < 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "error opening '%s'", mntdir); + + } else { + *outfd = fd; + } + } + } else if (want & WANT_ERROR) + llapi_err_noerrno(LLAPI_MSG_ERROR, + "can't find fs root for '%s': %d", + (want & WANT_PATH) ? fsname : path, rc); + return rc; } /* @@ -1239,37 +1039,6 @@ int llapi_getname(const char *path, char *buf, size_t size) return rc; } - -/* - * find the pool directory path under /proc - * (can be also used to test if a fsname is known) - */ -static int poolpath(char *fsname, char *pathname, char *pool_pathname) -{ - int rc = 0; - char pattern[PATH_MAX + 1]; - char buffer[PATH_MAX]; - - if (fsname == NULL) { - rc = llapi_search_fsname(pathname, buffer); - if (rc != 0) - return rc; - fsname = buffer; - strcpy(pathname, fsname); - } - - snprintf(pattern, PATH_MAX, "/proc/fs/lustre/lov/%s-*/pools", fsname); - rc = first_match(pattern, buffer); - if (rc) - return rc; - - /* in fsname test mode, pool_pathname is NULL */ - if (pool_pathname != NULL) - strcpy(pool_pathname, buffer); - - return 0; -} - /** * Get the list of pool members. * \param poolname string of format \.\ @@ -1286,43 +1055,43 @@ int llapi_get_poolmembers(const char *poolname, char **members, { char fsname[PATH_MAX]; char *pool, *tmp; - char pathname[PATH_MAX]; - char path[PATH_MAX]; - char buf[1024]; - FILE *fd; - int rc = 0; - int nb_entries = 0; - int used = 0; + glob_t pathname; + char buf[PATH_MAX]; + FILE *fd; + int rc = 0; + int nb_entries = 0; + int used = 0; - /* name is FSNAME.POOLNAME */ + /* name is FSNAME.POOLNAME */ if (strlen(poolname) >= sizeof(fsname)) return -EOVERFLOW; strlcpy(fsname, poolname, sizeof(fsname)); - pool = strchr(fsname, '.'); - if (pool == NULL) - return -EINVAL; + pool = strchr(fsname, '.'); + if (pool == NULL) + return -EINVAL; - *pool = '\0'; - pool++; + *pool = '\0'; + pool++; - rc = poolpath(fsname, NULL, pathname); - if (rc != 0) { - llapi_error(LLAPI_MSG_ERROR, rc, - "Lustre filesystem '%s' not found", - fsname); - return rc; - } + rc = poolpath(&pathname, fsname, NULL); + if (rc != 0) { + llapi_error(LLAPI_MSG_ERROR, rc, + "Lustre filesystem '%s' not found", + fsname); + return rc; + } - llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fsname, pool); - rc = snprintf(path, sizeof(path), "%s/%s", pathname, pool); - if (rc >= sizeof(path)) + llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fsname, pool); + rc = snprintf(buf, sizeof(buf), "%s/%s", pathname.gl_pathv[0], pool); + cfs_free_param_data(&pathname); + if (rc >= sizeof(buf)) return -EOVERFLOW; - fd = fopen(path, "r"); - if (fd == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open %s", path); - return rc; - } + fd = fopen(buf, "r"); + if (fd == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "cannot open %s", buf); + return rc; + } rc = 0; while (fgets(buf, sizeof(buf), fd) != NULL) { @@ -1365,7 +1134,9 @@ int llapi_get_poolmembers(const char *poolname, char **members, int llapi_get_poollist(const char *name, char **poollist, int list_size, char *buffer, int buffer_size) { - char fsname[PATH_MAX + 1], rname[PATH_MAX + 1], pathname[PATH_MAX + 1]; + char rname[PATH_MAX]; + glob_t pathname; + char *fsname; char *ptr; DIR *dir; struct dirent pool; @@ -1393,50 +1164,45 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size, return rc; } - rc = poolpath(NULL, rname, pathname); - if (rc != 0) { - llapi_error(LLAPI_MSG_ERROR, rc, "'%s' is not" - " a Lustre filesystem", name); - return rc; - } - if (strlen(rname) > sizeof(fsname)-1) - return -E2BIG; - strncpy(fsname, rname, sizeof(fsname)); - } else { - /* name is FSNAME */ - if (strlen(name) > sizeof(fsname)-1) - return -E2BIG; - strncpy(fsname, name, sizeof(fsname)); - rc = poolpath(fsname, NULL, pathname); - } - if (rc != 0) { - llapi_error(LLAPI_MSG_ERROR, rc, - "Lustre filesystem '%s' not found", name); - return rc; - } + fsname = strdup(rname); + if (!fsname) + return -ENOMEM; - llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname); - dir = opendir(pathname); - if (dir == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "Could not open pool list for '%s'", - name); - return rc; - } + rc = poolpath(&pathname, NULL, rname); + } else { + /* name is FSNAME */ + fsname = strdup(name); + if (!fsname) + return -ENOMEM; + rc = poolpath(&pathname, fsname, NULL); + } + if (rc != 0) { + llapi_error(LLAPI_MSG_ERROR, rc, + "Lustre filesystem '%s' not found", name); + goto free_path; + } - while(1) { - rc = readdir_r(dir, &pool, &cookie); + llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname); + dir = opendir(pathname.gl_pathv[0]); + if (dir == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Could not open pool list for '%s'", + name); + goto free_path; + } - if (rc != 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "Error reading pool list for '%s'", name); - goto out; - } else if ((rc == 0) && (cookie == NULL)) { - /* end of directory */ - break; - } + while(1) { + rc = readdir_r(dir, &pool, &cookie); + if (rc != 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Error reading pool list for '%s'", name); + goto free_path; + } else if ((rc == 0) && (cookie == NULL)) { + /* end of directory */ + break; + } /* ignore . and .. */ if (!strcmp(pool.d_name, ".") || !strcmp(pool.d_name, "..")) @@ -1445,14 +1211,14 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size, /* check output bounds */ if (nb_entries >= list_size) { rc = -EOVERFLOW; - goto out; + goto free_dir; } /* +2 for '.' and final '\0' */ if (used + strlen(pool.d_name) + strlen(fsname) + 2 > buffer_size) { rc = -EOVERFLOW; - goto out; + goto free_dir; } sprintf(buffer + used, "%s.%s", fsname, pool.d_name); @@ -1461,19 +1227,24 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size, nb_entries++; } -out: - closedir(dir); - return ((rc != 0) ? rc : nb_entries); +free_dir: + closedir(dir); +free_path: + cfs_free_param_data(&pathname); + if (fsname) + free(fsname); + return rc != 0 ? rc : nb_entries; } /* wrapper for lfs.c and obd.c */ int llapi_poollist(const char *name) { - /* list of pool names (assume that pool count is smaller - than OST count) */ - char **list, *buffer = NULL, *path = NULL, *fsname = NULL; - int obdcount, bufsize, rc, nb, i; - char *poolname = NULL, *tmp = NULL, data[16]; + /* list of pool names (assume that pool count is smaller + than OST count) */ + char **list, *buffer = NULL, *fsname = (char *)name; + char *poolname = NULL, *tmp = NULL, data[16]; + enum param_filter type = FILTER_BY_PATH; + int obdcount, bufsize, rc, nb, i; if (name == NULL) return -EINVAL; @@ -1483,18 +1254,17 @@ int llapi_poollist(const char *name) if (fsname == NULL) return -ENOMEM; - poolname = strchr(fsname, '.'); - if (poolname) - *poolname = '\0'; - } else { - path = (char *) name; - } + poolname = strchr(fsname, '.'); + if (poolname) + *poolname = '\0'; + type = FILTER_BY_FS_NAME; + } - rc = get_param_obdvar(fsname, path, "lov", "numobd", - data, sizeof(data)); - if (rc < 0) - goto err; - obdcount = atoi(data); + rc = get_lustre_param_value("lov", fsname, type, "numobd", + data, sizeof(data)); + if (rc < 0) + goto err; + obdcount = atoi(data); /* Allocate space for each fsname-OST0000_UUID, 1 per OST, * and also an array to store the pointers for all that @@ -1530,9 +1300,9 @@ retry_get_pools: err: if (buffer) free(buffer); - if (fsname) - free(fsname); - return rc; + if (fsname != NULL && type == FILTER_BY_FS_NAME) + free(fsname); + return rc; } typedef int (semantic_func_t)(char *path, DIR *parent, DIR **d, @@ -1598,21 +1368,21 @@ static int cb_common_fini(char *path, DIR *parent, DIR **dirp, void *data, } /* set errno upon failure */ -static DIR *opendir_parent(char *path) +static DIR *opendir_parent(const char *path) { - DIR *parent; - char *fname; - char c; - - fname = strrchr(path, '/'); - if (fname == NULL) - return opendir("."); - - c = fname[1]; - fname[1] = '\0'; - parent = opendir(path); - fname[1] = c; - return parent; + char *path_copy; + char *parent_path; + DIR *parent; + + path_copy = strdup(path); + if (path_copy == NULL) + return NULL; + + parent_path = dirname(path_copy); + parent = opendir(parent_path); + free(path_copy); + + return parent; } static int cb_get_dirstripe(char *path, DIR *d, struct find_param *param) @@ -1867,26 +1637,26 @@ int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name) int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid) { - int fd, rc; + int fd, rc; - fd = open(path, O_RDONLY); - if (fd < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); - return rc; - } + fd = open(path, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); + return rc; + } - rc = llapi_file_fget_lov_uuid(fd, lov_uuid); + rc = llapi_file_fget_lov_uuid(fd, lov_uuid); - close(fd); - return rc; + close(fd); + return rc; } int llapi_file_get_lmv_uuid(const char *path, struct obd_uuid *lov_uuid) { int fd, rc; - fd = open(path, O_RDONLY); + fd = open(path, O_RDONLY | O_NONBLOCK); if (fd < 0) { rc = -errno; llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); @@ -1903,6 +1673,7 @@ enum tgt_type { LOV_TYPE = 1, LMV_TYPE }; + /* * If uuidp is NULL, return the number of available obd uuids. * If uuidp is non-NULL, then it will return the uuids of the obds. If @@ -1912,32 +1683,33 @@ enum tgt_type { static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp, int *ost_count, enum tgt_type type) { + char buf[PATH_MAX], format[32]; + int rc = 0, index = 0; struct obd_uuid name; - char buf[1024]; - char format[32]; + glob_t param; FILE *fp; - int rc = 0, index = 0; - /* Get the lov name */ - if (type == LOV_TYPE) { - rc = llapi_file_fget_lov_uuid(fd, &name); - if (rc) - return rc; - } else { - rc = llapi_file_fget_lmv_uuid(fd, &name); - if (rc) - return rc; - } + /* Get the lov name */ + if (type == LOV_TYPE) + rc = llapi_file_fget_lov_uuid(fd, &name); + else + rc = llapi_file_fget_lmv_uuid(fd, &name); + if (rc != 0) + return rc; - /* Now get the ost uuids from /proc */ - snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd", - type == LOV_TYPE ? "lov" : "lmv", name.uuid); - fp = fopen(buf, "r"); - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf); - return rc; - } + /* Now get the ost uuids */ + rc = get_lustre_param_path(type == LOV_TYPE ? "lov" : "lmv", name.uuid, + FILTER_BY_EXACT, "target_obd", ¶m); + if (rc != 0) + return -ENOENT; + + fp = fopen(param.gl_pathv[0], "r"); + if (fp == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", + param.gl_pathv[0]); + goto free_param; + } snprintf(format, sizeof(format), "%%d: %%%zus", sizeof(uuidp[0].uuid) - 1); @@ -1954,8 +1726,10 @@ static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp, if (uuidp && (index > *ost_count)) rc = -EOVERFLOW; - *ost_count = index; - return rc; + *ost_count = index; +free_param: + cfs_free_param_data(¶m); + return rc; } int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count) @@ -2012,44 +1786,52 @@ int llapi_uuid_match(char *real_uuid, char *search_uuid) static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) { struct obd_uuid obd_uuid; - char buf[1024]; + char buf[PATH_MAX]; + glob_t param_data; char format[32]; - FILE *fp; int rc = 0; + FILE *fp; if (param->fp_got_uuids) - return rc; + return rc; - /* Get the lov/lmv name */ + /* Get the lov/lmv name */ if (param->fp_get_lmv) - rc = llapi_file_fget_lmv_uuid(dirfd(dir), &obd_uuid); - else - rc = llapi_file_fget_lov_uuid(dirfd(dir), &obd_uuid); - if (rc) { - if (rc != -ENOTTY) { - llapi_error(LLAPI_MSG_ERROR, rc, - "error: can't get lov name: %s", dname); - } else { - rc = 0; - } - return rc; - } + rc = llapi_file_fget_lmv_uuid(dirfd(dir), &obd_uuid); + else + rc = llapi_file_fget_lov_uuid(dirfd(dir), &obd_uuid); + if (rc) { + if (rc != -ENOTTY) { + llapi_error(LLAPI_MSG_ERROR, rc, + "error: can't get %s name: %s", + param->fp_get_lmv ? "lmv" : "lov", + dname); + } else { + rc = 0; + } + return rc; + } param->fp_got_uuids = 1; - /* Now get the ost uuids from /proc */ - snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd", - param->fp_get_lmv ? "lmv" : "lov", obd_uuid.uuid); - fp = fopen(buf, "r"); - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf); - return rc; - } + /* Now get the ost uuids */ + rc = get_lustre_param_path(param->fp_get_lmv ? "lmv" : "lov", + obd_uuid.uuid, FILTER_BY_EXACT, + "target_obd", ¶m_data); + if (rc != 0) + return -ENOENT; + + fp = fopen(param_data.gl_pathv[0], "r"); + if (fp == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", + param_data.gl_pathv[0]); + goto free_param; + } if (!param->fp_obd_uuid && !param->fp_quiet && !param->fp_obds_printed) llapi_printf(LLAPI_MSG_NORMAL, "%s:\n", - param->fp_get_lmv ? "MDTS" : "OBDS:"); + param->fp_get_lmv ? "MDTS" : "OBDS"); snprintf(format, sizeof(format), "%%d: %%%zus", sizeof(obd_uuid.uuid) - 1); @@ -2080,8 +1862,9 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) __func__, param->fp_obd_uuid->uuid); rc = -EINVAL; } - - return (rc); +free_param: + cfs_free_param_data(¶m_data); + return rc; } /* In this case, param->fp_obd_uuid will be an array of obduuids and @@ -2104,27 +1887,25 @@ static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids, if (ret != 0) return ret; - obdcount = atoi(buf); - uuids = (struct obd_uuid *)malloc(obdcount * - sizeof(struct obd_uuid)); - if (uuids == NULL) - return -ENOMEM; + obdcount = atoi(buf); + uuids = malloc(obdcount * sizeof(struct obd_uuid)); + if (uuids == NULL) + return -ENOMEM; retry_get_uuids: - ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type); - if (ret) { - struct obd_uuid *uuids_temp; + ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type); + if (ret) { + if (ret == -EOVERFLOW) { + struct obd_uuid *uuids_temp; - if (ret == -EOVERFLOW) { - uuids_temp = realloc(uuids, obdcount * - sizeof(struct obd_uuid)); + uuids_temp = realloc(uuids, obdcount * + sizeof(struct obd_uuid)); if (uuids_temp != NULL) { uuids = uuids_temp; - goto retry_get_uuids; + goto retry_get_uuids; } - else - ret = -ENOMEM; - } + ret = -ENOMEM; + } llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed"); goto out_free; @@ -2219,109 +2000,43 @@ int llapi_ostlist(char *path, struct find_param *param) } /* - * Given a filesystem name, or a pathname of a file on a lustre filesystem, - * tries to determine the path to the filesystem's clilov directory under /proc - * - * fsname is limited to MTI_NAME_MAXLEN in lustre_idl.h - * The NUL terminator is compensated by the additional "%s" bytes. */ -#define LOV_LEN (sizeof("/proc/fs/lustre/lov/%s-clilov-*") + MTI_NAME_MAXLEN) -static int clilovpath(const char *fsname, const char *const pathname, - char *clilovpath) -{ - int rc; - char pattern[LOV_LEN]; - char buffer[PATH_MAX + 1]; - - if (fsname == NULL) { - rc = llapi_search_fsname(pathname, buffer); - if (rc != 0) - return rc; - fsname = buffer; - } - - snprintf(pattern, sizeof(pattern), "/proc/fs/lustre/lov/%s-clilov-*", - fsname); - - rc = first_match(pattern, buffer); - if (rc != 0) - return rc; - - strlcpy(clilovpath, buffer, sizeof(buffer)); - - return 0; -} - -/* - * Given the path to a stripe attribute proc file, tries to open and - * read the attribute and return the value using the attr parameter - */ -static int sattr_read_attr(const char *const fpath, - unsigned int *attr) -{ - - FILE *f; - char line[PATH_MAX + 1]; - int rc = 0; - - f = fopen(fpath, "r"); - if (f == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open '%s'", fpath); - return rc; - } - - if (fgets(line, sizeof(line), f) != NULL) { - *attr = atoi(line); - } else { - llapi_error(LLAPI_MSG_ERROR, errno, "Cannot read from '%s'", fpath); - rc = 1; - } - - fclose(f); - return rc; -} - -/* * Tries to determine the default stripe attributes for a given filesystem. The * filesystem to check should be specified by fsname, or will be determined * using pathname. */ static int sattr_get_defaults(const char *const fsname, - const char *const pathname, unsigned int *scount, unsigned int *ssize, unsigned int *soffset) { - int rc; - char dpath[PATH_MAX + 1]; - char fpath[PATH_MAX + 1]; - - rc = clilovpath(fsname, pathname, dpath); - if (rc != 0) - return rc; + char val[PATH_MAX]; + int rc; - if (scount) { - snprintf(fpath, PATH_MAX, "%s/stripecount", dpath); - rc = sattr_read_attr(fpath, scount); - if (rc != 0) - return rc; - } + if (scount) { + rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME, + "stripecount", val, sizeof(val)); + if (rc != 0) + return rc; + *scount = atoi(val); + } - if (ssize) { - snprintf(fpath, PATH_MAX, "%s/stripesize", dpath); - rc = sattr_read_attr(fpath, ssize); - if (rc != 0) - return rc; - } + if (ssize) { + rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME, + "stripesize", val, sizeof(val)); + if (rc != 0) + return rc; + *ssize = atoi(val); + } - if (soffset) { - snprintf(fpath, PATH_MAX, "%s/stripeoffset", dpath); - rc = sattr_read_attr(fpath, soffset); - if (rc != 0) - return rc; - } + if (soffset) { + rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME, + "stripeoffset", val, sizeof(val)); + if (rc != 0) + return rc; + *soffset = atoi(val); + } - return 0; + return 0; } /* @@ -2363,8 +2078,7 @@ static int sattr_cache_get_defaults(const char *const fsname, * successfully retrieved and stored in tmp before writing to * cache. */ - rc = sattr_get_defaults(fsname_buf, NULL, &tmp[0], &tmp[1], - &tmp[2]); + rc = sattr_get_defaults(fsname_buf, &tmp[0], &tmp[1], &tmp[2]); if (rc != 0) return rc; @@ -2385,13 +2099,13 @@ static int sattr_cache_get_defaults(const char *const fsname, } static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, - struct lov_user_ost_data_v1 *objects, - int is_dir, int verbose, int depth, - int raw, char *pool_name) + struct lov_user_ost_data_v1 *objects, + int is_dir, int verbose, int depth, + int raw, char *pool_name) { - char *prefix = is_dir ? "" : "lmm_"; + char *prefix = is_dir ? "" : "lmm_"; char *separator = ""; - int rc; + int rc; if (is_dir && lmm_oi_seq(&lum->lmm_oi) == FID_SEQ_LOV_DEFAULT) { lmm_oi_set_seq(&lum->lmm_oi, 0); @@ -2399,69 +2113,97 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, llapi_printf(LLAPI_MSG_NORMAL, "(Default) "); } - if (depth && path && ((verbose != VERBOSE_OBJID) || !is_dir)) - llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path); + if (depth && path && ((verbose != VERBOSE_OBJID) || !is_dir)) + llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path); if ((verbose & VERBOSE_DETAIL) && !is_dir) { llapi_printf(LLAPI_MSG_NORMAL, "lmm_magic: 0x%08X\n", lum->lmm_magic); - llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq: "LPX64"\n", - lmm_oi_seq(&lum->lmm_oi)); - llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id: "LPX64"\n", - lmm_oi_id(&lum->lmm_oi)); + llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq: %#jx\n", + (uintmax_t)lmm_oi_seq(&lum->lmm_oi)); + llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id: %#jx\n", + (uintmax_t)lmm_oi_id(&lum->lmm_oi)); + } + if ((verbose & (VERBOSE_DETAIL | VERBOSE_DFID)) && !is_dir) { + if (verbose & ~VERBOSE_DFID) + llapi_printf(LLAPI_MSG_NORMAL, "lmm_fid: "); + /* This needs a bit of hand-holding since old 1.x lmm_oi + * have { oi.oi_id = mds_inum, oi.oi_seq = 0 } and 2.x lmm_oi + * have { oi.oi_id = mds_oid, oi.oi_seq = mds_seq } instead of + * a real FID. Ideally the 2.x code would have stored this + * like a FID with { oi_id = mds_seq, oi_seq = mds_oid } so the + * ostid union lu_fid { f_seq = mds_seq, f_oid = mds_oid } + * worked properly (especially since IGIF FIDs use mds_inum as + * the FID SEQ), but unfortunately that didn't happen. + * + * Print it to look like an IGIF FID, even though the fields + * are reversed on disk, so that it makes sense to userspace. + * + * Don't use ostid_id() and ostid_seq(), since they assume the + * oi_fid fields are in the right order. This is why there are + * separate lmm_oi_seq() and lmm_oi_id() routines for this. + * + * For newer layout types hopefully this will be a real FID. */ + llapi_printf(LLAPI_MSG_NORMAL, DFID"\n", + lmm_oi_seq(&lum->lmm_oi) == 0 ? + lmm_oi_id(&lum->lmm_oi) : + lmm_oi_seq(&lum->lmm_oi), + lmm_oi_seq(&lum->lmm_oi) == 0 ? + 0 : (__u32)lmm_oi_id(&lum->lmm_oi), + (__u32)(lmm_oi_id(&lum->lmm_oi) >> 32)); } - if (verbose & VERBOSE_COUNT) { - if (verbose & ~VERBOSE_COUNT) - llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_count: ", - prefix); - if (is_dir) { - if (!raw && lum->lmm_stripe_count == 0) { - unsigned int scount; - rc = sattr_cache_get_defaults(NULL, path, - &scount, NULL, - NULL); - if (rc == 0) + if (verbose & VERBOSE_COUNT) { + if (verbose & ~VERBOSE_COUNT) + llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_count: ", + prefix); + if (is_dir) { + if (!raw && lum->lmm_stripe_count == 0) { + unsigned int scount; + rc = sattr_cache_get_defaults(NULL, path, + &scount, NULL, + NULL); + if (rc == 0) llapi_printf(LLAPI_MSG_NORMAL, "%d", scount); - else - llapi_error(LLAPI_MSG_ERROR, rc, - "Cannot determine default" - " stripe count."); - } else { + else + llapi_error(LLAPI_MSG_ERROR, rc, + "Cannot determine default" + " stripe count."); + } else { llapi_printf(LLAPI_MSG_NORMAL, "%d", - lum->lmm_stripe_count == - (typeof(lum->lmm_stripe_count))(-1) + lum->lmm_stripe_count == + (typeof(lum->lmm_stripe_count))(-1) ? -1 : lum->lmm_stripe_count); - } - } else { + } + } else { llapi_printf(LLAPI_MSG_NORMAL, "%hd", (__s16)lum->lmm_stripe_count); - } + } separator = is_dir ? " " : "\n"; - } + } - if (verbose & VERBOSE_SIZE) { + if (verbose & VERBOSE_SIZE) { llapi_printf(LLAPI_MSG_NORMAL, "%s", separator); - if (verbose & ~VERBOSE_SIZE) - llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size: ", - prefix); - if (is_dir && !raw && lum->lmm_stripe_size == 0) { - unsigned int ssize; - rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize, - NULL); - if (rc == 0) + if (verbose & ~VERBOSE_SIZE) + llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size: ", + prefix); + if (is_dir && !raw && lum->lmm_stripe_size == 0) { + unsigned int ssize; + rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize, + NULL); + if (rc == 0) llapi_printf(LLAPI_MSG_NORMAL, "%u", ssize); - else - llapi_error(LLAPI_MSG_ERROR, rc, - "Cannot determine default" - " stripe size."); - } else { + else + llapi_error(LLAPI_MSG_ERROR, rc, + "Cannot determine default" + " stripe size."); + } else { llapi_printf(LLAPI_MSG_NORMAL, "%u", lum->lmm_stripe_size); - } + } separator = is_dir ? " " : "\n"; - } + } if ((verbose & VERBOSE_LAYOUT) && !is_dir) { llapi_printf(LLAPI_MSG_NORMAL, "%s", separator); @@ -2472,42 +2214,42 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, separator = "\n"; } - if ((verbose & VERBOSE_GENERATION) && !is_dir) { + if ((verbose & VERBOSE_GENERATION) && !is_dir) { llapi_printf(LLAPI_MSG_NORMAL, "%s", separator); - if (verbose & ~VERBOSE_GENERATION) - llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ", - prefix); + if (verbose & ~VERBOSE_GENERATION) + llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ", + prefix); llapi_printf(LLAPI_MSG_NORMAL, "%u", (int)lum->lmm_layout_gen); separator = "\n"; - } + } - if (verbose & VERBOSE_OFFSET) { + if (verbose & VERBOSE_OFFSET) { llapi_printf(LLAPI_MSG_NORMAL, "%s", separator); - if (verbose & ~VERBOSE_OFFSET) - llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ", - prefix); - if (is_dir) + if (verbose & ~VERBOSE_OFFSET) + llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ", + prefix); + if (is_dir) llapi_printf(LLAPI_MSG_NORMAL, "%d", - lum->lmm_stripe_offset == - (typeof(lum->lmm_stripe_offset))(-1) ? -1 : + lum->lmm_stripe_offset == + (typeof(lum->lmm_stripe_offset))(-1) ? -1 : lum->lmm_stripe_offset); - else + else llapi_printf(LLAPI_MSG_NORMAL, "%u", objects[0].l_ost_idx); separator = is_dir ? " " : "\n"; - } + } - if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) { + if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) { llapi_printf(LLAPI_MSG_NORMAL, "%s", separator); - if (verbose & ~VERBOSE_POOL) - llapi_printf(LLAPI_MSG_NORMAL, "%spool: ", - prefix); + if (verbose & ~VERBOSE_POOL) + llapi_printf(LLAPI_MSG_NORMAL, "%spool: ", + prefix); llapi_printf(LLAPI_MSG_NORMAL, "%s", pool_name); - } + } - if (!is_dir || (is_dir && (verbose != VERBOSE_OBJID))) - llapi_printf(LLAPI_MSG_NORMAL, "\n"); + if (!is_dir || (is_dir && (verbose != VERBOSE_OBJID))) + llapi_printf(LLAPI_MSG_NORMAL, "\n"); } void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name, @@ -2706,44 +2448,44 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir) int llapi_file_get_stripe(const char *path, struct lov_user_md *lum) { - const char *fname; - char *dname; - int fd, rc = 0; - - fname = strrchr(path, '/'); - - /* It should be a file (or other non-directory) */ - if (fname == NULL) { - dname = (char *)malloc(2); - if (dname == NULL) - return -ENOMEM; - strcpy(dname, "."); - fname = (char *)path; - } else { - dname = (char *)malloc(fname - path + 1); - if (dname == NULL) - return -ENOMEM; - strncpy(dname, path, fname - path); - dname[fname - path] = '\0'; - fname++; - } + const char *fname; + char *dname; + int fd, rc = 0; - fd = open(dname, O_RDONLY); - if (fd == -1) { - rc = -errno; - free(dname); - return rc; - } + fname = strrchr(path, '/'); - strcpy((char *)lum, fname); - if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1) - rc = -errno; + /* It should be a file (or other non-directory) */ + if (fname == NULL) { + dname = (char *)malloc(2); + if (dname == NULL) + return -ENOMEM; + strcpy(dname, "."); + fname = (char *)path; + } else { + dname = (char *)malloc(fname - path + 1); + if (dname == NULL) + return -ENOMEM; + strncpy(dname, path, fname - path); + dname[fname - path] = '\0'; + fname++; + } - if (close(fd) == -1 && rc == 0) - rc = -errno; + fd = open(dname, O_RDONLY | O_NONBLOCK); + if (fd == -1) { + rc = -errno; + free(dname); + return rc; + } - free(dname); - return rc; + strcpy((char *)lum, fname); + if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1) + rc = -errno; + + if (close(fd) == -1 && rc == 0) + rc = -errno; + + free(dname); + return rc; } int llapi_file_lookup(int dirfd, const char *name) @@ -3302,25 +3044,27 @@ decided: return 0; } -static int cb_mv_init(char *path, DIR *parent, DIR **dirp, - void *param_data, struct dirent64 *de) +static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp, + void *param_data, struct dirent64 *de) { struct find_param *param = (struct find_param *)param_data; - DIR *dir = parent; + DIR *tmp_parent = parent; char raw[OBD_MAX_IOCTL_BUFFER] = {'\0'}; char *rawbuf = raw; struct obd_ioctl_data data = { 0 }; int fd; int ret; + char *path_copy; char *filename; + bool retry = false; LASSERT(parent != NULL || dirp != NULL); if (dirp != NULL) closedir(*dirp); if (parent == NULL) { - dir = opendir_parent(path); - if (dir == NULL) { + tmp_parent = opendir_parent(path); + if (tmp_parent == NULL) { *dirp = NULL; ret = -errno; llapi_error(LLAPI_MSG_ERROR, ret, @@ -3329,9 +3073,10 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp, } } - fd = dirfd(dir); + fd = dirfd(tmp_parent); - filename = basename(path); + path_copy = strdup(path); + filename = basename(path_copy); data.ioc_inlbuf1 = (char *)filename; data.ioc_inllen1 = strlen(filename) + 1; data.ioc_inlbuf2 = (char *)¶m->fp_mdt_index; @@ -3343,10 +3088,22 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp, goto out; } +migrate: ret = ioctl(fd, LL_IOC_MIGRATE, rawbuf); if (ret != 0) { + if (errno == EBUSY && !retry) { + /* because migrate may not be able to lock all involved + * objects in order, for some of them it try lock, while + * there may be conflicting COS locks and cause migrate + * fail with EBUSY, hope a sync() could cause + * transaction commit and release these COS locks. */ + sync(); + retry = true; + goto migrate; + } ret = -errno; - fprintf(stderr, "%s migrate failed %d\n", path, ret); + fprintf(stderr, "%s migrate failed: %s (%d)\n", + path, strerror(-ret), ret); goto out; } else if (param->fp_verbose & VERBOSE_DETAIL) { fprintf(stdout, "migrate %s to MDT%d\n", @@ -3361,23 +3118,38 @@ out: * on the client side, and re-open to get the * new directory handle */ *dirp = opendir(path); - if (dirp == NULL) { + if (*dirp == NULL) { ret = -errno; llapi_error(LLAPI_MSG_ERROR, ret, "%s: Failed to open '%s'", __func__, path); - return ret; } } if (parent == NULL) - closedir(dir); + closedir(tmp_parent); + + free(path_copy); return ret; } +int llapi_migrate_mdt(char *path, struct find_param *param) +{ + return param_callback(path, cb_migrate_mdt_init, cb_common_fini, param); +} + int llapi_mv(char *path, struct find_param *param) { - return param_callback(path, cb_mv_init, cb_common_fini, param); +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 9, 53, 0) + static bool printed; + + if (!printed) { + llapi_error(LLAPI_MSG_ERROR, -ESTALE, + "llapi_mv() is deprecated, use llapi_migrate_mdt()\n"); + printed = true; + } +#endif + return llapi_migrate_mdt(path, param); } int llapi_find(char *path, struct find_param *param) @@ -3634,44 +3406,56 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index, int llapi_ping(char *obd_type, char *obd_name) { - char path[MAX_STRING_SIZE]; - char buf[1]; - int rc, fd; + glob_t path; + char buf[1]; + int rc, fd; - snprintf(path, MAX_STRING_SIZE, "/proc/fs/lustre/%s/%s/ping", - obd_type, obd_name); + rc = cfs_get_param_paths(&path, "%s/%s/ping", + obd_type, obd_name); + if (rc != 0) + return -errno; - fd = open(path, O_WRONLY); - if (fd < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); - return rc; - } + fd = open(path.gl_pathv[0], O_WRONLY); + if (fd < 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", + path.gl_pathv[0]); + goto failed; + } /* The purpose is to send a byte as a ping, whatever this byte is. */ /* coverity[uninit_use_in_call] */ - rc = write(fd, buf, 1); - if (rc < 0) - rc = -errno; - close(fd); + rc = write(fd, buf, 1); + if (rc < 0) + rc = -errno; + close(fd); - if (rc == 1) - return 0; - return rc; + if (rc == 1) + rc = 0; +failed: + cfs_free_param_data(&path); + return rc; } int llapi_target_iterate(int type_num, char **obd_type, void *args, llapi_cb_t cb) { - char buf[MAX_STRING_SIZE]; - FILE *fp = fopen(DEVICES_LIST, "r"); - int i, rc = 0; + char buf[MAX_STRING_SIZE]; + int i, rc = 0; + glob_t param; + FILE *fp; - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST); - return rc; - } + rc = cfs_get_param_paths(¶m, "devices"); + if (rc != 0) + return -ENOENT; + + fp = fopen(param.gl_pathv[0], "r"); + if (fp == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", + param.gl_pathv[0]); + goto free_path; + } while (fgets(buf, sizeof(buf), fp) != NULL) { char *obd_type_name = NULL; @@ -3697,9 +3481,11 @@ int llapi_target_iterate(int type_num, char **obd_type, cb(obd_type_name, obd_name, obd_uuid, args); } - } - fclose(fp); - return 0; + } + fclose(fp); +free_path: + cfs_free_param_data(¶m); + return 0; } static void do_target_check(char *obd_type_name, char *obd_name, @@ -3739,8 +3525,16 @@ int llapi_is_lustre_mnt(struct mntent *mnt) int llapi_quotactl(char *mnt, struct if_quotactl *qctl) { - DIR *root; - int rc; + char fsname[PATH_MAX + 1]; + DIR *root; + int rc; + + rc = llapi_search_fsname(mnt, fsname); + if (rc) { + llapi_err_noerrno(LLAPI_MSG_ERROR, + "'%s' isn't on Lustre filesystem", mnt); + return rc; + } root = opendir(mnt); if (!root) { @@ -3757,317 +3551,6 @@ int llapi_quotactl(char *mnt, struct if_quotactl *qctl) return rc; } -#include -#include -#include -#include -#include -#include - -static int rmtacl_notify(int ops) -{ - FILE *fp; - struct mntent *mnt; - int found = 0, fd = 0, rc = 0; - - fp = setmntent(MOUNTED, "r"); - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "error setmntent(%s)", MOUNTED); - return rc; - } - - while (1) { - mnt = getmntent(fp); - if (!mnt) - break; - - if (!llapi_is_lustre_mnt(mnt)) - continue; - - fd = open(mnt->mnt_dir, O_RDONLY | O_DIRECTORY); - if (fd < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "Can't open '%s'", mnt->mnt_dir); - goto out; - } - - rc = ioctl(fd, LL_IOC_RMTACL, ops); - close(fd); - if (rc < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "ioctl RMTACL on '%s' err %d", - mnt->mnt_dir, rc); - goto out; - } - - found++; - } - -out: - endmntent(fp); - return ((rc != 0) ? rc : found); -} - -static char *next_token(char *p, int div) -{ - if (p == NULL) - return NULL; - - if (div) - while (*p && *p != ':' && !isspace(*p)) - p++; - else - while (*p == ':' || isspace(*p)) - p++; - - return *p ? p : NULL; -} - -static int rmtacl_name2id(char *name, int is_user) -{ - if (is_user) { - struct passwd *pw; - - pw = getpwnam(name); - if (pw == NULL) - return INVALID_ID; - else - return (int)(pw->pw_uid); - } else { - struct group *gr; - - gr = getgrnam(name); - if (gr == NULL) - return INVALID_ID; - else - return (int)(gr->gr_gid); - } -} - -static int isodigit(int c) -{ - return (c >= '0' && c <= '7') ? 1 : 0; -} - -/* - * Whether the name is just digits string (uid/gid) already or not. - * Return value: - * 1: str is id - * 0: str is not id - */ -static int str_is_id(char *str) -{ - if (str == NULL) - return 0; - - if (*str == '0') { - str++; - if (*str == 'x' || *str == 'X') { /* for Hex. */ - if (!isxdigit(*(++str))) - return 0; - - while (isxdigit(*(++str))); - } else if (isodigit(*str)) { /* for Oct. */ - while (isodigit(*(++str))); - } - } else if (isdigit(*str)) { /* for Dec. */ - while (isdigit(*(++str))); - } - - return (*str == 0) ? 1 : 0; -} - -typedef struct { - char *name; - int length; - int is_user; - int next_token; -} rmtacl_name_t; - -#define RMTACL_OPTNAME(name) name, sizeof(name) - 1 - -static rmtacl_name_t rmtacl_namelist[] = { - { RMTACL_OPTNAME("user:"), 1, 0 }, - { RMTACL_OPTNAME("group:"), 0, 0 }, - { RMTACL_OPTNAME("default:user:"), 1, 0 }, - { RMTACL_OPTNAME("default:group:"), 0, 0 }, - /* for --tabular option */ - { RMTACL_OPTNAME("user"), 1, 1 }, - { RMTACL_OPTNAME("group"), 0, 1 }, - { 0 } -}; - -static int rgetfacl_output(char *str) -{ - char *start = NULL, *end = NULL; - int is_user = 0, n, id; - char c; - rmtacl_name_t *rn; - - if (str == NULL) - return -1; - - for (rn = rmtacl_namelist; rn->name; rn++) { - if(strncmp(str, rn->name, rn->length) == 0) { - if (!rn->next_token) - start = str + rn->length; - else - start = next_token(str + rn->length, 0); - is_user = rn->is_user; - break; - } - } - - end = next_token(start, 1); - if (end == NULL || start == end) { - n = printf("%s", str); - return n; - } - - c = *end; - *end = 0; - id = rmtacl_name2id(start, is_user); - if (id == INVALID_ID) { - if (str_is_id(start)) { - *end = c; - n = printf("%s", str); - } else - return -1; - } else if ((id == NOBODY_UID && is_user) || - (id == NOBODY_GID && !is_user)) { - *end = c; - n = printf("%s", str); - } else { - *end = c; - *start = 0; - n = printf("%s%d%s", str, id, end); - } - return n; -} - -static int child_status(int status) -{ - return WIFEXITED(status) ? WEXITSTATUS(status) : -1; -} - -static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *)) -{ - pid_t pid = 0; - int fd[2], status, rc; - FILE *fp; - char buf[PIPE_BUF]; - - if (output_func) { - if (pipe(fd) < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe"); - return rc; - } - - pid = fork(); - if (pid < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork"); - close(fd[0]); - close(fd[1]); - return rc; - } else if (!pid) { - /* child process redirects its output. */ - close(fd[0]); - close(1); - if (dup2(fd[1], 1) < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, - "Can't dup2 %d", fd[1]); - close(fd[1]); - return rc; - } - } else { - close(fd[1]); - } - } - - if (!pid) { - status = rmtacl_notify(ops); - if (status < 0) - return -errno; - - exit(execvp(argv[0], argv)); - } - - /* the following is parent process */ - fp = fdopen(fd[0], "r"); - if (fp == NULL) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed", fd[0]); - kill(pid, SIGKILL); - close(fd[0]); - return rc; - } - - while (fgets(buf, PIPE_BUF, fp) != NULL) { - if (output_func(buf) < 0) - fprintf(stderr, "WARNING: unexpected error!\n[%s]\n", - buf); - } - fclose(fp); - close(fd[0]); - - if (waitpid(pid, &status, 0) < 0) { - rc = -errno; - llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed", pid); - return rc; - } - - return child_status(status); -} - -int llapi_lsetfacl(int argc, char *argv[]) -{ - return do_rmtacl(argc, argv, RMT_LSETFACL, NULL); -} - -int llapi_lgetfacl(int argc, char *argv[]) -{ - return do_rmtacl(argc, argv, RMT_LGETFACL, NULL); -} - -int llapi_rsetfacl(int argc, char *argv[]) -{ - return do_rmtacl(argc, argv, RMT_RSETFACL, NULL); -} - -int llapi_rgetfacl(int argc, char *argv[]) -{ - return do_rmtacl(argc, argv, RMT_RGETFACL, rgetfacl_output); -} - -int llapi_cp(int argc, char *argv[]) -{ - int rc; - - rc = rmtacl_notify(RMT_RSETFACL); - if (rc < 0) - return rc; - - exit(execvp(argv[0], argv)); -} - -int llapi_ls(int argc, char *argv[]) -{ - int rc; - - rc = rmtacl_notify(RMT_LGETFACL); - if (rc < 0) - return rc; - - exit(execvp(argv[0], argv)); -} - /* Print mdtname 'name' into 'buf' using 'format'. Add -MDT0000 if needed. * format must have %s%s, buf must be > 16 * Eg: if name = "lustre-MDT0000", "lustre", or "lustre-MDT0000_UUID" @@ -4139,9 +3622,6 @@ int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp, rc = -errno; else rc = 0; - if (rc && want_error) - llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d err %d", opc, rc); - close(fd); return rc; } @@ -4354,48 +3834,50 @@ int llapi_changelog_clear(const char *mdtname, const char *idstr, } int llapi_fid2path(const char *device, const char *fidstr, char *buf, - int buflen, long long *recno, int *linkno) + int buflen, long long *recno, int *linkno) { - struct lu_fid fid; - struct getinfo_fid2path *gf; - int rc; + const char *fidstr_orig = fidstr; + struct lu_fid fid; + struct getinfo_fid2path *gf; + int rc; - while (*fidstr == '[') - fidstr++; + while (*fidstr == '[') + fidstr++; - sscanf(fidstr, SFID, RFID(&fid)); - if (!fid_is_sane(&fid)) { - llapi_err_noerrno(LLAPI_MSG_ERROR, - "bad FID format [%s], should be "DFID"\n", - fidstr, (__u64)1, 2, 0); - return -EINVAL; - } + sscanf(fidstr, SFID, RFID(&fid)); + if (!fid_is_sane(&fid)) { + llapi_err_noerrno(LLAPI_MSG_ERROR, + "bad FID format '%s', should be [seq:oid:ver]" + " (e.g. "DFID")\n", fidstr_orig, + (unsigned long long)FID_SEQ_NORMAL, 2, 0); + return -EINVAL; + } - gf = malloc(sizeof(*gf) + buflen); - if (gf == NULL) - return -ENOMEM; - gf->gf_fid = fid; - gf->gf_recno = *recno; - gf->gf_linkno = *linkno; - gf->gf_pathlen = buflen; + gf = malloc(sizeof(*gf) + buflen); + if (gf == NULL) + return -ENOMEM; - /* Take path or fsname */ - rc = root_ioctl(device, OBD_IOC_FID2PATH, gf, NULL, 0); - if (rc) { - if (rc != -ENOENT) - llapi_error(LLAPI_MSG_ERROR, rc, "ioctl err %d", rc); - } else { - memcpy(buf, gf->gf_path, gf->gf_pathlen); - if (buf[0] == '\0') { /* ROOT path */ - buf[0] = '/'; - buf[1] = '\0'; - } - *recno = gf->gf_recno; - *linkno = gf->gf_linkno; - } + gf->gf_fid = fid; + gf->gf_recno = *recno; + gf->gf_linkno = *linkno; + gf->gf_pathlen = buflen; - free(gf); - return rc; + /* Take path or fsname */ + rc = root_ioctl(device, OBD_IOC_FID2PATH, gf, NULL, 0); + if (rc) + goto out_free; + + memcpy(buf, gf->gf_u.gf_path, gf->gf_pathlen); + if (buf[0] == '\0') { /* ROOT path */ + buf[0] = '/'; + buf[1] = '\0'; + } + *recno = gf->gf_recno; + *linkno = gf->gf_linkno; + +out_free: + free(gf); + return rc; } static int fid_from_lma(const char *path, const int fd, lustre_fid *fid) @@ -4528,34 +4010,6 @@ int llapi_get_connect_flags(const char *mnt, __u64 *flags) return rc; } -int llapi_get_version(char *buffer, int buffer_size, - char **version) -{ - int rc; - int fd; - struct obd_ioctl_data *data = (struct obd_ioctl_data *)buffer; - - fd = open(OBD_DEV_PATH, O_RDONLY); - if (fd == -1) - return -errno; - - memset(buffer, 0, buffer_size); - data->ioc_version = OBD_IOCTL_VERSION; - data->ioc_inllen1 = buffer_size - cfs_size_round(sizeof(*data)); - data->ioc_inlbuf1 = buffer + cfs_size_round(sizeof(*data)); - data->ioc_len = obd_ioctl_packlen(data); - - rc = ioctl(fd, OBD_GET_VERSION, buffer); - if (rc == -1) { - rc = -errno; - close(fd); - return rc; - } - close(fd); - *version = data->ioc_bulk; - return 0; -} - /** * Get a 64-bit value representing the version of file data pointed by fd. * @@ -4613,24 +4067,30 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags) { char file_path[PATH_MAX]; char filename[PATH_MAX]; + int saved_errno = errno; int fd; int rnumber; int rc; - rnumber = random(); - if (idx == -1) - snprintf(filename, sizeof(filename), - LUSTRE_VOLATILE_HDR"::%.4X", rnumber); - else - snprintf(filename, sizeof(filename), - LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber); + do { + rnumber = random(); + if (idx == -1) + snprintf(filename, sizeof(filename), + LUSTRE_VOLATILE_HDR"::%.4X", rnumber); + else + snprintf(filename, sizeof(filename), + LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber); - rc = snprintf(file_path, sizeof(file_path), - "%s/%s", directory, filename); - if (rc >= sizeof(file_path)) - return -E2BIG; + rc = snprintf(file_path, sizeof(file_path), + "%s/%s", directory, filename); + if (rc >= sizeof(file_path)) + return -E2BIG; + + fd = open(file_path, + O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | open_flags, + S_IRUSR | S_IWUSR); + } while (fd < 0 && errno == EEXIST); - fd = open(file_path, O_RDWR | O_CREAT | open_flags, S_IRUSR | S_IWUSR); if (fd < 0) { llapi_error(LLAPI_MSG_ERROR, errno, "Cannot create volatile file '%s' in '%s'", @@ -4638,10 +4098,17 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags) directory); return -errno; } - /* unlink file in case this wasn't a Lustre filesystem, and the - * magic volatile filename wasn't handled as intended. The effect - * is the same. */ - unlink(file_path); + + /* Unlink file in case this wasn't a Lustre filesystem and the + * magic volatile filename wasn't handled as intended. The + * effect is the same. If volatile open was supported then we + * expect unlink() to return -ENOENT. */ + (void)unlink(file_path); + + /* Since we are returning successfully we restore errno (and + * mask out possible EEXIST from open() and ENOENT from + * unlink(). */ + errno = saved_errno; return fd; }