* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
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;
* a large filesystem. */
fname = (fname == NULL ? path : fname + 1);
/* retrieve needed file info */
- strlcpy((char *)lmd, fname, lumlen);
+ snprintf((char *)lmd, lumlen, "%s", fname);
ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
}
while ((dent = readdir64(d)) != NULL) {
int rc;
- if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
- continue;
-
- /* Don't traverse .lustre directory */
- if (!(strcmp(dent->d_name, dot_lustre_name)))
- continue;
+ if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
+ continue;
- path[len] = 0;
- if ((len + dent->d_reclen + 2) > size) {
- llapi_err_noerrno(LLAPI_MSG_ERROR,
- "error: %s: string buffer is too small",
- __func__);
- break;
- }
- strcat(path, "/");
- strcat(path, dent->d_name);
+ path[len] = 0;
+ if ((len + dent->d_reclen + 2) > size) {
+ llapi_err_noerrno(LLAPI_MSG_ERROR,
+ "error: %s: string buffer too small",
+ __func__);
+ break;
+ }
+ strcat(path, "/");
+ strcat(path, dent->d_name);
- if (dent->d_type == DT_UNKNOWN) {
+ if (dent->d_type == DT_UNKNOWN) {
lstat_t *st = ¶m->fp_lmd->lmd_st;
rc = get_lmd_info(path, d, NULL, param->fp_lmd,
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";
}
bool indent = flags & LDF_INDENT;
bool skip_objs = flags & LDF_SKIP_OBJS;
bool yaml = flags & LDF_YAML;
- int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
+ bool obdstripe = obdindex == OBD_NOT_FOUND;
+ int i;
- if (!obdstripe) {
+ if (!obdstripe && !skip_objs) {
for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
if (obdindex == objects[i].l_ost_idx) {
- obdstripe = 1;
+ obdstripe = true;
break;
}
}
}
- if (obdstripe == 0)
+ if (!obdstripe)
return;
lov_dump_user_lmm_header(lum, path, objects, header, depth, pool_name,
{
struct lmv_user_mds_data *objects = lum->lum_objects;
char *prefix = lum->lum_magic == LMV_USER_MAGIC ? "(Default)" : "";
- int i, obdstripe = 0;
char *separator = "";
bool yaml = flags & LDF_YAML;
+ bool obdstripe = false;
+ int i;
if (obdindex != OBD_NOT_FOUND) {
if (lum->lum_stripe_count == 0) {
if (obdindex == lum->lum_stripe_offset)
- obdstripe = 1;
+ obdstripe = true;
} else {
for (i = 0; i < lum->lum_stripe_count; i++) {
if (obdindex == objects[i].lum_mds) {
llapi_printf(LLAPI_MSG_NORMAL,
"%s%s\n", prefix,
path);
- obdstripe = 1;
+ obdstripe = true;
break;
}
}
}
} else {
- obdstripe = 1;
+ obdstripe = true;
}
if (!obdstripe)
if (verbose & VERBOSE_OBJID && lum->lum_magic != LMV_USER_MAGIC) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (obdstripe == 1 && lum->lum_stripe_count > 0)
+ if (lum->lum_stripe_count > 0)
llapi_printf(LLAPI_MSG_NORMAL,
"mdtidx\t\t FID[seq:oid:ver]\n");
for (i = 0; i < lum->lum_stripe_count; i++) {
"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_md_v1 *v1;
char pool_name[LOV_MAXPOOLNAME + 1];
int obdindex = param->fp_obd_index;
- int i, j, match, obdstripe = 0;
+ int i, j, match;
+ bool obdstripe = false;
if (obdindex != OBD_NOT_FOUND) {
- for (i = 0; !(flags & LDF_IS_DIR) &&
+ for (i = 0; !(flags & LDF_IS_DIR) && !obdstripe &&
i < comp_v1->lcm_entry_count; i++) {
if (!(comp_v1->lcm_entries[i].lcme_flags &
LCME_FL_INIT))
for (j = 0; j < v1->lmm_stripe_count; j++) {
if (obdindex == objects[j].l_ost_idx) {
- obdstripe = 1;
+ obdstripe = true;
break;
}
}
}
} else {
- obdstripe = 1;
+ obdstripe = true;
}
- if (obdstripe == 0)
+ if (!obdstripe)
return;
lov_dump_comp_v1_header(param, path, flags);
entry = &comp_v1->lcm_entries[i];
if (param->fp_check_comp_flags) {
- if ((param->fp_exclude_comp_flags &&
- (param->fp_comp_flags & entry->lcme_flags)) ||
- (!param->fp_exclude_comp_flags &&
- !(param->fp_comp_flags & entry->lcme_flags)))
+ if (((param->fp_comp_flags & entry->lcme_flags) !=
+ param->fp_comp_flags) ||
+ (param->fp_comp_neg_flags & entry->lcme_flags))
continue;
}
break;
}
- if (entry->lcme_flags & LCME_FL_INIT)
- flags &= ~LDF_SKIP_OBJS;
- else
+ if (entry->lcme_flags & LCME_FL_INIT) {
+ if (obdindex != OBD_NOT_FOUND) {
+ flags |= LDF_SKIP_OBJS;
+ v1 = lov_comp_entry(comp_v1, i);
+ objects = lov_v1v3_objects(v1);
+
+ for (j = 0; j < v1->lmm_stripe_count; j++) {
+ if (obdindex == objects[j].l_ost_idx) {
+ flags &= ~LDF_SKIP_OBJS;
+ break;
+ }
+ }
+ } else {
+ flags &= ~LDF_SKIP_OBJS;
+ }
+ } else {
flags |= LDF_SKIP_OBJS;
+ }
+ if (obdindex != OBD_NOT_FOUND && (flags & LDF_SKIP_OBJS))
+ continue;
lov_dump_comp_v1_entry(param, flags, i);
v1 = lov_comp_entry(comp_v1, i);
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",
objects = lov_v1v3_objects(v1);
for (j = 0; j < v1->lmm_stripe_count; j++) {
+ if (comp_v1 && !(comp_v1->lcm_entries[i].lcme_flags &
+ LCME_FL_INIT))
+ continue;
for (k = 0; k < param->fp_num_obds; k++) {
if (param->fp_obd_indexes[k] ==
objects[j].l_ost_idx)
entry = &comp_v1->lcm_entries[i];
if (param->fp_check_comp_flags) {
- if (((entry->lcme_flags & param->fp_comp_flags) &&
- param->fp_exclude_comp_flags) ||
- (!(entry->lcme_flags & param->fp_comp_flags) &&
- !param->fp_exclude_comp_flags))
+ ret = 1;
+ if (((param->fp_comp_flags & entry->lcme_flags) !=
+ param->fp_comp_flags) ||
+ (param->fp_comp_neg_flags & entry->lcme_flags)) {
ret = -1;
- else
- ret = 1;
-
- if (ret == -1)
continue;
+ }
}
if (param->fp_check_comp_start) {
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;
}
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) {
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");
char *fname = strrchr(path, '/');
fname = (fname == NULL ? path : fname + 1);
- strlcpy((char *)¶m->fp_lmd->lmd_lmm, fname,
- param->fp_lum_size);
+ snprintf((char *)¶m->fp_lmd->lmd_lmm, param->fp_lum_size,
+ "%s", fname);
ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
(void *)¶m->fp_lmd->lmd_lmm);
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");
return rc;
}
+/**
+ * Flush cached pages from all clients.
+ *
+ * \param fd File descriptor
+ * \retval 0 success
+ * \retval < 0 error
+ */
+int llapi_file_flush(int fd)
+{
+ __u64 dv;
+
+ return llapi_get_data_version(fd, &dv, LL_DV_WR_FLUSH);
+}
+
/*
* Fetch layout version from OST objects. Layout version on OST objects are
* only set when the file is a mirrored file AND after the file has been
git://git.whamcloud.com / fs / lustre-release.git / blobdiff