X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi.c;h=a425b1aebd8fdfae72353b471b9c2f4deb6dbde9;hp=6ac3882f466c84bca0063c7e2d11621817b666d0;hb=27dfc1a14059edb84cfa8f67ac3765dac99317dc;hpb=e9e4084a98c5b94664b357c279f13660db805107;ds=sidebyside diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index 6ac3882..a425b1a 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -592,7 +592,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 @@ -1357,30 +1357,23 @@ retry_get_uuids: return ret; } -static int cb_ostlist(char *path, DIR *parent, DIR *d, void *data, - struct dirent64 *de) +int llapi_ostlist(char *path, struct find_param *param) { - struct find_param *param = (struct find_param *)data; + DIR *dir; int ret; - LASSERT(parent != NULL || d != NULL); - - /* Prepare odb. */ - ret = setup_obd_uuid(d ? d : parent, path, param); + dir = opendir(path); + if (dir == NULL) + return -errno; - /* We don't want to actually traverse the directory tree, - * so return a positive value from sem_init to terminate - * the traversal before it starts. - */ - return ret == 0 ? 1 : ret; -} + ret = setup_obd_uuid(dir, path, param); + closedir(dir); -int llapi_ostlist(char *path, struct find_param *param) -{ - return param_callback(path, cb_ostlist, cb_common_fini, param); + return ret; } 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) { @@ -1430,8 +1423,14 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path, if (verbose & ~VERBOSE_OFFSET) llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ", prefix); - llapi_printf(LLAPI_MSG_NORMAL, "%u%c", - lum->lmm_objects[0].l_ost_idx, nl); + if (is_dir) + llapi_printf(LLAPI_MSG_NORMAL, "%d%c", + lum->lmm_stripe_offset == + (typeof(lum->lmm_stripe_offset))(-1) ? -1 : + lum->lmm_stripe_offset, nl); + else + llapi_printf(LLAPI_MSG_NORMAL, "%u%c", + objects[0].l_ost_idx, nl); } if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) { @@ -1460,7 +1459,7 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name, } if (obdstripe == 1) - lov_dump_user_lmm_header(lum, path, is_dir, header, depth, + lov_dump_user_lmm_header(lum, path, objects, is_dir, header, depth, pool_name); if (!is_dir && (header & VERBOSE_OBJID)) { @@ -1604,28 +1603,26 @@ 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) + int negopt, unsigned long long margin, int mds) { + int ret = -1; + if (sign > 0) { - if (file < limit) - return mds ? 0 : 1; - } - - if (sign == 0) { - if (file <= limit && file + margin > limit) - return mds ? 0 : 1; - if (file + margin <= limit) - return mds ? 0 : -1; - } - - if (sign < 0) { - if (file > limit) - return 1; - if (mds) - return 0; + if (file <= limit) + 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) + 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). @@ -1643,7 +1640,8 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds) /* 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; @@ -1651,7 +1649,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; @@ -1663,7 +1662,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; @@ -1716,7 +1716,7 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir, /* 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) + param->check_size) decision = 0; ret = 0; @@ -1897,7 +1897,7 @@ obd_matches: '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)) { + (param->check_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 @@ -1950,10 +1950,10 @@ obd_matches: goto decided; } - 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) { @@ -2831,7 +2831,6 @@ struct changelog_private { int magic; int flags; lustre_kernelcomm kuc; - char *buf; }; /** Start reading from a changelog @@ -2848,16 +2847,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; @@ -2883,8 +2876,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; } @@ -2898,7 +2889,6 @@ int llapi_changelog_fini(void **priv) return -EINVAL; libcfs_ukuc_stop(&cp->kuc); - free(cp->buf); free(cp); *priv = NULL; return 0; @@ -2921,14 +2911,17 @@ 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))) { @@ -2949,19 +2942,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; } @@ -3079,7 +3083,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; @@ -3106,13 +3109,12 @@ int llapi_copytool_start(void **priv, char *fsname, int flags, 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; } @@ -3150,8 +3152,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); @@ -3173,7 +3173,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; @@ -3199,13 +3198,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; @@ -3221,8 +3224,9 @@ int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize) 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 # */ @@ -3241,14 +3245,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) @@ -3269,3 +3274,31 @@ int llapi_get_connect_flags(const char *mnt, __u64 *flags) "ioctl on %s for getting connect flags failed", mnt); 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; +}