X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi.c;h=719ab51f564b2ba027f1d06bc0eec84cb84ea545;hp=a4c8cf6649a31e057bda2e3446bd82ef7da599da;hb=322968acf183ab16d952cd3026f6580957b31259;hpb=3c55f5cf85fbb790dfea40f3da76d7b0d17f29ba diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index a4c8cf6..719ab51 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -30,6 +30,9 @@ * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. * @@ -129,10 +132,13 @@ void llapi_msg_set_level(int level) llapi_msg_level = level; } -void llapi_err(int level, char *fmt, ...) +/* llapi_error will preserve errno */ +void llapi_error(int level, int _rc, char *fmt, ...) { va_list args; - int tmp_errno = abs(errno); + int tmp_errno = errno; + /* to protect using errno as _rc argument */ + int rc = abs(_rc); if ((level & LLAPI_MSG_MASK) > llapi_msg_level) return; @@ -144,15 +150,15 @@ void llapi_err(int level, char *fmt, ...) if (level & LLAPI_MSG_NO_ERRNO) fprintf(stderr, "\n"); else - fprintf(stderr, ": %s (%d)\n", strerror(tmp_errno), tmp_errno); + fprintf(stderr, ": %s (%d)\n", strerror(rc), rc); + errno = tmp_errno; } -#define llapi_err_noerrno(level, fmt, a...) \ - llapi_err((level) | LLAPI_MSG_NO_ERRNO, fmt, ## a) - +/* llapi_printf will preserve errno */ void llapi_printf(int level, char *fmt, ...) { va_list args; + int tmp_errno = errno; if ((level & LLAPI_MSG_MASK) > llapi_msg_level) return; @@ -160,23 +166,29 @@ void llapi_printf(int level, char *fmt, ...) va_start(args, fmt); vfprintf(stdout, fmt, args); va_end(args); + errno = tmp_errno; } /** - * size_units is unchanged if no specifier used + * size_units is to be initialized (or zeroed) by caller. */ int parse_size(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 <<= 9; *size_units = 1 << 9; } else if ((*end == 'b') && *(end+1) == '\0' && bytes_spec) { @@ -184,45 +196,41 @@ int parse_size(char *optarg, unsigned long long *size, } else if ((*end == 'k' || *end == 'K') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 10))) == 0) { - *size <<= 10; *size_units = 1 << 10; } else if ((*end == 'm' || *end == 'M') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 20))) == 0) { - *size <<= 20; *size_units = 1 << 20; } else if ((*end == 'g' || *end == 'G') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 30))) == 0) { - *size <<= 30; *size_units = 1 << 30; } else if ((*end == 't' || *end == 'T') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 40))) == 0) { - *size <<= 40; *size_units = 1ULL << 40; } else if ((*end == 'p' || *end == 'P') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 50))) == 0) { - *size <<= 50; *size_units = 1ULL << 50; } else if ((*end == 'e' || *end == 'E') && *(end+1) == '\0' && (*size & (~0ULL << (64 - 60))) == 0) { - *size <<= 60; *size_units = 1ULL << 60; } else { return -1; } } - + *size *= *size_units; return 0; } +/* XXX: llapi_xxx() functions return negative values upon failure */ + int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset, int stripe_count, int stripe_pattern) { - int page_size; + int page_size, rc; /* 64 KB is the largest common page size I'm aware of (on ia64), but * check the local page size just in case. */ @@ -235,32 +243,53 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset, LOV_MIN_STRIPE_SIZE); } if (stripe_size < 0 || (stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) { - llapi_err(LLAPI_MSG_ERROR, "error: bad stripe_size %lu, " - "must be an even multiple of %d bytes", - stripe_size, page_size); - return -EINVAL; + rc = -EINVAL; + llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe_size %lu, " + "must be an even multiple of %d bytes", + stripe_size, page_size); + return rc; } if (stripe_offset < -1 || stripe_offset > MAX_OBD_DEVICES) { - errno = -EINVAL; - llapi_err(LLAPI_MSG_ERROR, "error: bad stripe offset %d", - stripe_offset); - return -EINVAL; + rc = -EINVAL; + llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe offset %d", + stripe_offset); + return rc; } if (stripe_count < -1 || stripe_count > LOV_MAX_STRIPE_COUNT) { - errno = -EINVAL; - llapi_err(LLAPI_MSG_ERROR, "error: bad stripe count %d", - stripe_count); - return -EINVAL; + rc = -EINVAL; + llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe count %d", + stripe_count); + return rc; } if (stripe_size >= (1ULL << 32)){ - errno = -EINVAL; - llapi_err(LLAPI_MSG_ERROR, "warning: stripe size larger than 4G" - " is not currently supported and would wrap"); - return -EINVAL; + rc = -EINVAL; + llapi_error(LLAPI_MSG_ERROR, rc, + "warning: stripe size larger than 4G " + "is not currently supported and would wrap"); + return rc; } 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; @@ -303,6 +332,135 @@ static int find_poolpath(char *fsname, char *poolname, char *poolpath) return 0; } +/** + * 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. + */ +static 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) + 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 + 1], dev[PATH_MAX + 1] = "*", fs[PATH_MAX + 1]; + FILE *fp = fopen(DEVICES_LIST, "r"); + int rc = 0; + + if (!fsname && file_path) { + rc = llapi_search_fsname(file_path, fs); + if (rc) { + llapi_error(LLAPI_MSG_ERROR, rc, + "'%s' is not on a Lustre filesystem", + file_path); + return rc; + } + } else if (fsname) { + strcpy(fs, fsname); + } + + if (fp == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST); + return rc; + } + + while (fgets(devices, sizeof(devices), fp) != NULL) { + char *bufp = devices, *tmp; + + while (bufp[0] == ' ') + ++bufp; + + tmp = strstr(bufp, obd_type); + if (tmp) { + tmp += strlen(obd_type) + 1; + if (strcmp(tmp, fs)) + continue; + strcpy(dev, tmp); + tmp = strchr(dev, ' '); + *tmp = '\0'; + break; + } + } + + if (dev[0] == '*' && strlen(fs)) + snprintf(dev, PATH_MAX, "%s-*", fs); + snprintf(devices, PATH_MAX, "%s/%s/%s", obd_type, dev, param_name); + fclose(fp); + return get_param(devices, value, val_len); +} + +static int get_mds_md_size(char *path) +{ + int lumlen = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3); + char buf[16]; + + /* Now get the maxea from llite proc */ + if (!get_param_obdvar(NULL, path, "llite", "max_easize", + buf, sizeof(buf))) + lumlen = atoi(buf); + return lumlen; +} + /* * if pool is NULL, search ostname in target_obd * if pool is not NULL: @@ -326,8 +484,9 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname) if (rc) return rc; - if ((fd = fopen(buffer, "r")) == NULL) - return -EINVAL; + fd = fopen(buffer, "r"); + if (fd == NULL) + return -errno; while (fgets(buffer, sizeof(buffer), fd) != NULL) { if (poolname == NULL) { @@ -366,10 +525,12 @@ int llapi_file_open_pool(const char *name, int flags, int mode, if (pool_name != NULL) { char fsname[MAX_OBD_NAME + 1], *ptr; - if (llapi_search_fsname(name, fsname)) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "'%s' is not on a Lustre filesystem", name); - return -EINVAL; + rc = llapi_search_fsname(name, fsname); + if (rc) { + llapi_error(LLAPI_MSG_ERROR, rc, + "'%s' is not on a Lustre filesystem", + name); + return rc; } /* in case user gives the full pool name ., @@ -379,19 +540,20 @@ int llapi_file_open_pool(const char *name, int flags, int mode, *ptr = '\0'; if (strcmp(pool_name, fsname) != 0) { *ptr = '.'; - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "Pool '%s' is not on filesystem '%s'", - pool_name, fsname); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "Pool '%s' is not on filesystem '%s'", + pool_name, fsname); return -EINVAL; } pool_name = ptr + 1; } /* Make sure the pool exists and is non-empty */ - if ((rc = llapi_search_ost(fsname, pool_name, NULL)) < 1) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "pool '%s.%s' %s", fsname, pool_name, - rc == 0 ? "has no OSTs" : "does not exist"); + rc = llapi_search_ost(fsname, pool_name, NULL); + if (rc < 1) { + llapi_err_noerrno(LLAPI_MSG_ERROR, + "pool '%s.%s' %s", fsname, pool_name, + rc == 0 ? "has no OSTs" : "does not exist"); return -EINVAL; } } @@ -404,15 +566,14 @@ int llapi_file_open_pool(const char *name, int flags, int mode, if (fd < 0) { rc = -errno; - llapi_err(LLAPI_MSG_ERROR, "unable to open '%s'", name); + llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name); return rc; } - if ((rc = llapi_stripe_limit_check(stripe_size, stripe_offset, - stripe_count, stripe_pattern)) != 0){ - errno = rc; + rc = llapi_stripe_limit_check(stripe_size, stripe_offset, stripe_count, + stripe_pattern); + if (rc != 0) goto out; - } /* Initialize IOCTL striping pattern structure */ lum.lmm_magic = LOV_USER_MAGIC_V3; @@ -508,10 +669,10 @@ static int get_root_path(int want, char *fsname, int *outfd, char *path, /* get the mount point */ fp = setmntent(MOUNTED, "r"); if (fp == NULL) { - llapi_err(LLAPI_MSG_ERROR, - "setmntent(%s) failed: %s:", MOUNTED, - strerror (errno)); - return -EIO; + rc = -EIO; + llapi_error(LLAPI_MSG_ERROR, rc, + "setmntent(%s) failed", MOUNTED); + return rc; } while (1) { if (getmntent_r(fp, &mnt, buf, sizeof(buf)) == NULL) @@ -562,16 +723,18 @@ static int get_root_path(int want, char *fsname, int *outfd, char *path, if (want & WANT_FD) { fd = open(mntdir, O_RDONLY | O_DIRECTORY | O_NONBLOCK); if (fd < 0) { - perror("open"); rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "error opening '%s'", mntdir); + } else { *outfd = fd; } } } else if (want & WANT_ERROR) - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "can't find fs root for '%s': %d", - (want & WANT_PATH) ? fsname : path, rc); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "can't find fs root for '%s': %d", + (want & WANT_PATH) ? fsname : path, rc); return rc; } @@ -592,7 +755,7 @@ int llapi_search_mounts(const char *pathname, int index, char *mntdir, { int want = WANT_PATH, idx = -1; - if (!pathname) { + if (!pathname || pathname[0] == '\0') { want |= WANT_INDEX; idx = index; } else @@ -606,40 +769,70 @@ int llapi_search_mounts(const char *pathname, int index, char *mntdir, /* Given a path, find the corresponding Lustre fsname */ int llapi_search_fsname(const char *pathname, char *fsname) { - char *path = (char*)pathname, buf[PATH_MAX + 1]; + char *path; + int rc; - if (pathname[0] != '/') { /* Need a absolute path */ - memset(buf, '\0', sizeof(buf)); - if (realpath(pathname, buf) == NULL) { - llapi_err(LLAPI_MSG_ERROR, "pathname '%s' cannot expand", - pathname); - return -EINVAL; + path = realpath(pathname, NULL); + if (path == NULL) { + char buf[PATH_MAX + 1], *ptr; + + buf[0] = 0; + if (pathname[0] != '/') { + /* Need an absolute path, but realpath() only works for + * pathnames that actually exist. We go through the + * extra hurdle of dirname(getcwd() + pathname) in + * case the relative pathname contains ".." in it. */ + if (getcwd(buf, sizeof(buf) - 1) == NULL) + return -errno; + strcat(buf, "/"); + } + strncat(buf, pathname, sizeof(buf) - strlen(buf)); + path = realpath(buf, NULL); + if (path == NULL) { + ptr = strrchr(buf, '/'); + if (ptr == NULL) + return -ENOENT; + *ptr = '\0'; + path = realpath(buf, NULL); + if (path == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "pathname '%s' cannot expand", + pathname); + return rc; + } } - path = buf; } - return get_root_path(WANT_FSNAME | WANT_ERROR, fsname, NULL, - path, -1); + rc = get_root_path(WANT_FSNAME | WANT_ERROR, fsname, NULL, path, -1); + free(path); + return rc; } -/* return the first file matching this pattern */ -static int first_match(char *pattern, char *buffer) +int llapi_getname(const char *path, char *buf, size_t size) { - glob_t glob_info; + struct obd_uuid uuid_buf; + char *uuid = uuid_buf.uuid; + int rc, nr; - if (glob(pattern, GLOB_BRACE, NULL, &glob_info)) - return -ENOENT; + memset(&uuid_buf, 0, sizeof(uuid_buf)); + rc = llapi_file_get_lov_uuid(path, &uuid_buf); + if (rc) + return rc; - if (glob_info.gl_pathc < 1) { - globfree(&glob_info); - return -ENOENT; - } + /* We want to turn lustre-clilov-ffff88002738bc00 into + * lustre-ffff88002738bc00. */ - strcpy(buffer, glob_info.gl_pathv[0]); + nr = snprintf(buf, size, "%.*s-%s", + (int) (strlen(uuid) - 24), uuid, + uuid + strlen(uuid) - 16); - globfree(&glob_info); - return 0; + if (nr >= size) + rc = -ENAMETOOLONG; + + return rc; } + /* * find the pool directory path under /proc * (can be also used to test if a fsname is known) @@ -707,17 +900,19 @@ int llapi_get_poolmembers(const char *poolname, char **members, rc = poolpath(fsname, NULL, pathname); if (rc != 0) { - errno = -rc; - llapi_err(LLAPI_MSG_ERROR, "Lustre filesystem '%s' not found", - fsname); + 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); sprintf(path, "%s/%s", pathname, pool); - if ((fd = fopen(path, "r")) == NULL) { - llapi_err(LLAPI_MSG_ERROR, "Cannot open %s", path); - return -EINVAL; + fd = fopen(path, "r"); + if (fd == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open %s", path); + return rc; } rc = 0; @@ -727,7 +922,8 @@ int llapi_get_poolmembers(const char *poolname, char **members, break; } /* remove '\n' */ - if ((tmp = strchr(buf, '\n')) != NULL) + tmp = strchr(buf, '\n'); + if (tmp != NULL) *tmp='\0'; if (used + strlen(buf) + 1 > buffer_size) { rc = -EOVERFLOW; @@ -779,17 +975,18 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size, /* only absolute pathname is supported */ if (*name != '/') return -EINVAL; + if (!realpath(name, rname)) { rc = -errno; - llapi_err(LLAPI_MSG_ERROR, "invalid path '%s'", name); + llapi_error(LLAPI_MSG_ERROR, rc, "invalid path '%s'", + name); return rc; } rc = poolpath(NULL, rname, pathname); if (rc != 0) { - errno = -rc; - llapi_err(LLAPI_MSG_ERROR, "'%s' is not" - " a Lustre filesystem", name); + llapi_error(LLAPI_MSG_ERROR, rc, "'%s' is not" + " a Lustre filesystem", name); return rc; } strcpy(fsname, rname); @@ -799,29 +996,33 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size, rc = poolpath(fsname, NULL, pathname); } if (rc != 0) { - errno = -rc; - llapi_err(LLAPI_MSG_ERROR, "Lustre filesystem '%s' not found", - name); + llapi_error(LLAPI_MSG_ERROR, rc, + "Lustre filesystem '%s' not found", name); return rc; } llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname); - if ((dir = opendir(pathname)) == NULL) { - llapi_err(LLAPI_MSG_ERROR, "Could not open pool list for '%s'", - name); - return -errno; + dir = opendir(pathname); + if (dir == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Could not open pool list for '%s'", + name); + return rc; } while(1) { rc = readdir_r(dir, &pool, &cookie); if (rc != 0) { - llapi_err(LLAPI_MSG_ERROR, - "Error reading pool list for '%s'", name); - return -errno; - } else if ((rc == 0) && (cookie == NULL)) + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Error reading pool list for '%s'", name); + return rc; + } else if ((rc == 0) && (cookie == NULL)) { /* end of directory */ break; + } /* ignore . and .. */ if (!strcmp(pool.d_name, ".") || !strcmp(pool.d_name, "..")) @@ -851,46 +1052,77 @@ int llapi_poollist(const char *name) { /* list of pool names (assume that pool count is smaller than OST count) */ - char *list[FIND_MAX_OSTS]; - char *buffer; - /* fsname-OST0000_UUID < 32 char, 1 per OST */ - int bufsize = FIND_MAX_OSTS * 32; - int i, nb; - - buffer = malloc(bufsize); - if (buffer == NULL) - return -ENOMEM; + char **list, *buffer = NULL, *path = NULL, *fsname = NULL; + int obdcount, bufsize, rc, nb, i; + char *poolname = NULL, *tmp = NULL, data[16]; + + if (name[0] != '/') { + fsname = strdup(name); + poolname = strchr(fsname, '.'); + if (poolname) + *poolname = '\0'; + } else { + path = (char *) name; + } + + rc = get_param_obdvar(fsname, path, "lov", "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 + * allocated space. */ +retry_get_pools: + bufsize = sizeof(struct obd_uuid) * obdcount; + buffer = realloc(tmp, bufsize + sizeof(*list) * obdcount); + if (buffer == NULL) { + rc = -ENOMEM; + goto err; + } + list = (char **) (buffer + bufsize); - if ((name[0] == '/') || (strchr(name, '.') == NULL)) + if (!poolname) { /* name is a path or fsname */ - nb = llapi_get_poollist(name, list, FIND_MAX_OSTS, buffer, - bufsize); - else + nb = llapi_get_poollist(name, list, obdcount, + buffer, bufsize); + } else { /* name is a pool name (.) */ - nb = llapi_get_poolmembers(name, list, FIND_MAX_OSTS, buffer, - bufsize); + nb = llapi_get_poolmembers(name, list, obdcount, + buffer, bufsize); + } + + if (nb == -EOVERFLOW) { + obdcount *= 2; + tmp = buffer; + goto retry_get_pools; + } for (i = 0; i < nb; i++) llapi_printf(LLAPI_MSG_NORMAL, "%s\n", list[i]); - - free(buffer); - return (nb < 0 ? nb : 0); + rc = (nb < 0 ? nb : 0); +err: + if (buffer) + free(buffer); + if (fsname) + free(fsname); + return rc; } - typedef int (semantic_func_t)(char *path, DIR *parent, DIR *d, void *data, cfs_dirent_t *de); -#define MAX_LOV_UUID_COUNT max(LOV_MAX_STRIPE_COUNT, 1000) #define OBD_NOT_FOUND (-1) -static int common_param_init(struct find_param *param) +static int common_param_init(struct find_param *param, char *path) { - param->lumlen = lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC_V3); - if ((param->lmd = malloc(sizeof(lstat_t) + param->lumlen)) == NULL) { - llapi_err(LLAPI_MSG_ERROR, - "error: allocation of %d bytes for ioctl", - sizeof(lstat_t) + param->lumlen); + param->lumlen = get_mds_md_size(path); + param->lmd = malloc(sizeof(lstat_t) + param->lumlen); + if (param->lmd == NULL) { + llapi_error(LLAPI_MSG_ERROR, -ENOMEM, + "error: allocation of %d bytes for ioctl", + sizeof(lstat_t) + param->lumlen); return -ENOMEM; } @@ -917,6 +1149,7 @@ static int cb_common_fini(char *path, DIR *parent, DIR *d, void *data, return 0; } +/* set errno upon failure */ static DIR *opendir_parent(char *path) { DIR *parent; @@ -934,21 +1167,27 @@ static DIR *opendir_parent(char *path) return parent; } -int llapi_mds_getfileinfo(char *path, DIR *parent, - struct lov_user_mds_data *lmd) +static int get_lmd_info(char *path, DIR *parent, DIR *dir, + struct lov_user_mds_data *lmd, int lumlen) { lstat_t *st = &lmd->lmd_st; - char *fname = strrchr(path, '/'); int ret = 0; - if (parent == NULL) + if (parent == NULL && dir == NULL) return -EINVAL; - fname = (fname == NULL ? path : fname + 1); - /* retrieve needed file info */ - strncpy((char *)lmd, fname, - lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC)); - ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd); + if (dir) { + ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, (void *)lmd); + } else if (parent) { + char *fname = strrchr(path, '/'); + + fname = (fname == NULL ? path : fname + 1); + /* retrieve needed file info */ + strncpy((char *)lmd, fname, lumlen); + ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd); + } else { + return ret; + } if (ret) { if (errno == ENOTTY) { @@ -956,25 +1195,38 @@ int llapi_mds_getfileinfo(char *path, DIR *parent, * Do the regular lstat(2) instead. */ ret = lstat_f(path, st); if (ret) { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: lstat failed for %s", - __func__, path); - return ret; + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "error: %s: lstat failed for %s", + __func__, path); } } else if (errno == ENOENT) { - llapi_err(LLAPI_MSG_WARN, - "warning: %s: %s does not exist", - __func__, path); - return -ENOENT; + ret = -errno; + llapi_error(LLAPI_MSG_WARN, ret, + "warning: %s: %s does not exist", + __func__, path); + } else if (errno != EISDIR) { + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "%s ioctl failed for %s.", + dir ? "LL_IOC_MDC_GETINFO" : + "IOC_MDC_GETFILEINFO", path); } else { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: IOC_MDC_GETFILEINFO failed for %s", - __func__, path); - return ret; + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "error: %s: IOC_MDC_GETFILEINFO failed for %s", + __func__, path); } } + return ret; +} - return 0; +int llapi_mds_getfileinfo(char *path, DIR *parent, + struct lov_user_mds_data *lmd) +{ + int lumlen = get_mds_md_size(path); + + return get_lmd_info(path, parent, NULL, lmd, lumlen); } static int llapi_semantic_traverse(char *path, int size, DIR *parent, @@ -991,14 +1243,15 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent, d = opendir(path); if (!d && errno != ENOTDIR) { - llapi_err(LLAPI_MSG_ERROR, "%s: Failed to open '%s'", - __func__, path); - return -EINVAL; + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, "%s: Failed to open '%s'", + __func__, path); + return ret; } else if (!d && !parent) { /* ENOTDIR. Open the parent dir. */ p = opendir_parent(path); if (!p) - GOTO(out, ret = -EINVAL); + GOTO(out, ret = -errno); } if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de))) @@ -1019,9 +1272,9 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent, path[len] = 0; if ((len + dent->d_reclen + 2) > size) { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: string buffer is too small", - __func__); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "error: %s: string buffer is too small", + __func__); break; } strcat(path, "/"); @@ -1044,9 +1297,9 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent, switch (dent->d_type) { case DT_UNKNOWN: - llapi_err(LLAPI_MSG_ERROR, - "error: %s: '%s' is UNKNOWN type %d", - __func__, dent->d_name, dent->d_type); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "error: %s: '%s' is UNKNOWN type %d", + __func__, dent->d_name, dent->d_type); break; case DT_DIR: ret = llapi_semantic_traverse(path, size, d, sem_init, @@ -1086,20 +1339,22 @@ static int param_callback(char *path, semantic_func_t sem_init, char *buf; if (len > PATH_MAX) { - llapi_err(LLAPI_MSG_ERROR, "Path name '%s' is too long", path); - return -EINVAL; + ret = -EINVAL; + llapi_error(LLAPI_MSG_ERROR, ret, + "Path name '%s' is too long", path); + return ret; } buf = (char *)malloc(PATH_MAX + 1); if (!buf) return -ENOMEM; - ret = common_param_init(param); + strncpy(buf, path, PATH_MAX + 1); + ret = common_param_init(param, buf); if (ret) goto out; param->depth = 0; - strncpy(buf, path, PATH_MAX + 1); ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, sem_init, sem_fini, param, NULL); out: @@ -1112,8 +1367,18 @@ int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_name) { int rc = ioctl(fd, OBD_IOC_GETNAME, lov_name); if (rc) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "error: can't get lov name."); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lov name."); + } + return rc; +} + +int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name) +{ + int rc = ioctl(fd, OBD_IOC_GETMDNAME, lov_name); + if (rc) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lmv name."); } return rc; } @@ -1124,43 +1389,53 @@ int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid) fd = open(path, O_RDONLY); if (fd < 0) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "error opening %s", path); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); return rc; } rc = llapi_file_fget_lov_uuid(fd, lov_uuid); close(fd); - return rc; } +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 * there are more OSTs then allocated to uuidp, then an error is returned with * the ost_count set to number of available obd uuids. */ -int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count) +static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp, + int *ost_count, enum tgt_type type) { - struct obd_uuid lov_name; + struct obd_uuid name; char buf[1024]; FILE *fp; int rc = 0, index = 0; /* Get the lov name */ - rc = llapi_file_fget_lov_uuid(fd, &lov_name); - if (rc) - return rc; + 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; + } /* Now get the ost uuids from /proc */ - snprintf(buf, sizeof(buf), "/proc/fs/lustre/lov/%s/target_obd", - lov_name.uuid); + 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_err(LLAPI_MSG_ERROR, "error: opening '%s'", buf); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf); return rc; } @@ -1174,13 +1449,18 @@ int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count) fclose(fp); - if (uuidp && (index >= *ost_count)) - return -EOVERFLOW; + if (uuidp && (index > *ost_count)) + rc = -EOVERFLOW; *ost_count = index; return rc; } +int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count) +{ + return llapi_get_target_uuids(fd, uuidp, ost_count, LOV_TYPE); +} + int llapi_get_obd_count(char *mnt, int *count, int is_mdt) { DIR *root; @@ -1188,12 +1468,15 @@ int llapi_get_obd_count(char *mnt, int *count, int is_mdt) root = opendir(mnt); if (!root) { - llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt); + return rc; } *count = is_mdt; rc = ioctl(dirfd(root), LL_IOC_GETOBDCOUNT, count); + if (rc < 0) + rc = -errno; closedir(root); return rc; @@ -1226,7 +1509,7 @@ int llapi_uuid_match(char *real_uuid, char *search_uuid) * returned in param->obdindex */ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) { - struct obd_uuid lov_uuid; + struct obd_uuid obd_uuid; char uuid[sizeof(struct obd_uuid)]; char buf[1024]; FILE *fp; @@ -1235,13 +1518,15 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) if (param->got_uuids) return rc; - /* Get the lov name */ - rc = llapi_file_fget_lov_uuid(dirfd(dir), &lov_uuid); + /* Get the lov/lmv name */ + if (param->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 (errno != ENOTTY) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, - "error: can't get lov name: %s", dname); + if (rc != -ENOTTY) { + llapi_error(LLAPI_MSG_ERROR, rc, + "error: can't get lov name: %s", dname); } else { rc = 0; } @@ -1251,17 +1536,18 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) param->got_uuids = 1; /* Now get the ost uuids from /proc */ - snprintf(buf, sizeof(buf), "/proc/fs/lustre/lov/%s/target_obd", - lov_uuid.uuid); + snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd", + param->get_lmv ? "lmv" : "lov", obd_uuid.uuid); fp = fopen(buf, "r"); if (fp == NULL) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "error: opening '%s'", buf); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf); return rc; } if (!param->obduuid && !param->quiet && !param->obds_printed) - llapi_printf(LLAPI_MSG_NORMAL, "OBDS:\n"); + llapi_printf(LLAPI_MSG_NORMAL, "%s:\n", + param->get_lmv ? "MDTS" : "OBDS:"); while (fgets(buf, sizeof(buf), fp) != NULL) { if (sscanf(buf, "%d: %s", &index, uuid) < 2) @@ -1294,20 +1580,28 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param) /* In this case, param->obduuid will be an array of obduuids and * obd index for all these obduuids will be returned in * param->obdindexes */ -static int setup_obd_indexes(DIR *dir, struct find_param *param) +static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids, + int num_obds, int **obdindexes, int *obdindex, + enum tgt_type type) { + int ret, obdcount, obd_valid = 0, obdnum, i; struct obd_uuid *uuids = NULL; - int obdcount = INIT_ALLOC_NUM_OSTS; - int ret, obd_valid = 0, obdnum, i; + char buf[16]; + int *indexes; - uuids = (struct obd_uuid *)malloc(INIT_ALLOC_NUM_OSTS * + ret = get_param_obdvar(NULL, path, type == LOV_TYPE ? "lov" : "lmv", + "numobd", buf, sizeof(buf)); + if (ret) + return ret; + + obdcount = atoi(buf); + uuids = (struct obd_uuid *)malloc(obdcount * sizeof(struct obd_uuid)); if (uuids == NULL) return -ENOMEM; retry_get_uuids: - ret = llapi_lov_get_uuids(dirfd(dir), uuids, - &obdcount); + ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type); if (ret) { struct obd_uuid *uuids_temp; @@ -1320,43 +1614,67 @@ retry_get_uuids: ret = -ENOMEM; } - llapi_err(LLAPI_MSG_ERROR, "get ost uuid failed"); - return ret; + llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed"); + goto out_free; } - param->obdindexes = malloc(param->num_obds * sizeof(param->obdindex)); - if (param->obdindexes == NULL) - return -ENOMEM; + indexes = malloc(num_obds * sizeof(*obdindex)); + if (indexes == NULL) { + ret = -ENOMEM; + goto out_free; + } - for (obdnum = 0; obdnum < param->num_obds; obdnum++) { + for (obdnum = 0; obdnum < num_obds; obdnum++) { for (i = 0; i < obdcount; i++) { if (llapi_uuid_match(uuids[i].uuid, - param->obduuid[obdnum].uuid)) { - param->obdindexes[obdnum] = i; + obduuids[obdnum].uuid)) { + indexes[obdnum] = i; obd_valid++; break; } } if (i >= obdcount) { - param->obdindexes[obdnum] = OBD_NOT_FOUND; + indexes[obdnum] = OBD_NOT_FOUND; llapi_err_noerrno(LLAPI_MSG_ERROR, "error: %s: unknown obduuid: %s", - __func__, - param->obduuid[obdnum].uuid); + __func__, obduuids[obdnum].uuid); ret = -EINVAL; } } if (obd_valid == 0) - param->obdindex = OBD_NOT_FOUND; + *obdindex = OBD_NOT_FOUND; else - param->obdindex = obd_valid; + *obdindex = obd_valid; - param->got_uuids = 1; + *obdindexes = indexes; +out_free: + if (uuids) + free(uuids); return ret; } +static int setup_target_indexes(DIR *dir, char *path, struct find_param *param) +{ + int ret = 0; + + if (param->mdtuuid) { + ret = setup_indexes(dir, path, param->mdtuuid, param->num_mdts, + ¶m->mdtindexes, ¶m->mdtindex, LMV_TYPE); + if (ret) + return ret; + } + if (param->obduuid) { + ret = setup_indexes(dir, path, param->obduuid, param->num_obds, + ¶m->obdindexes, ¶m->obdindex, LOV_TYPE); + if (ret) + return ret; + } + param->got_uuids = 1; + return ret; +} + int llapi_ostlist(char *path, struct find_param *param) { DIR *dir; @@ -1372,16 +1690,183 @@ int llapi_ostlist(char *path, struct find_param *param) return ret; } +/* + * 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; + + strncpy(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; + + if (scount) { + snprintf(fpath, PATH_MAX, "%s/stripecount", dpath); + rc = sattr_read_attr(fpath, scount); + if (rc != 0) + return rc; + } + + if (ssize) { + snprintf(fpath, PATH_MAX, "%s/stripesize", dpath); + rc = sattr_read_attr(fpath, ssize); + if (rc != 0) + return rc; + } + + if (soffset) { + snprintf(fpath, PATH_MAX, "%s/stripeoffset", dpath); + rc = sattr_read_attr(fpath, soffset); + if (rc != 0) + return rc; + } + + return 0; +} + +/* + * Tries to gather the default stripe attributes for a given filesystem. If + * the attributes can be determined, they are cached for easy retreival the + * next time they are needed. Only a single filesystem's attributes are + * cached at a time. + */ +static int sattr_cache_get_defaults(const char *const fsname, + const char *const pathname, + unsigned int *scount, + unsigned int *ssize, + unsigned int *soffset) +{ + static struct { + char fsname[PATH_MAX + 1]; + unsigned int stripecount; + unsigned int stripesize; + unsigned int stripeoffset; + } cache = { + .fsname = {'\0'} + }; + + int rc; + char fsname_buf[PATH_MAX + 1]; + unsigned int tmp[3]; + + if (fsname == NULL) { + rc = llapi_search_fsname(pathname, fsname_buf); + if (rc) + return rc; + } else { + strncpy(fsname_buf, fsname, PATH_MAX); + } + + if (strncmp(fsname_buf, cache.fsname, PATH_MAX) != 0) { + /* + * Ensure all 3 sattrs (count, size, and offset) are + * successfully retrieved and stored in tmp before writing to + * cache. + */ + rc = sattr_get_defaults(fsname_buf, NULL, &tmp[0], &tmp[1], + &tmp[2]); + if (rc != 0) + return rc; + + cache.stripecount = tmp[0]; + cache.stripesize = tmp[1]; + cache.stripeoffset = tmp[2]; + strncpy(cache.fsname, fsname_buf, PATH_MAX); + } + + if (scount) + *scount = cache.stripecount; + if (ssize) + *ssize = cache.stripesize; + if (soffset) + *soffset = cache.stripeoffset; + + return 0; +} + 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, - char *pool_name) + int raw, char *pool_name) { char *prefix = is_dir ? "" : "lmm_"; char nl = is_dir ? ' ' : '\n'; + int rc; - if (is_dir && lum->lmm_object_seq == LOV_OBJECT_GROUP_DEFAULT) { - lum->lmm_object_seq = LOV_OBJECT_GROUP_CLEAR; + if (is_dir && lum->lmm_object_seq == FID_SEQ_LOV_DEFAULT) { + lum->lmm_object_seq = FID_SEQ_OST_MDT0; if (verbose & VERBOSE_DETAIL) llapi_printf(LLAPI_MSG_NORMAL, "(Default) "); } @@ -1402,16 +1887,50 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, if (verbose & ~VERBOSE_COUNT) llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_count: ", prefix); - llapi_printf(LLAPI_MSG_NORMAL, "%hd%c", - (__s16)lum->lmm_stripe_count, nl); + 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%c", + scount, nl); + else + llapi_error(LLAPI_MSG_ERROR, rc, + "Cannot determine default" + " stripe count."); + } else { + llapi_printf(LLAPI_MSG_NORMAL, "%d%c", + lum->lmm_stripe_count == + (typeof(lum->lmm_stripe_count))(-1) + ? -1 : lum->lmm_stripe_count, nl); + } + } else { + llapi_printf(LLAPI_MSG_NORMAL, "%hd%c", + (__s16)lum->lmm_stripe_count, nl); + } } if (verbose & VERBOSE_SIZE) { if (verbose & ~VERBOSE_SIZE) llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size: ", prefix); - llapi_printf(LLAPI_MSG_NORMAL, "%u%c", lum->lmm_stripe_size, - nl); + 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%c", ssize, + nl); + else + llapi_error(LLAPI_MSG_ERROR, rc, + "Cannot determine default" + " stripe size."); + } else { + llapi_printf(LLAPI_MSG_NORMAL, "%u%c", + lum->lmm_stripe_size, nl); + } } if ((verbose & VERBOSE_DETAIL) && !is_dir) { @@ -1419,11 +1938,19 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, lum->lmm_pattern, nl); } + if ((verbose & VERBOSE_GENERATION) && !is_dir) { + if (verbose & ~VERBOSE_GENERATION) + llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ", + prefix); + llapi_printf(LLAPI_MSG_NORMAL, "%u%c", + (int)lum->u.lum_layout_gen, nl); + } + if (verbose & VERBOSE_OFFSET) { if (verbose & ~VERBOSE_OFFSET) llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ", prefix); - if (is_dir) + if (is_dir) llapi_printf(LLAPI_MSG_NORMAL, "%d%c", lum->lmm_stripe_offset == (typeof(lum->lmm_stripe_offset))(-1) ? -1 : @@ -1434,8 +1961,10 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, } if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) { - llapi_printf(LLAPI_MSG_NORMAL, "pool: %s", pool_name); - is_dir = 1; + if (verbose & ~VERBOSE_POOL) + llapi_printf(LLAPI_MSG_NORMAL, "%spool: ", + prefix); + llapi_printf(LLAPI_MSG_NORMAL, "%s%c", pool_name, nl); } if (is_dir && (verbose != VERBOSE_OBJID)) @@ -1445,7 +1974,7 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name, struct lov_user_ost_data_v1 *objects, char *path, int is_dir, - int obdindex, int depth, int header) + int obdindex, int depth, int header, int raw) { int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1; @@ -1459,8 +1988,8 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name, } if (obdstripe == 1) - lov_dump_user_lmm_header(lum, path, objects, is_dir, header, depth, - pool_name); + lov_dump_user_lmm_header(lum, path, objects, is_dir, header, + depth, raw, pool_name); if (!is_dir && (header & VERBOSE_OBJID)) { if (obdstripe == 1) @@ -1490,7 +2019,7 @@ void llapi_lov_dump_user_lmm(struct find_param *param, param->lmd->lmd_lmm.lmm_objects, path, is_dir, param->obdindex, param->maxdepth, - param->verbose); + param->verbose, param->raw); break; case LOV_USER_MAGIC_V3: { char pool_name[LOV_MAXPOOLNAME + 1]; @@ -1503,7 +2032,7 @@ void llapi_lov_dump_user_lmm(struct find_param *param, lov_dump_user_lmm_v1v3(¶m->lmd->lmd_lmm, pool_name, objects, path, is_dir, param->obdindex, param->maxdepth, - param->verbose); + param->verbose, param->raw); break; } default: @@ -1527,33 +2056,33 @@ int llapi_file_get_stripe(const char *path, struct lov_user_md *lum) if (fname == NULL) { dname = (char *)malloc(2); if (dname == NULL) - return ENOMEM; + return -ENOMEM; strcpy(dname, "."); fname = (char *)path; } else { dname = (char *)malloc(fname - path + 1); if (dname == NULL) - return ENOMEM; + return -ENOMEM; strncpy(dname, path, fname - path); dname[fname - path] = '\0'; fname++; } - if ((fd = open(dname, O_RDONLY)) == -1) { - rc = errno; + fd = open(dname, O_RDONLY); + if (fd == -1) { + rc = -errno; free(dname); return rc; } strcpy((char *)lum, fname); if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1) - rc = errno; + rc = -errno; if (close(fd) == -1 && rc == 0) - rc = errno; + rc = -errno; free(dname); - return rc; } @@ -1574,13 +2103,16 @@ int llapi_file_lookup(int dirfd, const char *name) rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf)); if (rc) { - llapi_err(LLAPI_MSG_ERROR, - "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d", - name, rc); + llapi_error(LLAPI_MSG_ERROR, rc, + "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d", + name, rc); return rc; } - return ioctl(dirfd, IOC_MDC_LOOKUP, buf); + rc = ioctl(dirfd, IOC_MDC_LOOKUP, buf); + if (rc < 0) + rc = -errno; + return rc; } /* Check if the value matches 1 of the given criteria (e.g. --atime +/-N). @@ -1591,7 +2123,7 @@ int llapi_file_lookup(int dirfd, const char *name) * sign), 1st column is the answer for the MDS value, the 2nd is for the OST: * -------------------------------------- * 1 | file > limit; sign > 0 | -1 / -1 | - * 2 | file = limit; sign > 0 | ? / 1 | + * 2 | file = limit; sign > 0 | -1 / -1 | * 3 | file < limit; sign > 0 | ? / 1 | * 4 | file > limit; sign = 0 | -1 / -1 | * 5 | file = limit; sign = 0 | ? / 1 | <- (see the Note below) @@ -1602,29 +2134,29 @@ int llapi_file_lookup(int dirfd, const char *name) * -------------------------------------- * Note: 5th actually means that the value is within the interval * (limit - margin, limit]. */ -static int find_value_cmp(unsigned int file, unsigned int limit, int sign, - unsigned long long margin, int mds) +static int find_value_cmp(unsigned long long file, unsigned long long limit, + int sign, int negopt, unsigned long long margin, + int mds) { - if (sign > 0) { - if (file < limit) - return mds ? 0 : 1; - } + int ret = -1; - if (sign == 0) { - if (file <= limit && file + margin > limit) - return mds ? 0 : 1; + if (sign > 0) { + /* Drop the fraction of margin (of days). */ if (file + margin <= limit) - return mds ? 0 : -1; - } - - if (sign < 0) { + ret = mds ? 0 : 1; + } else if (sign == 0) { + if (file <= limit && file + margin > limit) + ret = mds ? 0 : 1; + else if (file + margin <= limit) + ret = mds ? 0 : -1; + } else if (sign < 0) { if (file > limit) - return 1; - if (mds) - return 0; + ret = 1; + else if (mds) + ret = 0; } - return -1; + return negopt ? ~ret + 1 : ret; } /* Check if the file time matches all the given criteria (e.g. --atime +/-N). @@ -1637,12 +2169,13 @@ static int find_value_cmp(unsigned int file, unsigned int limit, int sign, static int find_time_check(lstat_t *st, struct find_param *param, int mds) { int ret; - int rc = 0; + int rc = 1; /* Check if file is accepted. */ if (param->atime) { ret = find_value_cmp(st->st_atime, param->atime, - param->asign, 24 * 60 * 60, mds); + param->asign, param->exclude_atime, + 24 * 60 * 60, mds); if (ret < 0) return ret; rc = ret; @@ -1650,7 +2183,8 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds) if (param->mtime) { ret = find_value_cmp(st->st_mtime, param->mtime, - param->msign, 24 * 60 * 60, mds); + param->msign, param->exclude_mtime, + 24 * 60 * 60, mds); if (ret < 0) return ret; @@ -1662,7 +2196,8 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds) if (param->ctime) { ret = find_value_cmp(st->st_ctime, param->ctime, - param->csign, 24 * 60 * 60, mds); + param->csign, param->exclude_ctime, + 24 * 60 * 60, mds); if (ret < 0) return ret; @@ -1675,6 +2210,104 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds) return rc; } +/** + * Check whether the stripes matches the indexes user provided + * 1 : matched + * 0 : Unmatched + */ +static int check_obd_match(struct find_param *param) +{ + lstat_t *st = ¶m->lmd->lmd_st; + struct lov_user_ost_data_v1 *lmm_objects; + int i, j; + + if (param->obduuid && param->obdindex == OBD_NOT_FOUND) + return 0; + + if (!S_ISREG(st->st_mode)) + return 0; + + /* Only those files should be accepted, which have a + * stripe on the specified OST. */ + if (!param->lmd->lmd_lmm.lmm_stripe_count) + return 0; + + if (param->lmd->lmd_lmm.lmm_magic == + LOV_USER_MAGIC_V3) { + struct lov_user_md_v3 *lmmv3 = (void *)¶m->lmd->lmd_lmm; + + lmm_objects = lmmv3->lmm_objects; + } else if (param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V1) { + lmm_objects = param->lmd->lmd_lmm.lmm_objects; + } else { + llapi_err_noerrno(LLAPI_MSG_ERROR, "%s:Unknown magic: 0x%08X\n", + __func__, param->lmd->lmd_lmm.lmm_magic); + return -EINVAL; + } + + for (i = 0; i < param->lmd->lmd_lmm.lmm_stripe_count; i++) { + for (j = 0; j < param->num_obds; j++) { + if (param->obdindexes[j] == + lmm_objects[i].l_ost_idx) { + if (param->exclude_obd) + return 0; + return 1; + } + } + } + + if (param->exclude_obd) + return 1; + return 0; +} + +static int check_mdt_match(struct find_param *param) +{ + int i; + + if (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND) + return 0; + + /* FIXME: For striped dir, we should get stripe information and check */ + for (i = 0; i < param->num_mdts; i++) { + if (param->mdtindexes[i] == param->file_mdtindex) + if (param->exclude_mdt) + return 0; + return 1; + } + + if (param->exclude_mdt) + return 1; + return 0; +} + +/** + * Check whether the obd is active or not, if it is + * not active, just print the object affected by this + * failed target + **/ +static int print_failed_tgt(struct find_param *param, char *path, int type) +{ + struct obd_statfs stat_buf; + struct obd_uuid uuid_buf; + int ret; + + LASSERT(type == LL_STATFS_LOV || type == LL_STATFS_LMV); + + memset(&stat_buf, 0, sizeof(struct obd_statfs)); + memset(&uuid_buf, 0, sizeof(struct obd_uuid)); + ret = llapi_obd_statfs(path, type, + param->obdindex, &stat_buf, + &uuid_buf); + if (ret) { + llapi_printf(LLAPI_MSG_NORMAL, + "obd_uuid: %s failed %s ", + param->obduuid->uuid, + strerror(errno)); + } + return ret; +} + static int cb_find_init(char *path, DIR *parent, DIR *dir, void *data, cfs_dirent_t *de) { @@ -1687,7 +2320,8 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, LASSERT(parent != NULL || dir != NULL); - param->lmd->lmd_lmm.lmm_stripe_count = 0; + if (param->have_fileinfo == 0) + param->lmd->lmd_lmm.lmm_stripe_count = 0; /* If a regular expression is presented, make the initial decision */ if (param->pattern != NULL) { @@ -1712,51 +2346,61 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, } } + ret = 0; - /* If a time or OST should be checked, the decision is not taken yet. */ - if (param->atime || param->ctime || param->mtime || param->obduuid || - param->size) + /* Request MDS for the stat info if some of these parameters need + * to be compared. */ + if (param->obduuid || param->mdtuuid || param->check_uid || + param->check_gid || param->check_pool || param->atime || + param->ctime || param->mtime || param->check_size) decision = 0; - ret = 0; - /* Request MDS for the stat info. */ - if (param->have_fileinfo == 0) { - if (dir) { - /* retrieve needed file info */ - ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, - (void *)param->lmd); - } else { - char *fname = strrchr(path, '/'); - fname = (fname == NULL ? path : fname + 1); - - /* retrieve needed file info */ - strncpy((char *)param->lmd, fname, param->lumlen); - ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, - (void *)param->lmd); - } - } + if (param->type && checked_type == 0) + decision = 0; - if (ret) { - if (errno == ENOTTY) { - /* ioctl is not supported, it is not a lustre fs. - * Do the regular lstat(2) instead. */ - lustre_fs = 0; - ret = lstat_f(path, st); - if (ret) { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: lstat failed for %s", - __func__, path); - return ret; + if (param->have_fileinfo == 0 && decision == 0) { + ret = get_lmd_info(path, parent, dir, param->lmd, + param->lumlen); + if (ret == 0) { + if (dir) { + ret = llapi_file_fget_mdtidx(dirfd(dir), + ¶m->file_mdtindex); + } else { + int fd; + lstat_t tmp_st; + + ret = lstat_f(path, &tmp_st); + if (ret) { + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "error: %s: lstat failed" + "for %s", __func__, path); + return ret; + } + if (S_ISREG(tmp_st.st_mode)) { + fd = open(path, O_RDONLY); + if (fd > 0) { + ret = llapi_file_fget_mdtidx(fd, + ¶m->file_mdtindex); + close(fd); + } else { + ret = fd; + } + } else { + /* For special inode, it assumes to + * reside on the same MDT with the + * parent */ + fd = dirfd(parent); + ret = llapi_file_fget_mdtidx(fd, + ¶m->file_mdtindex); + } } - } else if (errno == ENOENT) { - llapi_err(LLAPI_MSG_WARN, - "warning: %s: %s does not exist", - __func__, path); - goto decided; - } else { - llapi_err(LLAPI_MSG_ERROR,"error: %s: %s failed for %s", - __func__, dir ? "LL_IOC_MDC_GETINFO" : - "IOC_MDC_GETFILEINFO", path); + } + if (ret) { + if (ret == -ENOTTY) + lustre_fs = 0; + if (ret == -ENOENT) + goto decided; return ret; } } @@ -1772,17 +2416,18 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, } /* Prepare odb. */ - if (param->obduuid) { + if (param->obduuid || param->mdtuuid) { if (lustre_fs && param->got_uuids && param->st_dev != st->st_dev) { /* A lustre/lustre mount point is crossed. */ param->got_uuids = 0; param->obds_printed = 0; - param->obdindex = OBD_NOT_FOUND; + param->obdindex = param->mdtindex = OBD_NOT_FOUND; } if (lustre_fs && !param->got_uuids) { - ret = setup_obd_indexes(dir ? dir : parent, param); + ret = setup_target_indexes(dir ? dir : parent, path, + param); if (ret) return ret; @@ -1790,57 +2435,36 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, } else if (!lustre_fs && param->got_uuids) { /* A lustre/non-lustre mount point is crossed. */ param->got_uuids = 0; - param->obdindex = OBD_NOT_FOUND; + param->obdindex = param->mdtindex = OBD_NOT_FOUND; } } - /* If an OBD UUID is specified but no one matches, skip this file. */ - if (param->obduuid && param->obdindex == OBD_NOT_FOUND) + if ((param->obduuid && param->obdindex == OBD_NOT_FOUND) || + (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND)) goto decided; - /* If a OST UUID is given, and some OST matches, check it here. */ - if (param->obdindex != OBD_NOT_FOUND) { - if (!S_ISREG(st->st_mode)) - goto decided; - - /* Only those files should be accepted, which have a - * stripe on the specified OST. */ - if (!param->lmd->lmd_lmm.lmm_stripe_count) { - goto decided; - } else { - int i, j; - struct lov_user_ost_data_v1 *lmm_objects; - - if (param->lmd->lmd_lmm.lmm_magic == - LOV_USER_MAGIC_V3) { - struct lov_user_md_v3 *lmmv3 = - (void *)¶m->lmd->lmd_lmm; - - lmm_objects = lmmv3->lmm_objects; - } else { - lmm_objects = param->lmd->lmd_lmm.lmm_objects; - } - - for (i = 0; - i < param->lmd->lmd_lmm.lmm_stripe_count; i++) { - for (j = 0; j < param->num_obds; j++) { - if (param->obdindexes[j] == - lmm_objects[i].l_ost_idx) { - if (param->exclude_obd) - goto decided; - goto obd_matches; - } - } - } - - if (i == param->lmd->lmd_lmm.lmm_stripe_count) { - if (param->exclude_obd) + /* If a OST or MDT UUID is given, and some OST matches, + * check it here. */ + if (param->obdindex != OBD_NOT_FOUND || + param->mdtindex != OBD_NOT_FOUND) { + if (param->obduuid) { + if (check_obd_match(param)) { + /* If no mdtuuid is given, we are done. + * Otherwise, fall through to the mdtuuid + * check below. */ + if (!param->mdtuuid) goto obd_matches; + } else { goto decided; } } + if (param->mdtuuid) { + if (check_mdt_match(param)) + goto obd_matches; + goto decided; + } } - +obd_matches: if (param->check_uid) { if (st->st_uid == param->uid) { if (param->exclude_uid) @@ -1881,46 +2505,39 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, } /* Check the time on mds. */ - if (!decision) { + decision = 1; + if (param->atime || param->ctime || param->mtime) { int for_mds; for_mds = lustre_fs ? (S_ISREG(st->st_mode) && param->lmd->lmd_lmm.lmm_stripe_count) : 0; decision = find_time_check(st, param, for_mds); + if (decision == -1) + goto decided; } -obd_matches: /* If file still fits the request, ask ost for updated info. The regular stat is almost of the same speed as some new 'glimpse-size-ioctl'. */ - if (!decision && S_ISREG(st->st_mode) && - param->lmd->lmd_lmm.lmm_stripe_count && - (param->size ||param->atime || param->mtime || param->ctime)) { - if (param->obdindex != OBD_NOT_FOUND) { - /* Check whether the obd is active or not, if it is - * not active, just print the object affected by this - * failed ost - * */ - struct obd_statfs stat_buf; - struct obd_uuid uuid_buf; - - memset(&stat_buf, 0, sizeof(struct obd_statfs)); - memset(&uuid_buf, 0, sizeof(struct obd_uuid)); - ret = llapi_obd_statfs(path, LL_STATFS_LOV, - param->obdindex, &stat_buf, - &uuid_buf); - if (ret) { - if (ret == -ENODATA || ret == -ENODEV - || ret == -EIO) - errno = EIO; - llapi_printf(LLAPI_MSG_NORMAL, - "obd_uuid: %s failed %s ", - param->obduuid->uuid, - strerror(errno)); - goto print_path; - } - } + + if (param->check_size && S_ISREG(st->st_mode) && + param->lmd->lmd_lmm.lmm_stripe_count) + decision = 0; + + while (!decision) { + /* For regular files with the stripe the decision may have not + * been taken yet if *time or size is to be checked. */ + LASSERT((S_ISREG(st->st_mode) && + param->lmd->lmd_lmm.lmm_stripe_count) || + param->mdtindex != OBD_NOT_FOUND); + + if (param->obdindex != OBD_NOT_FOUND) + print_failed_tgt(param, path, LL_STATFS_LOV); + + if (param->mdtindex != OBD_NOT_FOUND) + print_failed_tgt(param, path, LL_STATFS_LMV); + if (dir) { ret = ioctl(dirfd(dir), IOC_LOV_GETINFO, (void *)param->lmd); @@ -1931,14 +2548,15 @@ obd_matches: if (ret) { if (errno == ENOENT) { - llapi_err(LLAPI_MSG_ERROR, - "warning: %s: %s does not exist", - __func__, path); + llapi_error(LLAPI_MSG_ERROR, -ENOENT, + "warning: %s: %s does not exist", + __func__, path); goto decided; } else { - llapi_err(LLAPI_MSG_ERROR, - "%s: IOC_LOV_GETINFO on %s failed", - __func__, path); + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "%s: IOC_LOV_GETINFO on %s failed", + __func__, path); return ret; } } @@ -1947,14 +2565,15 @@ obd_matches: decision = find_time_check(st, param, 0); if (decision == -1) goto decided; + + break; } - if (param->size) + if (param->check_size) decision = find_value_cmp(st->st_size, param->size, - param->size_sign, param->size_units, - 0); + param->size_sign, param->exclude_size, + param->size_units, 0); -print_path: if (decision != -1) { llapi_printf(LLAPI_MSG_NORMAL, "%s", path); if (param->zeroend) @@ -1984,7 +2603,7 @@ int llapi_find(char *path, struct find_param *param) */ int llapi_file_fget_mdtidx(int fd, int *mdtidx) { - if (ioctl(fd, LL_IOC_GET_MDTIDX, &mdtidx) < 0) + if (ioctl(fd, LL_IOC_GET_MDTIDX, mdtidx) < 0) return -errno; return 0; } @@ -2008,34 +2627,34 @@ static int cb_get_mdt_index(char *path, DIR *parent, DIR *d, void *data, ret = llapi_file_fget_mdtidx(fd, &mdtidx); close(fd); } else { - ret = fd; + ret = -errno; } } if (ret) { - if (errno == ENODATA) { + if (ret == -ENODATA) { if (!param->obduuid) llapi_printf(LLAPI_MSG_NORMAL, "%s has no stripe info\n", path); goto out; - } else if (errno == ENOTTY) { - llapi_err(LLAPI_MSG_ERROR, - "%s: '%s' not on a Lustre fs?", - __func__, path); - } else if (errno == ENOENT) { - llapi_err(LLAPI_MSG_WARN, - "warning: %s: %s does not exist", - __func__, path); + } else if (ret == -ENOENT) { + llapi_error(LLAPI_MSG_WARN, ret, + "warning: %s: %s does not exist", + __func__, path); goto out; + } else if (ret == -ENOTTY) { + llapi_error(LLAPI_MSG_ERROR, ret, + "%s: '%s' not on a Lustre fs?", + __func__, path); } else { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: LL_IOC_GET_MDTIDX failed for %s", - __func__, path); + llapi_error(LLAPI_MSG_ERROR, ret, + "error: %s: LL_IOC_GET_MDTIDX failed for %s", + __func__, path); } return ret; } - if (param->quiet) + if (param->quiet || !(param->verbose & VERBOSE_DETAIL)) llapi_printf(LLAPI_MSG_NORMAL, "%d\n", mdtidx); else llapi_printf(LLAPI_MSG_NORMAL, "%s MDT index: %d\n", @@ -2079,30 +2698,49 @@ static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data, } if (ret) { - if (errno == ENODATA) { + if (errno == ENODATA && d != NULL) { + /* We need to "fake" the "use the default" values + * since the lmm struct is zeroed out at this point. + * The magic needs to be set in order to satisfy + * a check later on in the code path. + * The object_seq needs to be set for the "(Default)" + * prefix to be displayed. */ + struct lov_user_md *lmm = ¶m->lmd->lmd_lmm; + lmm->lmm_magic = LOV_MAGIC_V1; + if (!param->raw) + lmm->lmm_object_seq = FID_SEQ_LOV_DEFAULT; + lmm->lmm_stripe_count = 0; + lmm->lmm_stripe_size = 0; + lmm->lmm_stripe_offset = -1; + goto dump; + + } else if (errno == ENODATA && parent != NULL) { if (!param->obduuid) llapi_printf(LLAPI_MSG_NORMAL, "%s has no stripe info\n", path); goto out; - } else if (errno == ENOTTY) { - llapi_err(LLAPI_MSG_ERROR, - "%s: '%s' not on a Lustre fs?", - __func__, path); } else if (errno == ENOENT) { - llapi_err(LLAPI_MSG_WARN, - "warning: %s: %s does not exist", - __func__, path); + llapi_error(LLAPI_MSG_WARN, -ENOENT, + "warning: %s: %s does not exist", + __func__, path); goto out; + } else if (errno == ENOTTY) { + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "%s: '%s' not on a Lustre fs?", + __func__, path); } else { - llapi_err(LLAPI_MSG_ERROR, - "error: %s: %s failed for %s", - __func__, d ? "LL_IOC_LOV_GETSTRIPE" : - "IOC_MDC_GETFILESTRIPE", path); + ret = -errno; + llapi_error(LLAPI_MSG_ERROR, ret, + "error: %s: %s failed for %s", + __func__, d ? "LL_IOC_LOV_GETSTRIPE" : + "IOC_MDC_GETFILESTRIPE", path); } return ret; } +dump: if (!param->get_mdt_index) llapi_lov_dump_user_lmm(param, path, d ? 1 : 0); @@ -2141,9 +2779,10 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index, data.ioc_pbuf2 = (char *)uuid_buf; data.ioc_plen2 = sizeof(struct obd_uuid); - if ((rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw))) != 0) { - llapi_err(LLAPI_MSG_ERROR, - "llapi_obd_statfs: error packing ioctl data"); + rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw)); + if (rc != 0) { + llapi_error(LLAPI_MSG_ERROR, rc, + "llapi_obd_statfs: error packing ioctl data"); return rc; } @@ -2153,8 +2792,8 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index, if (fd < 0) { rc = errno ? -errno : -EBADF; - llapi_err(LLAPI_MSG_ERROR, "error: %s: opening '%s'", - __func__, path); + llapi_error(LLAPI_MSG_ERROR, rc, "error: %s: opening '%s'", + __func__, path); return rc; } rc = ioctl(fd, IOC_OBD_STATFS, (void *)rawbuf); @@ -2166,7 +2805,6 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index, } #define MAX_STRING_SIZE 128 -#define DEVICES_LIST "/proc/fs/lustre/devices" int llapi_ping(char *obd_type, char *obd_name) { @@ -2179,12 +2817,14 @@ int llapi_ping(char *obd_type, char *obd_name) fd = open(path, O_WRONLY); if (fd < 0) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "error opening %s", path); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path); return rc; } rc = write(fd, buf, 1); + if (rc < 0) + rc = -errno; close(fd); if (rc == 1) @@ -2192,15 +2832,16 @@ int llapi_ping(char *obd_type, char *obd_name) return rc; } -int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb) +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; if (fp == NULL) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "error: opening "DEVICES_LIST); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST); return rc; } @@ -2209,7 +2850,6 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb) char *obd_name = NULL; char *obd_uuid = NULL; char *bufp = buf; - struct obd_ioctl_data datal = { 0, }; struct obd_statfs osfs_buffer; while(bufp[0] == ' ') @@ -2223,9 +2863,6 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb) memset(&osfs_buffer, 0, sizeof (osfs_buffer)); - datal.ioc_pbuf1 = (char *)&osfs_buffer; - datal.ioc_plen1 = sizeof(osfs_buffer); - for (i = 0; i < type_num; i++) { if (strcmp(obd_type_name, obd_type[i]) != 0) continue; @@ -2234,7 +2871,7 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb) } } fclose(fp); - return rc; + return 0; } static void do_target_check(char *obd_type_name, char *obd_name, @@ -2246,7 +2883,7 @@ static void do_target_check(char *obd_type_name, char *obd_name, if (rc == ENOTCONN) { llapi_printf(LLAPI_MSG_NORMAL, "%s inactive.\n", obd_name); } else if (rc) { - llapi_err(LLAPI_MSG_ERROR, "error: check '%s'", obd_name); + llapi_error(LLAPI_MSG_ERROR, rc, "error: check '%s'", obd_name); } else { llapi_printf(LLAPI_MSG_NORMAL, "%s active.\n", obd_name); } @@ -2286,16 +2923,19 @@ int llapi_catinfo(char *dir, char *keyword, char *node_name) root = opendir(dir); if (root == NULL) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "open %s failed", dir); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", dir); return rc; } rc = ioctl(dirfd(root), OBD_IOC_LLOG_CATINFO, buf); - if (rc) - llapi_err(LLAPI_MSG_ERROR, "ioctl OBD_IOC_CATINFO failed"); - else + if (rc) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "ioctl OBD_IOC_CATINFO failed"); + } else { llapi_printf(LLAPI_MSG_NORMAL, "%s", data.ioc_pbuf1); + } closedir(root); return rc; @@ -2321,11 +2961,14 @@ int llapi_quotacheck(char *mnt, int check_type) root = opendir(mnt); if (!root) { - llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt); + return rc; } rc = ioctl(dirfd(root), LL_IOC_QUOTACHECK, check_type); + if (rc < 0) + rc = -errno; closedir(root); return rc; @@ -2339,8 +2982,9 @@ int llapi_poll_quotacheck(char *mnt, struct if_quotacheck *qchk) root = opendir(mnt); if (!root) { - llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt); + return rc; } while (1) { @@ -2353,7 +2997,7 @@ int llapi_poll_quotacheck(char *mnt, struct if_quotacheck *qchk) } closedir(root); - return rc; + return 0; } int llapi_quotactl(char *mnt, struct if_quotactl *qctl) @@ -2363,11 +3007,14 @@ int llapi_quotactl(char *mnt, struct if_quotactl *qctl) root = opendir(mnt); if (!root) { - llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt); + return rc; } rc = ioctl(dirfd(root), LL_IOC_QUOTACTL, qctl); + if (rc < 0) + rc = -errno; closedir(root); return rc; @@ -2382,36 +3029,15 @@ static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data, LASSERT(parent != NULL || d != NULL); - if (d) { - rc = ioctl(dirfd(d), LL_IOC_MDC_GETINFO, - (void *)param->lmd); - } else if (parent) { - char *fname = strrchr(path, '/'); - fname = (fname == NULL ? path : fname + 1); - - strncpy((char *)param->lmd, fname, param->lumlen); - rc = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, - (void *)param->lmd); - } else { - return 0; - } - + rc = get_lmd_info(path, parent, d, param->lmd, param->lumlen); if (rc) { - if (errno == ENODATA) { + if (rc == -ENODATA) { if (!param->obduuid && !param->quiet) - llapi_err(LLAPI_MSG_ERROR, + llapi_error(LLAPI_MSG_ERROR, -ENODATA, "%s has no stripe info", path); rc = 0; - } else if (errno == ENOENT) { - llapi_err(LLAPI_MSG_ERROR, - "warning: %s: %s does not exist", - __func__, path); + } else if (rc == -ENOENT) { rc = 0; - } else if (errno != EISDIR) { - rc = errno; - llapi_err(LLAPI_MSG_ERROR, "%s ioctl failed for %s.", - d ? "LL_IOC_MDC_GETINFO" : - "IOC_MDC_GETFILEINFO", path); } return rc; } @@ -2423,12 +3049,15 @@ static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data, * invoke syscall directly. */ rc = syscall(SYS_chown, path, -1, -1); if (rc) - llapi_err(LLAPI_MSG_ERROR,"error: chown %s (%u,%u)", path); + llapi_error(LLAPI_MSG_ERROR, errno, + "error: chown %s", path); rc = chmod(path, st->st_mode); - if (rc) - llapi_err(LLAPI_MSG_ERROR, "error: chmod %s (%hu)", - path, st->st_mode); + if (rc) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "error: chmod %s (%hu)", + path, st->st_mode); + } return rc; } @@ -2460,8 +3089,10 @@ static int rmtacl_notify(int ops) fp = setmntent(MOUNTED, "r"); if (fp == NULL) { - perror("setmntent"); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "error setmntent(%s)", MOUNTED); + return rc; } while (1) { @@ -2474,14 +3105,17 @@ static int rmtacl_notify(int ops) fd = open(mnt->mnt_dir, O_RDONLY | O_DIRECTORY); if (fd < 0) { - perror("open"); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Can't open '%s'\n", mnt->mnt_dir); + return rc; } rc = ioctl(fd, LL_IOC_RMTACL, ops); if (rc < 0) { - perror("ioctl"); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d\n", fd); + return rc; } found++; @@ -2510,14 +3144,16 @@ static int rmtacl_name2id(char *name, int is_user) if (is_user) { struct passwd *pw; - if ((pw = getpwnam(name)) == NULL) + pw = getpwnam(name); + if (pw == NULL) return INVALID_ID; else return (int)(pw->pw_uid); } else { struct group *gr; - if ((gr = getgrnam(name)) == NULL) + gr = getgrnam(name); + if (gr == NULL) return INVALID_ID; else return (int)(gr->gr_gid); @@ -2633,29 +3269,34 @@ static int child_status(int status) static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *)) { pid_t pid = 0; - int fd[2], status; + int fd[2], status, rc; FILE *fp; char buf[PIPE_BUF]; if (output_func) { if (pipe(fd) < 0) { - perror("pipe"); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe\n"); + return rc; } - if ((pid = fork()) < 0) { - perror("fork"); + pid = fork(); + if (pid < 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork\n"); close(fd[0]); close(fd[1]); - return -1; + return rc; } else if (!pid) { /* child process redirects its output. */ close(fd[0]); close(1); if (dup2(fd[1], 1) < 0) { - perror("dup2"); + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "Can't dup2 %d\n", fd[1]); close(fd[1]); - return -1; + return rc; } } else { close(fd[1]); @@ -2665,17 +3306,19 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *)) if (!pid) { status = rmtacl_notify(ops); if (status < 0) - return -1; + return -errno; exit(execvp(argv[0], argv)); } /* the following is parent process */ - if ((fp = fdopen(fd[0], "r")) == NULL) { - perror("fdopen"); + fp = fdopen(fd[0], "r"); + if (fp == NULL) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed\n", fd[0]); kill(pid, SIGKILL); close(fd[0]); - return -1; + return rc; } while (fgets(buf, PIPE_BUF, fp) != NULL) { @@ -2687,8 +3330,9 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *)) close(fd[0]); if (waitpid(pid, &status, 0) < 0) { - perror("waitpid"); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed\n", pid); + return rc; } return child_status(status); @@ -2720,7 +3364,7 @@ int llapi_cp(int argc, char *argv[]) rc = rmtacl_notify(RMT_RSETFACL); if (rc < 0) - return -1; + return rc; exit(execvp(argv[0], argv)); } @@ -2731,7 +3375,7 @@ int llapi_ls(int argc, char *argv[]) rc = rmtacl_notify(RMT_LGETFACL); if (rc < 0) - return -1; + return rc; exit(execvp(argv[0], argv)); } @@ -2756,8 +3400,8 @@ static int get_mdtname(char *name, char *format, char *buf) suffix[0] = '\0'; } else { /* Not enough room to add suffix */ - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "MDT name too long |%s|", name); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "MDT name too long |%s|", name); return -EINVAL; } } @@ -2793,8 +3437,8 @@ static int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp, } if (rc < 0) { if (want_error) - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "Can't open %s: %d\n", mdtname, rc); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "Can't open %s: %d\n", mdtname, rc); return rc; } @@ -2802,8 +3446,12 @@ static int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp, *mdtidxp = index; rc = ioctl(fd, opc, data); + if (rc == -1) + rc = -errno; + else + rc = 0; if (rc && want_error) - llapi_err(LLAPI_MSG_ERROR, "ioctl %d err %d", opc, rc); + llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d err %d", opc, rc); close(fd); return rc; @@ -2830,7 +3478,6 @@ struct changelog_private { int magic; int flags; lustre_kernelcomm kuc; - char *buf; }; /** Start reading from a changelog @@ -2847,16 +3494,10 @@ int llapi_changelog_start(void **priv, int flags, const char *device, int rc; /* Set up the receiver control struct */ - cp = malloc(sizeof(*cp)); + cp = calloc(1, sizeof(*cp)); if (cp == NULL) return -ENOMEM; - cp->buf = malloc(CR_MAXSIZE); - if (cp->buf == NULL) { - rc = -ENOMEM; - goto out_free; - } - cp->magic = CHANGELOG_PRIV_MAGIC; cp->flags = flags; @@ -2882,8 +3523,6 @@ int llapi_changelog_start(void **priv, int flags, const char *device, return 0; out_free: - if (cp->buf) - free(cp->buf); free(cp); return rc; } @@ -2897,7 +3536,6 @@ int llapi_changelog_fini(void **priv) return -EINVAL; libcfs_ukuc_stop(&cp->kuc); - free(cp->buf); free(cp); *priv = NULL; return 0; @@ -2920,20 +3558,23 @@ int llapi_changelog_recv(void *priv, struct changelog_rec **rech) return -EINVAL; if (rech == NULL) return -EINVAL; + kuch = malloc(CR_MAXSIZE + sizeof(*kuch)); + if (kuch == NULL) + return -ENOMEM; repeat: - rc = libcfs_ukuc_msg_get(&cp->kuc, cp->buf, CR_MAXSIZE, + rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch, + CR_MAXSIZE + sizeof(*kuch), KUC_TRANSPORT_CHANGELOG); if (rc < 0) - return rc; + goto out_free; - kuch = (struct kuc_hdr *)cp->buf; if ((kuch->kuc_transport != KUC_TRANSPORT_CHANGELOG) || ((kuch->kuc_msgtype != CL_RECORD) && (kuch->kuc_msgtype != CL_EOF))) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "Unknown changelog message type %d:%d\n", - kuch->kuc_transport, kuch->kuc_msgtype); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "Unknown changelog message type %d:%d\n", + kuch->kuc_transport, kuch->kuc_msgtype); rc = -EPROTO; goto out_free; } @@ -2948,19 +3589,30 @@ repeat: } } - /* Our message is a changelog_rec */ + /* Our message is a changelog_rec. Use pointer math to skip + * kuch_hdr and point directly to the message payload. + */ *rech = (struct changelog_rec *)(kuch + 1); return 0; out_free: *rech = NULL; + free(kuch); return rc; } /** Release the changelog record when done with it. */ int llapi_changelog_free(struct changelog_rec **rech) { + if (*rech) { + /* We allocated memory starting at the kuc_hdr, but passed + * the consumer a pointer to the payload. + * Use pointer math to get back to the header. + */ + struct kuc_hdr *kuch = (struct kuc_hdr *)*rech - 1; + free(kuch); + } *rech = NULL; return 0; } @@ -2971,17 +3623,18 @@ int llapi_changelog_clear(const char *mdtname, const char *idstr, int id; if (endrec < 0) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "can't purge negative records\n"); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "can't purge negative records\n"); return -EINVAL; } id = strtol(idstr + strlen(CHANGELOG_USER_PREFIX), NULL, 10); if ((id == 0) || (strncmp(idstr, CHANGELOG_USER_PREFIX, strlen(CHANGELOG_USER_PREFIX)) != 0)) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "expecting id of the form '"CHANGELOG_USER_PREFIX - "'; got '%s'\n", idstr); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "expecting id of the form '" + CHANGELOG_USER_PREFIX + "'; got '%s'\n", idstr); return -EINVAL; } @@ -2991,44 +3644,34 @@ 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) { - char path[PATH_MAX]; struct lu_fid fid; struct getinfo_fid2path *gf; - int fd, rc; + int rc; while (*fidstr == '[') fidstr++; sscanf(fidstr, SFID, RFID(&fid)); if (!fid_is_sane(&fid)) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "bad FID format [%s], should be "DFID"\n", - fidstr, (__u64)1, 2, 0); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "bad FID format [%s], should be "DFID"\n", + fidstr, (__u64)1, 2, 0); return -EINVAL; } - /* Take path or fsname */ - if (device[0] == '/') { - strcpy(path, device); - } else { - rc = get_root_path(WANT_PATH | WANT_ERROR, (char *)device, - NULL, path, -1); - if (rc < 0) - return rc; - } - sprintf(path, "%s/%s/fid/%s", path, dot_lustre_name, fidstr); - fd = open(path, O_RDONLY | O_NONBLOCK); - if (fd < 0) - return -errno; - 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; - rc = ioctl(fd, OBD_IOC_FID2PATH, gf); + + /* Take path or fsname */ + rc = root_ioctl(device, OBD_IOC_FID2PATH, gf, NULL, 0); if (rc) { - llapi_err(LLAPI_MSG_ERROR, "ioctl err %d", rc); + if (rc != -ENOENT) + llapi_error(LLAPI_MSG_ERROR, rc, "ioctl err %d", rc); } else { memcpy(buf, gf->gf_path, gf->gf_pathlen); *recno = gf->gf_recno; @@ -3036,7 +3679,6 @@ int llapi_fid2path(const char *device, const char *fidstr, char *buf, } free(gf); - close(fd); return rc; } @@ -3078,7 +3720,6 @@ int llapi_path2fid(const char *path, lustre_fid *fid) #define CT_PRIV_MAGIC 0xC0BE2001 struct copytool_private { int magic; - char *buf; char *fsname; lustre_kernelcomm kuc; __u32 archives; @@ -3100,18 +3741,17 @@ int llapi_copytool_start(void **priv, char *fsname, int flags, int rc; if (archive_count > 0 && archives == NULL) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "NULL archive numbers"); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "NULL archive numbers"); return -EINVAL; } - ct = malloc(sizeof(*ct)); + ct = calloc(1, sizeof(*ct)); if (ct == NULL) return -ENOMEM; - ct->buf = malloc(HAL_MAXSIZE); ct->fsname = malloc(strlen(fsname) + 1); - if (ct->buf == NULL || ct->fsname == NULL) { + if (ct->fsname == NULL) { rc = -ENOMEM; goto out_err; } @@ -3120,9 +3760,9 @@ int llapi_copytool_start(void **priv, char *fsname, int flags, ct->archives = 0; for (rc = 0; rc < archive_count; rc++) { if (archives[rc] > sizeof(ct->archives)) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "Maximum of %d archives supported", - sizeof(ct->archives)); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "Maximum of %d archives supported", + sizeof(ct->archives)); goto out_err; } ct->archives |= 1 << archives[rc]; @@ -3149,8 +3789,6 @@ int llapi_copytool_start(void **priv, char *fsname, int flags, return 0; out_err: - if (ct->buf) - free(ct->buf); if (ct->fsname) free(ct->fsname); free(ct); @@ -3172,7 +3810,6 @@ int llapi_copytool_fini(void **priv) /* Shut down the kernelcomms */ libcfs_ukuc_stop(&ct->kuc); - free(ct->buf); free(ct->fsname); free(ct); *priv = NULL; @@ -3198,13 +3835,17 @@ int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize) if (halh == NULL || msgsize == NULL) return -EINVAL; - rc = libcfs_ukuc_msg_get(&ct->kuc, ct->buf, HAL_MAXSIZE, + kuch = malloc(HAL_MAXSIZE + sizeof(*kuch)); + if (kuch == NULL) + return -ENOMEM; + + rc = libcfs_ukuc_msg_get(&ct->kuc, (char *)kuch, + HAL_MAXSIZE + sizeof(*kuch), KUC_TRANSPORT_HSM); if (rc < 0) - return rc; + goto out_free; /* Handle generic messages */ - kuch = (struct kuc_hdr *)ct->buf; if (kuch->kuc_transport == KUC_TRANSPORT_GENERIC && kuch->kuc_msgtype == KUC_MSG_SHUTDOWN) { rc = -ESHUTDOWN; @@ -3213,22 +3854,23 @@ int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize) if (kuch->kuc_transport != KUC_TRANSPORT_HSM || kuch->kuc_msgtype != HMT_ACTION_LIST) { - llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO, - "Unknown HSM message type %d:%d\n", - kuch->kuc_transport, kuch->kuc_msgtype); + llapi_err_noerrno(LLAPI_MSG_ERROR, + "Unknown HSM message type %d:%d\n", + kuch->kuc_transport, kuch->kuc_msgtype); rc = -EPROTO; goto out_free; } - /* Our message is an hsm_action_list */ - + /* Our message is a hsm_action_list. Use pointer math to skip + * kuch_hdr and point directly to the message payload. + */ hal = (struct hsm_action_list *)(kuch + 1); /* Check that we have registered for this archive # */ if (((1 << hal->hal_archive_num) & ct->archives) == 0) { - llapi_err(LLAPI_MSG_INFO | LLAPI_MSG_NO_ERRNO, - "Ignoring request for archive #%d (bitmask %#x)\n", - hal->hal_archive_num, ct->archives); + llapi_err_noerrno(LLAPI_MSG_INFO, + "Ignoring request for archive #%d (bitmask %#x)\n", + hal->hal_archive_num, ct->archives); rc = 0; goto out_free; } @@ -3240,14 +3882,15 @@ int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize) out_free: *halh = NULL; *msgsize = 0; + free(kuch); return rc; } /** Release the action list when done with it. */ int llapi_copytool_free(struct hsm_action_list **hal) { - *hal = NULL; - return 0; + /* Reuse the llapi_changelog_free function */ + return llapi_changelog_free((struct changelog_rec **)hal); } int llapi_get_connect_flags(const char *mnt, __u64 *flags) @@ -3257,15 +3900,18 @@ int llapi_get_connect_flags(const char *mnt, __u64 *flags) root = opendir(mnt); if (!root) { - llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt); - return -1; + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt); + return rc; } rc = ioctl(dirfd(root), LL_IOC_GET_CONNECT_FLAGS, flags); + if (rc < 0) { + rc = -errno; + llapi_error(LLAPI_MSG_ERROR, rc, + "ioctl on %s for getting connect flags failed", mnt); + } closedir(root); - if (rc < 0) - llapi_err(LLAPI_MSG_ERROR, - "ioctl on %s for getting connect flags failed", mnt); return rc; } @@ -3288,9 +3934,9 @@ int llapi_get_version(char *buffer, int buffer_size, rc = ioctl(fd, OBD_GET_VERSION, buffer); if (rc == -1) { - rc = errno; + rc = -errno; close(fd); - return -rc; + return rc; } close(fd); *version = data->ioc_bulk;