* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
/**
* 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)
+int llapi_parse_size(const char *optarg, unsigned long long *size,
+ unsigned long long *size_units, int bytes_spec)
{
char *end;
static int get_mds_md_size(const char *path)
{
- int md_size = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3);
+ int md_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
char buf[80];
int rc;
llapi_err_noerrno(LLAPI_MSG_ERROR,
"error LL_IOC_LMV_SETSTRIPE '%s' : too large"
"pool name: %s", name, pool_name);
- GOTO(out, rc = -E2BIG);
+ rc = -E2BIG;
+ goto out;
}
memcpy(lmu.lum_pool_name, pool_name, strlen(pool_name));
}
llapi_error(LLAPI_MSG_ERROR, rc,
"error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
name);
- GOTO(out, rc);
+ goto out;
}
fd = open(dir, O_DIRECTORY | O_RDONLY);
if (fd < 0) {
rc = -errno;
llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name);
- GOTO(out, rc);
+ goto out;
}
if (ioctl(fd, LL_IOC_LMV_SETSTRIPE, buf)) {
rc = -errno;
llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'",
filename);
- GOTO(out, rc);
+ goto out;
}
if (ioctl(fd, LL_IOC_REMOVE_ENTRY, filename)) {
mntlen = strlen(mnt.mnt_dir);
ptr = strrchr(mnt.mnt_fsname, '/');
- if (!ptr && !len) {
- rc = -EINVAL;
- break;
- }
+ /* thanks to the call to llapi_is_lustre_mnt() above,
+ * we are sure that mnt.mnt_fsname contains ":/",
+ * so ptr should never be NULL */
+ if (ptr == NULL)
+ continue;
ptr++;
/* Check the fsname for a match, if given */
} else if (!d && !parent) {
/* ENOTDIR. Open the parent dir. */
p = opendir_parent(path);
- if (!p)
- GOTO(out, ret = -errno);
+ if (!p) {
+ ret = -errno;
+ goto out;
+ }
}
if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de)))
goto err;
- if (!d || (param->get_lmv && !param->recursive))
- GOTO(out, ret = 0);
+ if (!d || (param->get_lmv && !param->recursive)) {
+ ret = 0;
+ goto out;
+ }
while ((dent = readdir64(d)) != NULL) {
param->have_fileinfo = 0;
}
}
- if ((verbose & VERBOSE_DETAIL) && !is_dir) {
- llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_pattern: %x%c",
- lum->lmm_pattern, nl);
- }
+ if ((verbose & VERBOSE_LAYOUT) && !is_dir) {
+ if (verbose & ~VERBOSE_LAYOUT)
+ llapi_printf(LLAPI_MSG_NORMAL, "%spattern: ",
+ prefix);
+ llapi_printf(LLAPI_MSG_NORMAL, "%.x%c", lum->lmm_pattern, nl);
+ }
if ((verbose & VERBOSE_GENERATION) && !is_dir) {
if (verbose & ~VERBOSE_GENERATION)
lov_dump_user_lmm_header(lum, path, objects, is_dir, header,
depth, raw, pool_name);
- if (!is_dir && (header & VERBOSE_OBJID)) {
+ if (!is_dir && (header & VERBOSE_OBJID) &&
+ !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
if (obdstripe == 1)
llapi_printf(LLAPI_MSG_NORMAL,
"\tobdidx\t\t objid\t\t objid\t\t group\n");
/* 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 ||
- param->check_stripecount || param->check_stripesize)
- decision = 0;
+ if (param->obduuid || param->mdtuuid || param->check_uid ||
+ param->check_gid || param->check_pool || param->atime ||
+ param->ctime || param->mtime || param->check_size ||
+ param->check_stripecount || param->check_stripesize ||
+ param->check_layout)
+ decision = 0;
if (param->type && checked_type == 0)
decision = 0;
goto decided;
}
+ if (param->check_layout) {
+ __u32 found;
+
+ found = (param->lmd->lmd_lmm.lmm_pattern & param->layout);
+ if ((param->lmd->lmd_lmm.lmm_pattern == 0xFFFFFFFF) ||
+ (found && param->exclude_layout) ||
+ (!found && !param->exclude_layout)) {
+ decision = -1;
+ goto decided;
+ }
+ }
+
/* If an OBD UUID is specified but none matches, skip this file. */
if ((param->obduuid && param->obdindex == OBD_NOT_FOUND) ||
(param->mdtuuid && param->mdtindex == OBD_NOT_FOUND))
* 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;
+ lmm->lmm_magic = LOV_USER_MAGIC_V1;
if (!param->raw)
ostid_set_seq(&lmm->lmm_oi,
FID_SEQ_LOV_DEFAULT);
close(fd);
if (rc < 0) {
rc = -errno;
- llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d\n", fd);
+ llapi_error(LLAPI_MSG_ERROR, rc,
+ "ioctl RMTACL on '%s' err %d\n",
+ mnt->mnt_dir, rc);
goto out;
}
return -errno;
}
if (idx == -1)
- sprintf(filename, LUSTRE_VOLATILE_HDR"::%.4X", random);
+ snprintf(filename, sizeof(filename),
+ LUSTRE_VOLATILE_HDR"::%.4X", random);
else
- sprintf(filename, LUSTRE_VOLATILE_IDX"%.4X", 0, random);
+ snprintf(filename, sizeof(filename),
+ LUSTRE_VOLATILE_IDX"%.4X", 0, random);
- sprintf(file_path, "%s/%s", directory, filename);
+ rc = snprintf(file_path, sizeof(file_path),
+ "%s/%s", directory, filename);
+ if (rc >= sizeof(file_path))
+ return -E2BIG;
- fd = open(file_path, O_RDWR|O_CREAT|mode, S_IRUSR|S_IWUSR);
+ fd = open(file_path, (O_RDWR | O_CREAT | mode), (S_IRUSR | S_IWUSR));
if (fd < 0) {
llapi_error(LLAPI_MSG_ERROR, errno,
"Cannot create volatile file %s in %s\n",
{
int fd1, fd2, rc;
- fd1 = open(path1, O_WRONLY);
+ fd1 = open(path1, O_WRONLY | O_LOV_DELAY_CREATE);
if (fd1 < 0) {
llapi_error(LLAPI_MSG_ERROR, -errno,
"error: cannot open for write %s",
return -errno;
}
- fd2 = open(path2, O_WRONLY);
+ fd2 = open(path2, O_WRONLY | O_LOV_DELAY_CREATE);
if (fd2 < 0) {
llapi_error(LLAPI_MSG_ERROR, -errno,
"error: cannot open for write %s",