static void info_callback_default(enum llapi_message_level level, int err,
const char *fmt, va_list ap)
{
- if (liblustreapi_cmd != NULL)
- fprintf(stderr, "%s %s: ", program_invocation_short_name,
- liblustreapi_cmd);
- else
- fprintf(stderr, "%s: ", program_invocation_short_name);
+ if (err != 0) {
+ if (liblustreapi_cmd != NULL) {
+ fprintf(stdout, "%s %s: ",
+ program_invocation_short_name,
+ liblustreapi_cmd);
+ } else {
+ fprintf(stdout, "%s: ", program_invocation_short_name);
+ }
+ }
vfprintf(stdout, fmt, ap);
}
return 0;
}
-int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
+int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
{
struct obd_ioctl_data *overlay;
char *ptr;
ptr = overlay->ioc_bulk;
if (data->ioc_inlbuf1) {
memcpy(ptr, data->ioc_inlbuf1, data->ioc_inllen1);
- ptr += cfs_size_round(data->ioc_inllen1);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen1, 8);
}
if (data->ioc_inlbuf2) {
memcpy(ptr, data->ioc_inlbuf2, data->ioc_inllen2);
- ptr += cfs_size_round(data->ioc_inllen2);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen2, 8);
}
if (data->ioc_inlbuf3) {
memcpy(ptr, data->ioc_inlbuf3, data->ioc_inllen3);
- ptr += cfs_size_round(data->ioc_inllen3);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen3, 8);
}
if (data->ioc_inlbuf4) {
memcpy(ptr, data->ioc_inlbuf4, data->ioc_inllen4);
- ptr += cfs_size_round(data->ioc_inllen4);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen4, 8);
}
return 0;
}
-int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
+int llapi_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
{
struct obd_ioctl_data *overlay;
char *ptr;
ptr = overlay->ioc_bulk;
if (data->ioc_inlbuf1) {
memcpy(data->ioc_inlbuf1, ptr, data->ioc_inllen1);
- ptr += cfs_size_round(data->ioc_inllen1);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen1, 8);
}
if (data->ioc_inlbuf2) {
memcpy(data->ioc_inlbuf2, ptr, data->ioc_inllen2);
- ptr += cfs_size_round(data->ioc_inllen2);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen2, 8);
}
if (data->ioc_inlbuf3) {
memcpy(data->ioc_inlbuf3, ptr, data->ioc_inllen3);
- ptr += cfs_size_round(data->ioc_inllen3);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen3, 8);
}
if (data->ioc_inlbuf4) {
memcpy(data->ioc_inlbuf4, ptr, data->ioc_inllen4);
- ptr += cfs_size_round(data->ioc_inllen4);
+ ptr += __ALIGN_KERNEL(data->ioc_inllen4, 8);
}
return 0;
* \retval 0 on success
* \retval negative errno on failure
*/
-int llapi_dir_create_param(const char *name, mode_t mode,
- const struct llapi_stripe_param *param)
+int llapi_dir_create(const char *name, mode_t mode,
+ const struct llapi_stripe_param *param)
{
struct lmv_user_md *lmu = NULL;
size_t lmu_size = sizeof(*lmu);
data.ioc_inlbuf2 = (char *)lmu;
data.ioc_inllen2 = lmu_size;
data.ioc_type = mode;
- rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
if (rc) {
llapi_error(LLAPI_MSG_ERROR, rc,
"error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
.lsp_pool = (char *)pool_name
};
- return llapi_dir_create_param(name, mode, ¶m);
+ return llapi_dir_create(name, mode, ¶m);
}
int llapi_direntry_remove(char *dname)
path = realpath(pathname, NULL);
if (path == NULL) {
- char buf[PATH_MAX], *ptr;
+ char tmp[PATH_MAX - 1];
+ char buf[PATH_MAX];
+ char *ptr;
+ tmp[0] = '\0';
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) - 2) == NULL) {
+ char realpath[PATH_MAX - 1];
+
+ if (getcwd(realpath, sizeof(realpath) - 2) == NULL) {
rc = -errno;
llapi_error(LLAPI_MSG_ERROR, rc,
"cannot get current working directory");
return rc;
}
- rc = strlcat(buf, "/", sizeof(buf));
- if (rc >= sizeof(buf)) {
+
+ rc = snprintf(tmp, sizeof(tmp), "%s/", realpath);
+ if (rc >= sizeof(tmp)) {
rc = -E2BIG;
llapi_error(LLAPI_MSG_ERROR, rc,
"invalid parent path '%s'",
- buf);
+ tmp);
return rc;
}
}
- rc = strlcat(buf, pathname, sizeof(buf));
+
+ rc = snprintf(buf, sizeof(buf), "%s%s", tmp, pathname);
if (rc >= sizeof(buf)) {
rc = -E2BIG;
llapi_error(LLAPI_MSG_ERROR, rc,
/* name is FSNAME.POOLNAME */
if (strlen(poolname) >= sizeof(fsname))
return -EOVERFLOW;
- strlcpy(fsname, poolname, sizeof(fsname));
+
+ snprintf(fsname, sizeof(fsname), "%s", poolname);
pool = strchr(fsname, '.');
if (pool == NULL)
return -EINVAL;
lum_size = PATH_MAX + 1;
param->fp_lum_size = lum_size;
- param->fp_lmd = calloc(1, sizeof(lstat_t) + param->fp_lum_size);
+ param->fp_lmd = calloc(1, sizeof(lstat_t) + lum_size);
if (param->fp_lmd == NULL) {
llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
"error: allocation of %zu bytes for ioctl",
return ret;
}
-static int get_lmd_info(char *path, DIR *parent, DIR *dir,
- struct lov_user_mds_data *lmd, int lumlen)
+int get_lmd_info_fd(char *path, int parent_fd, int dir_fd,
+ void *lmdbuf, int lmdlen, enum get_lmd_info_type type)
{
- lstat_t *st = &lmd->lmd_st;
- int ret = 0;
+ struct lov_user_mds_data *lmd = lmdbuf;
+ lstat_t *st = &lmd->lmd_st;
+ int ret = 0;
- if (parent == NULL && dir == NULL)
- return -EINVAL;
+ if (parent_fd < 0 && dir_fd < 0)
+ return -EINVAL;
+ if (type != GET_LMD_INFO && type != GET_LMD_STRIPE)
+ return -EINVAL;
- if (dir) {
- ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, (void *)lmd);
- } else if (parent) {
+ if (dir_fd >= 0) {
+ /* LL_IOC_MDC_GETINFO operates on the current directory inode
+ * and returns struct lov_user_mds_data, while
+ * LL_IOC_LOV_GETSTRIPE returns only struct lov_user_md.
+ */
+ ret = ioctl(dir_fd, type == GET_LMD_INFO ? LL_IOC_MDC_GETINFO :
+ LL_IOC_LOV_GETSTRIPE,
+ lmdbuf);
+ } else if (parent_fd >= 0) {
char *fname = strrchr(path, '/');
- /* To avoid opening, locking, and closing each file on the
- * client if that is not needed. The GETFILEINFO ioctl can
- * be done on the patent dir with a single open for all
+ /* IOC_MDC_GETFILEINFO takes as input the filename (relative to
+ * the parent directory) and returns struct lov_user_mds_data,
+ * while IOC_MDC_GETFILESTRIPE returns only struct lov_user_md.
+ *
+ * This avoids opening, locking, and closing each file on the
+ * client if that is not needed. Multiple of these ioctl() can
+ * be done on the parent dir with a single open for all
* files in that directory, and it also doesn't pollute the
* client dcache with millions of dentries when traversing
- * a large filesystem. */
+ * a large filesystem.
+ */
fname = (fname == NULL ? path : fname + 1);
- /* retrieve needed file info */
- strlcpy((char *)lmd, fname, lumlen);
- ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
- }
- if (ret) {
- if (errno == ENOTTY) {
- /* ioctl is not supported, it is not a lustre fs.
- * Do the regular lstat(2) instead. */
- ret = lstat_f(path, st);
- if (ret) {
- ret = -errno;
- llapi_error(LLAPI_MSG_ERROR, ret,
- "error: %s: lstat failed for %s",
- __func__, path);
- }
- } else if (errno == 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 {
+ ret = snprintf(lmdbuf, lmdlen, "%s", fname);
+ if (ret < 0)
+ errno = -ret;
+ else if (ret >= lmdlen || ret++ == 0)
+ errno = EINVAL;
+ else
+ ret = ioctl(parent_fd, type == GET_LMD_INFO ?
+ IOC_MDC_GETFILEINFO :
+ IOC_MDC_GETFILESTRIPE, lmdbuf);
+ }
+
+ if (ret && type == GET_LMD_INFO) {
+ if (errno == ENOTTY) {
+ /* ioctl is not supported, it is not a lustre fs.
+ * Do the regular lstat(2) instead.
+ */
+ ret = lstat_f(path, st);
+ if (ret) {
+ ret = -errno;
+ llapi_error(LLAPI_MSG_ERROR, ret,
+ "error: %s: lstat failed for %s",
+ __func__, path);
+ }
+ } else if (errno == ENOENT) {
+ ret = -errno;
+ llapi_error(LLAPI_MSG_WARN, ret,
+ "warning: %s does not exist", path);
+ } else if (errno != EISDIR && errno != ENODATA) {
ret = -errno;
llapi_error(LLAPI_MSG_ERROR, ret,
- "error: %s: IOC_MDC_GETFILEINFO failed for %s",
- __func__, path);
+ "%s ioctl failed for %s.",
+ dir_fd >= 0 ? "LL_IOC_MDC_GETINFO" :
+ "IOC_MDC_GETFILEINFO", path);
}
}
+
return ret;
}
+static int get_lmd_info(char *path, DIR *parent, DIR *dir, void *lmdbuf,
+ int lmdlen, enum get_lmd_info_type type)
+{
+ int parent_fd = -1;
+ int dir_fd = -1;
+
+ if (parent)
+ parent_fd = dirfd(parent);
+ if (dir)
+ dir_fd = dirfd(dir);
+
+ return get_lmd_info_fd(path, parent_fd, dir_fd, lmdbuf, lmdlen, type);
+}
+
static int llapi_semantic_traverse(char *path, int size, DIR *parent,
semantic_func_t sem_init,
semantic_func_t sem_fini, void *data,
lstat_t *st = ¶m->fp_lmd->lmd_st;
rc = get_lmd_info(path, d, NULL, param->fp_lmd,
- param->fp_lum_size);
+ param->fp_lum_size, GET_LMD_INFO);
if (rc == 0)
dent->d_type = IFTODT(st->st_mode);
else if (ret == 0)
if (!buf)
return -ENOMEM;
- strlcpy(buf, path, PATH_MAX + 1);
+ snprintf(buf, PATH_MAX + 1, "%s", path);
ret = common_param_init(param, buf);
if (ret)
goto out;
if (rc)
return rc;
} else {
- strlcpy(fsname_buf, fsname, sizeof(fsname_buf));
+ snprintf(fsname_buf, sizeof(fsname_buf), "%s", fsname);
}
if (strncmp(fsname_buf, cache.fsname, sizeof(fsname_buf) - 1) != 0) {
cache.stripecount = tmp[0];
cache.stripesize = tmp[1];
cache.stripeoffset = tmp[2];
- strlcpy(cache.fsname, fsname_buf, sizeof(cache.fsname));
+ snprintf(cache.fsname, sizeof(cache.fsname), "%s", fsname_buf);
}
if (scount)
llapi_printf(LLAPI_MSG_NORMAL, "%s",
layout2name(lum->lmm_pattern));
else
- llapi_printf(LLAPI_MSG_NORMAL, "%.x", lum->lmm_pattern);
- separator = is_dir ? " " : "\n";
+ llapi_printf(LLAPI_MSG_NORMAL, "%x", lum->lmm_pattern);
+ separator = (!yaml && is_dir) ? " " : "\n";
}
if ((verbose & VERBOSE_GENERATION) && !is_dir) {
llapi_printf(LLAPI_MSG_NORMAL, "%s%slayout_gen: ",
space, prefix);
llapi_printf(LLAPI_MSG_NORMAL, "%u",
- (int)lum->lmm_layout_gen);
+ skip_objs ? 0 : (int)lum->lmm_layout_gen);
separator = "\n";
}
lum->lmm_stripe_offset ==
(typeof(lum->lmm_stripe_offset))(-1) ? -1 :
lum->lmm_stripe_offset);
+ else if (lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)
+ llapi_printf(LLAPI_MSG_NORMAL, "0");
else
llapi_printf(LLAPI_MSG_NORMAL, "%u",
objects[0].l_ost_idx);
flags);
if (!is_dir && !skip_objs && (header & VERBOSE_OBJID) &&
- !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
+ !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED ||
+ lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)) {
char *space = " - ";
if (indent)
"mirrored" : "");
else
llapi_printf(LLAPI_MSG_NORMAL,
- "%2slcm_flags: %s\n",
- " ", lcm_flags_string(comp_v1->lcm_flags));
+ "%2slcm_flags: %s\n", " ",
+ llapi_layout_flags_string(comp_v1->lcm_flags));
}
if (verbose & VERBOSE_GENERATION) {
separator = "\n";
}
+ if (verbose & VERBOSE_MIRROR_ID) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+ if (verbose & ~VERBOSE_MIRROR_ID)
+ llapi_printf(LLAPI_MSG_NORMAL,
+ "%4slcme_mirror_id: ", " ");
+ if (entry->lcme_id != LCME_ID_INVAL)
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ mirror_id_of(entry->lcme_id));
+ else
+ llapi_printf(LLAPI_MSG_NORMAL, "N/A");
+ separator = "\n";
+ }
+
if (verbose & VERBOSE_COMP_FLAGS) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
if (verbose & ~VERBOSE_COMP_FLAGS)
lov_v1v3_pool_name(struct lov_user_md *v1, char *pool_name)
{
if (v1->lmm_magic == LOV_USER_MAGIC_V3)
- strlcpy(pool_name, ((struct lov_user_md_v3 *)v1)->lmm_pool_name,
- LOV_MAXPOOLNAME);
+ snprintf(pool_name, LOV_MAXPOOLNAME, "%s",
+ ((struct lov_user_md_v3 *)v1)->lmm_pool_name);
else
pool_name[0] = '\0';
}
struct lov_user_ost_data_v1 *objects;
struct lov_user_md_v3 *lmmv3 = (void *)¶m->fp_lmd->lmd_lmm;
- strlcpy(pool_name, lmmv3->lmm_pool_name, sizeof(pool_name));
+ snprintf(pool_name, sizeof(pool_name), "%s",
+ lmmv3->lmm_pool_name);
objects = lmmv3->lmm_objects;
lov_dump_user_lmm_v1v3(¶m->fp_lmd->lmd_lmm, pool_name,
objects, path, param->fp_obd_index,
struct lmv_user_md *lum;
lum = (struct lmv_user_md *)param->fp_lmv_md;
- strlcpy(pool_name, lum->lum_pool_name, sizeof(pool_name));
+ snprintf(pool_name, sizeof(pool_name), "%s",
+ lum->lum_pool_name);
lmv_dump_user_lmm(lum, pool_name, path, param->fp_obd_index,
param->fp_max_depth, param->fp_verbose,
flags);
data.ioc_inlbuf1 = (char *)name;
data.ioc_inllen1 = strlen(name) + 1;
- rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
if (rc) {
llapi_error(LLAPI_MSG_ERROR, rc,
"error: IOC_MDC_LOOKUP pack failed for '%s': rc %d",
return ret;
}
+static int find_check_mirror_options(struct find_param *param)
+{
+ struct lov_comp_md_v1 *comp_v1;
+ struct lov_user_md_v1 *v1 = ¶m->fp_lmd->lmd_lmm;
+ int ret = 0;
+
+ if (v1->lmm_magic != LOV_USER_MAGIC_COMP_V1)
+ return -1;
+
+ comp_v1 = (struct lov_comp_md_v1 *)v1;
+
+ if (param->fp_check_mirror_count) {
+ ret = find_value_cmp(comp_v1->lcm_mirror_count + 1,
+ param->fp_mirror_count,
+ param->fp_mirror_count_sign,
+ param->fp_exclude_mirror_count, 1, 0);
+ if (ret == -1)
+ return ret;
+ }
+
+ if (param->fp_check_mirror_state) {
+ ret = 1;
+ __u16 file_state = comp_v1->lcm_flags & LCM_FL_FLR_MASK;
+
+ if ((param->fp_mirror_state != 0 &&
+ file_state != param->fp_mirror_state) ||
+ file_state == param->fp_mirror_neg_state)
+ return -1;
+ }
+
+ return ret;
+}
+
static bool find_check_lmm_info(struct find_param *param)
{
return param->fp_check_pool || param->fp_check_stripe_count ||
param->fp_check_stripe_size || param->fp_check_layout ||
param->fp_check_comp_count || param->fp_check_comp_end ||
param->fp_check_comp_start || param->fp_check_comp_flags ||
+ param->fp_check_mirror_count ||
+ param->fp_check_mirror_state ||
param->fp_check_projid;
}
if (param->fp_obd_uuid || param->fp_mdt_uuid ||
param->fp_check_uid || param->fp_check_gid ||
param->fp_atime || param->fp_mtime || param->fp_ctime ||
- param->fp_check_size || find_check_lmm_info(param) ||
+ param->fp_check_size || param->fp_check_blocks ||
+ find_check_lmm_info(param) ||
param->fp_check_mdt_count || param->fp_check_hash_type)
decision = 0;
param->fp_lmd->lmd_lmm.lmm_magic = 0;
ret = get_lmd_info(path, parent, dir, param->fp_lmd,
- param->fp_lum_size);
+ param->fp_lum_size, GET_LMD_INFO);
if (ret == 0 && param->fp_lmd->lmd_lmm.lmm_magic == 0 &&
find_check_lmm_info(param)) {
struct lov_user_md *lmm = ¶m->fp_lmd->lmd_lmm;
goto decided;
}
+ if (param->fp_check_mirror_count || param->fp_check_mirror_state) {
+ decision = find_check_mirror_options(param);
+ if (decision == -1)
+ goto decided;
+ }
+
/* Check the time on mds. */
decision = 1;
if (param->fp_atime || param->fp_mtime || param->fp_ctime) {
The regular stat is almost of the same speed as some new
'glimpse-size-ioctl'. */
- if (param->fp_check_size && S_ISREG(st->st_mode) && stripe_count)
- decision = 0;
-
- if (param->fp_check_size && S_ISDIR(st->st_mode))
+ if ((param->fp_check_size || param->fp_check_blocks) &&
+ ((S_ISREG(st->st_mode) && stripe_count) || S_ISDIR(st->st_mode)))
decision = 0;
if (!decision) {
goto decided;
}
- if (param->fp_check_size)
+ if (param->fp_check_size) {
decision = find_value_cmp(st->st_size, param->fp_size,
param->fp_size_sign,
param->fp_exclude_size,
param->fp_size_units, 0);
+ if (decision == -1)
+ goto decided;
+ }
- if (decision != -1) {
- llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
- if (param->fp_zero_end)
- llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
- else
- llapi_printf(LLAPI_MSG_NORMAL, "\n");
+ if (param->fp_check_blocks) { /* convert st_blocks to bytes */
+ decision = find_value_cmp(st->st_blocks * 512, param->fp_blocks,
+ param->fp_blocks_sign,
+ param->fp_exclude_blocks,
+ param->fp_blocks_units, 0);
+ if (decision == -1)
+ goto decided;
}
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
+ if (param->fp_zero_end)
+ llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
+ else
+ llapi_printf(LLAPI_MSG_NORMAL, "\n");
+
decided:
ret = 0;
/* Do not get down anymore? */
data.ioc_inllen1 = strlen(filename) + 1;
data.ioc_inlbuf2 = (char *)¶m->fp_mdt_index;
data.ioc_inllen2 = sizeof(param->fp_mdt_index);
- ret = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
+ ret = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
if (ret != 0) {
llapi_error(LLAPI_MSG_ERROR, ret,
"llapi_obd_statfs: error packing ioctl data");
return ret;
}
- if (d) {
- if (param->fp_get_lmv || param->fp_get_default_lmv) {
- ret = cb_get_dirstripe(path, d, param);
- } else {
- ret = ioctl(dirfd(d), LL_IOC_LOV_GETSTRIPE,
- (void *)¶m->fp_lmd->lmd_lmm);
- }
-
- } else if (parent && !param->fp_get_lmv && !param->fp_get_default_lmv) {
- char *fname = strrchr(path, '/');
- fname = (fname == NULL ? path : fname + 1);
-
- strlcpy((char *)¶m->fp_lmd->lmd_lmm, fname,
- param->fp_lum_size);
-
- ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
- (void *)¶m->fp_lmd->lmd_lmm);
- } else {
+ if (d && (param->fp_get_lmv || param->fp_get_default_lmv))
+ ret = cb_get_dirstripe(path, d, param);
+ else if (d ||
+ (parent && !param->fp_get_lmv && !param->fp_get_default_lmv))
+ ret = get_lmd_info(path, parent, d, ¶m->fp_lmd->lmd_lmm,
+ param->fp_lum_size, GET_LMD_STRIPE);
+ else
return 0;
- }
if (ret) {
if (errno == ENODATA && d != NULL) {
data.ioc_pbuf2 = (char *)uuid_buf;
data.ioc_plen2 = sizeof(struct obd_uuid);
- rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
+ rc = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
if (rc != 0) {
llapi_error(LLAPI_MSG_ERROR, rc,
"llapi_obd_statfs: error packing ioctl data");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff