* 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/
llapi_msg_level = level;
}
-/* llapi_error will preserve errno */
-void llapi_error(int level, int _rc, char *fmt, ...)
+static void error_callback_default(enum llapi_message_level level, int err,
+ const char *fmt, va_list ap)
{
- va_list args;
- int tmp_errno = errno;
- /* to protect using errno as _rc argument */
- int rc = abs(_rc);
+ vfprintf(stderr, fmt, ap);
+ if (level & LLAPI_MSG_NO_ERRNO)
+ fprintf(stderr, "\n");
+ else
+ fprintf(stderr, ": %s (%d)\n", strerror(err), err);
+}
- if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
- return;
+static void info_callback_default(enum llapi_message_level level, int err,
+ const char *fmt, va_list ap)
+{
+ vfprintf(stdout, fmt, ap);
+}
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- va_end(args);
+static llapi_log_callback_t llapi_error_callback = error_callback_default;
+static llapi_log_callback_t llapi_info_callback = info_callback_default;
- if (level & LLAPI_MSG_NO_ERRNO)
- fprintf(stderr, "\n");
- else
- fprintf(stderr, ": %s (%d)\n", strerror(rc), rc);
- errno = tmp_errno;
+
+/* llapi_error will preserve errno */
+void llapi_error(enum llapi_message_level level, int err, const char *fmt, ...)
+{
+ va_list args;
+ int tmp_errno = errno;
+
+ if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
+ return;
+
+ va_start(args, fmt);
+ llapi_error_callback(level, abs(err), fmt, args);
+ va_end(args);
+ errno = tmp_errno;
}
/* llapi_printf will preserve errno */
-void llapi_printf(int level, char *fmt, ...)
+void llapi_printf(enum llapi_message_level level, const char *fmt, ...)
+{
+ va_list args;
+ int tmp_errno = errno;
+
+ if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
+ return;
+
+ va_start(args, fmt);
+ llapi_info_callback(level, 0, fmt, args);
+ va_end(args);
+ errno = tmp_errno;
+}
+
+/**
+ * Set a custom error logging function. Passing in NULL will reset the logging
+ * callback to its default value.
+ *
+ * This function returns the value of the old callback.
+ */
+llapi_log_callback_t llapi_error_callback_set(llapi_log_callback_t cb)
+{
+ llapi_log_callback_t old = llapi_error_callback;
+
+ if (cb != NULL)
+ llapi_error_callback = cb;
+ else
+ llapi_error_callback = error_callback_default;
+
+ return old;
+}
+
+/**
+ * Set a custom info logging function. Passing in NULL will reset the logging
+ * callback to its default value.
+ *
+ * This function returns the value of the old callback.
+ */
+llapi_log_callback_t llapi_info_callback_set(llapi_log_callback_t cb)
{
- va_list args;
- int tmp_errno = errno;
+ llapi_log_callback_t old = llapi_info_callback;
- if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
- return;
+ if (cb != NULL)
+ llapi_info_callback = cb;
+ else
+ llapi_info_callback = info_callback_default;
- va_start(args, fmt);
- vfprintf(stdout, fmt, args);
- va_end(args);
- errno = tmp_errno;
+ return old;
}
/**
* 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;
"larger than expected (%u)", page_size,
LOV_MIN_STRIPE_SIZE);
}
- if (stripe_size < 0 || (stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) {
+ if ((stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) {
rc = -EINVAL;
- llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe_size %lu, "
+ llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe_size %llu, "
"must be an even multiple of %d bytes",
stripe_size, page_size);
return rc;
return rc;
}
} else if (fsname) {
- strcpy(fs, fsname);
+ if (strlen(fsname) > sizeof(fs)-1) {
+ if (fp != NULL)
+ fclose(fp);
+ return -E2BIG;
+ }
+ strncpy(fs, fsname, sizeof(fs));
}
if (fp == NULL) {
tmp += strlen(obd_type) + 1;
if (strcmp(tmp, fs))
continue;
- strcpy(dev, tmp);
+ if (strlen(tmp) > sizeof(dev)-1) {
+ fclose(fp);
+ return -E2BIG;
+ }
+ strncpy(dev, tmp, sizeof(dev));
tmp = strchr(dev, ' ');
- *tmp = '\0';
+ if (tmp != NULL)
+ *tmp = '\0';
break;
}
}
return get_param(devices, value, val_len);
}
-static int get_mds_md_size(char *path)
+/*
+ * TYPE one of llite, lmv, lov.
+ * /proc/fs/lustre/TYPE/INST the directory of interest.
+ */
+static int get_param_cli(const char *type, const char *inst,
+ const char *param, char *buf, size_t buf_size)
{
- int lumlen = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3);
- char buf[16];
+ char param_path[PATH_MAX + 1];
+ FILE *param_file = NULL;
+ int rc;
+
+ snprintf(param_path, sizeof(param_path),
+ "/proc/fs/lustre/%s/%s/%s", type, inst, param);
+
+ param_file = fopen(param_path, "r");
+ if (param_file == NULL) {
+ rc = -errno;
+ goto out;
+ }
+
+ if (fgets(buf, buf_size, param_file) == NULL) {
+ rc = -errno;
+ goto out;
+ }
+
+ rc = 0;
+out:
+ if (param_file != NULL)
+ fclose(param_file);
+
+ return rc;
+}
+
+static int get_param_llite(const char *path,
+ const char *param, char *buf, size_t buf_size)
+{
+ char inst[80];
+ int rc;
+
+ rc = llapi_getname(path, inst, sizeof(inst));
+ if (rc != 0)
+ return rc;
+
+ return get_param_cli("llite", inst, param, buf, buf_size);
+}
+
+static int get_param_lov(const char *path,
+ const char *param, char *buf, size_t buf_size)
+{
+ struct obd_uuid uuid;
+ int rc;
+
+ rc = llapi_file_get_lov_uuid(path, &uuid);
+ if (rc != 0)
+ return rc;
+
+ return get_param_cli("lov", uuid.uuid, param, buf, buf_size);
+}
+
+static int get_param_lmv(const char *path,
+ const char *param, char *buf, size_t buf_size)
+{
+ struct obd_uuid uuid;
+ int rc;
+
+ rc = llapi_file_get_lmv_uuid(path, &uuid);
+ if (rc != 0)
+ return rc;
- /* Now get the maxea from llite proc */
- if (!get_param_obdvar(NULL, path, "llite", "max_easize",
- buf, sizeof(buf)))
- lumlen = atoi(buf);
- return lumlen;
+ return get_param_cli("lmv", uuid.uuid, param, buf, buf_size);
+}
+
+static int get_mds_md_size(const char *path)
+{
+ int md_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
+ char buf[80];
+ int rc;
+
+ /* Get the max ea size from llite proc. */
+ rc = get_param_llite(path, "max_easize", buf, sizeof(buf));
+ if (rc != 0)
+ goto out;
+
+ rc = atoi(buf);
+ if (rc > 0)
+ md_size = rc;
+
+out:
+ return md_size;
}
/*
if (ostname != NULL)
len = strlen(ostname);
- if (poolname == NULL)
- rc = find_target_obdpath(fsname, buffer);
- else
+ if (poolname == NULL) {
+ if (len == 0)
+ rc = -EINVAL;
+ else
+ rc = find_target_obdpath(fsname, buffer);
+ } else {
rc = find_poolpath(fsname, poolname, buffer);
+ }
if (rc)
return 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 */
" a Lustre filesystem", name);
return rc;
}
- strcpy(fsname, rname);
+ if (strlen(rname) > sizeof(fsname)-1)
+ return -E2BIG;
+ strncpy(fsname, rname, sizeof(fsname));
} else {
/* name is FSNAME */
- strcpy(fsname, name);
+ if (strlen(name) > sizeof(fsname)-1)
+ return -E2BIG;
+ strncpy(fsname, name, sizeof(fsname));
rc = poolpath(fsname, NULL, pathname);
}
if (rc != 0) {
}
typedef int (semantic_func_t)(char *path, DIR *parent, DIR *d,
- void *data, cfs_dirent_t *de);
+ void *data, struct dirent64 *de);
#define OBD_NOT_FOUND (-1)
static int common_param_init(struct find_param *param, char *path)
{
- param->lumlen = get_mds_md_size(path);
+ int lumlen = get_mds_md_size(path);
+
+ if (lumlen < PATH_MAX + 1)
+ lumlen = PATH_MAX + 1;
+
+ param->lumlen = lumlen;
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",
+ "error: allocation of %zu bytes for ioctl",
sizeof(lstat_t) + param->lumlen);
return -ENOMEM;
}
}
static int cb_common_fini(char *path, DIR *parent, DIR *d, void *data,
- cfs_dirent_t *de)
+ struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
param->depth--;
/* retrieve needed file info */
strncpy((char *)lmd, fname, lumlen);
ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
- } else {
- return ret;
}
if (ret) {
return ret;
}
-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,
semantic_func_t sem_init,
semantic_func_t sem_fini, void *data,
- cfs_dirent_t *de)
+ struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
- cfs_dirent_t *dent;
+ struct dirent64 *dent;
int len, ret;
DIR *d, *p = NULL;
} 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 (dent->d_type == DT_UNKNOWN) {
lstat_t *st = ¶m->lmd->lmd_st;
- ret = llapi_mds_getfileinfo(path, d, param->lmd);
+ ret = get_lmd_info(path, d, NULL, param->lmd,
+ param->lumlen);
if (ret == 0) {
dent->d_type =
llapi_filetype_dir_table[st->st_mode &
return rc;
}
+int llapi_file_get_lmv_uuid(const char *path, struct obd_uuid *lov_uuid)
+{
+ int fd, rc;
+
+ fd = open(path, O_RDONLY);
+ if (fd < 0) {
+ rc = -errno;
+ llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
+ return rc;
+ }
+
+ rc = llapi_file_fget_lmv_uuid(fd, lov_uuid);
+
+ close(fd);
+ return rc;
+}
+
enum tgt_type {
LOV_TYPE = 1,
LMV_TYPE
int num_obds, int **obdindexes, int *obdindex,
enum tgt_type type)
{
- int ret, obdcount, obd_valid = 0, obdnum, i;
+ int ret, obdcount, obd_valid = 0, obdnum;
+ long i;
struct obd_uuid *uuids = NULL;
char buf[16];
int *indexes;
- ret = get_param_obdvar(NULL, path, type == LOV_TYPE ? "lov" : "lmv",
- "numobd", buf, sizeof(buf));
- if (ret)
- return ret;
+ if (type == LOV_TYPE)
+ ret = get_param_lov(path, "numobd", buf, sizeof(buf));
+ else
+ ret = get_param_lmv(path, "numobd", buf, sizeof(buf));
+ if (ret != 0)
+ return ret;
obdcount = atoi(buf);
uuids = (struct obd_uuid *)malloc(obdcount *
int raw, char *pool_name)
{
char *prefix = is_dir ? "" : "lmm_";
- char nl = is_dir ? ' ' : '\n';
+ char *seperator = "";
int rc;
- 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) ");
- }
+ if (is_dir && lmm_oi_seq(&lum->lmm_oi) == FID_SEQ_LOV_DEFAULT) {
+ lmm_oi_set_seq(&lum->lmm_oi, 0);
+ if (verbose & VERBOSE_DETAIL)
+ llapi_printf(LLAPI_MSG_NORMAL, "(Default) ");
+ }
if (depth && path && ((verbose != VERBOSE_OBJID) || !is_dir))
llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
- if ((verbose & VERBOSE_DETAIL) && !is_dir) {
- llapi_printf(LLAPI_MSG_NORMAL, "lmm_magic: 0x%08X\n",
- lum->lmm_magic);
- llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq: "LPX64"\n",
- lum->lmm_object_seq);
- llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id: "LPX64"\n",
- lum->lmm_object_id);
- }
+ if ((verbose & VERBOSE_DETAIL) && !is_dir) {
+ llapi_printf(LLAPI_MSG_NORMAL, "lmm_magic: 0x%08X\n",
+ lum->lmm_magic);
+ llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq: "LPX64"\n",
+ lmm_oi_seq(&lum->lmm_oi));
+ llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id: "LPX64"\n",
+ lmm_oi_id(&lum->lmm_oi));
+ }
if (verbose & VERBOSE_COUNT) {
if (verbose & ~VERBOSE_COUNT)
&scount, NULL,
NULL);
if (rc == 0)
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
- scount, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
+ scount);
else
llapi_error(LLAPI_MSG_ERROR, rc,
"Cannot determine default"
" stripe count.");
} else {
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
lum->lmm_stripe_count ==
(typeof(lum->lmm_stripe_count))(-1)
- ? -1 : lum->lmm_stripe_count, nl);
+ ? -1 : lum->lmm_stripe_count);
}
} else {
- llapi_printf(LLAPI_MSG_NORMAL, "%hd%c",
- (__s16)lum->lmm_stripe_count, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%hd",
+ (__s16)lum->lmm_stripe_count);
}
+ seperator = is_dir ? " " : "\n";
}
if (verbose & VERBOSE_SIZE) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_SIZE)
llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size: ",
prefix);
rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize,
NULL);
if (rc == 0)
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c", ssize,
- nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u", ssize);
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);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ lum->lmm_stripe_size);
}
+ seperator = is_dir ? " " : "\n";
}
- 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) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
+ if (verbose & ~VERBOSE_LAYOUT)
+ llapi_printf(LLAPI_MSG_NORMAL, "%spattern: ",
+ prefix);
+ llapi_printf(LLAPI_MSG_NORMAL, "%.x", lum->lmm_pattern);
+ seperator = "\n";
+ }
if ((verbose & VERBOSE_GENERATION) && !is_dir) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_GENERATION)
llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ",
prefix);
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
- (int)lum->lmm_layout_gen, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ (int)lum->lmm_layout_gen);
+ seperator = "\n";
}
if (verbose & VERBOSE_OFFSET) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ",
prefix);
if (is_dir)
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
lum->lmm_stripe_offset ==
(typeof(lum->lmm_stripe_offset))(-1) ? -1 :
- lum->lmm_stripe_offset, nl);
+ lum->lmm_stripe_offset);
else
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
- objects[0].l_ost_idx, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ objects[0].l_ost_idx);
+ seperator = is_dir ? " " : "\n";
}
if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_POOL)
llapi_printf(LLAPI_MSG_NORMAL, "%spool: ",
prefix);
- llapi_printf(LLAPI_MSG_NORMAL, "%s%c", pool_name, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", pool_name);
}
- if (is_dir && (verbose != VERBOSE_OBJID))
+ if (!is_dir || (is_dir && (verbose != VERBOSE_OBJID)))
llapi_printf(LLAPI_MSG_NORMAL, "\n");
}
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");
for (i = 0; i < lum->lmm_stripe_count; i++) {
int idx = objects[i].l_ost_idx;
- long long oid = objects[i].l_object_id;
- long long gr = objects[i].l_object_seq;
+ long long oid = ostid_id(&objects[i].l_ost_oi);
+ long long gr = ostid_seq(&objects[i].l_ost_oi);
if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx)) {
char fmt[48];
sprintf(fmt, "%s%s%s\n",
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;
- }
+ for (i = 0; i < param->num_mdts; i++) {
+ if (param->mdtindexes[i] == param->file_mdtindex)
+ return !param->exclude_mdt;
+ }
if (param->exclude_mdt)
return 1;
}
static int cb_find_init(char *path, DIR *parent, DIR *dir,
- void *data, cfs_dirent_t *de)
+ void *data, struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
int decision = 1; /* 1 is accepted; -1 is rejected. */
/* 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))
}
static int cb_get_mdt_index(char *path, DIR *parent, DIR *d, void *data,
- cfs_dirent_t *de)
+ struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
int ret = 0;
}
static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
- cfs_dirent_t *de)
+ struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
int ret = 0;
if (ret) {
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;
-
+ /* 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_USER_MAGIC_V1;
+ if (!param->raw)
+ ostid_set_seq(&lmm->lmm_oi,
+ 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 && !param->mdtuuid)
llapi_printf(LLAPI_MSG_NORMAL,
}
static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data,
- cfs_dirent_t *de)
+ struct dirent64 *de)
{
struct find_param *param = (struct find_param *)data;
lstat_t *st;
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;
}
{
char fsname[20];
char *ptr;
- int fd, index, rc;
+ int fd, rc;
+ long index;
/* Take path, fsname, or MDTname. Assume MDT0000 in the former cases.
Open root and parse mdt index. */
startrec, flags);
/* Only the kernel reference keeps the write side open */
close(cp->kuc.lk_wfd);
- cp->kuc.lk_wfd = 0;
+ cp->kuc.lk_wfd = LK_NOFD;
if (rc < 0) {
/* frees and clears priv */
llapi_changelog_fini(priv);
*/
int llapi_changelog_recv(void *priv, struct changelog_ext_rec **rech)
{
- struct changelog_private *cp = (struct changelog_private *)priv;
- struct kuc_hdr *kuch;
- int rc = 0;
+ struct changelog_private *cp = (struct changelog_private *)priv;
+ struct kuc_hdr *kuch;
+ int rc = 0;
- if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
- return -EINVAL;
- if (rech == NULL)
- return -EINVAL;
- kuch = malloc(CR_MAXSIZE + sizeof(*kuch));
- if (kuch == NULL)
- return -ENOMEM;
+ if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
+ return -EINVAL;
+ if (rech == NULL)
+ return -EINVAL;
+ kuch = malloc(KUC_CHANGELOG_MSG_MAXSIZE);
+ if (kuch == NULL)
+ return -ENOMEM;
repeat:
- rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch,
- CR_MAXSIZE + sizeof(*kuch),
- KUC_TRANSPORT_CHANGELOG);
- if (rc < 0)
- goto out_free;
+ rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch,
+ KUC_CHANGELOG_MSG_MAXSIZE,
+ KUC_TRANSPORT_CHANGELOG);
+ if (rc < 0)
+ goto out_free;
if ((kuch->kuc_transport != KUC_TRANSPORT_CHANGELOG) ||
((kuch->kuc_msgtype != CL_RECORD) &&
int llapi_changelog_clear(const char *mdtname, const char *idstr,
long long endrec)
{
- int id;
+ long id;
if (endrec < 0) {
llapi_err_noerrno(LLAPI_MSG_ERROR,
* this value to verify if file data was modified. This only checks the file
* data, not metadata.
*
- * \param flags If set to LL_DV_NOFLUSH, the data version will be read
- * directly from OST without regard to possible dirty cache on
- * client nodes.
+ * \param flags 0: no flush pages, usually used it the process has already
+ * taken locks;
+ * LL_DV_RD_FLUSH: OSTs will take LCK_PR to flush dirty pages
+ * from clients;
+ * LL_DV_WR_FLUSH: OSTs will take LCK_PW to flush all caching
+ * pages from clients.
*
* \retval 0 on success.
* \retval -errno on error.
close(fd);
if (rc < sizeof(random)) {
llapi_error(LLAPI_MSG_ERROR, errno,
- "Cannot read %d bytes from /dev/urandom\n",
+ "cannot read %zu bytes from /dev/urandom",
sizeof(random));
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",
* first fd received the ioctl, second fd is passed as arg
* this is assymetric but avoid use of root path for ioctl
*/
-int llapi_fswap_layouts(int fd1, int fd2)
+int llapi_fswap_layouts(int fd1, int fd2, __u64 dv1, __u64 dv2, __u64 flags)
{
struct lustre_swap_layouts lsl;
int rc;
srandom(time(NULL));
lsl.sl_fd = fd2;
- lsl.sl_flags = 0;
+ lsl.sl_flags = flags;
lsl.sl_gid = random();
+ lsl.sl_dv1 = dv1;
+ lsl.sl_dv2 = dv2;
rc = ioctl(fd1, LL_IOC_LOV_SWAP_LAYOUTS, &lsl);
if (rc)
rc = -errno;
* Swap the layouts between 2 files
* the 2 files are open in write
*/
-int llapi_swap_layouts(const char *path1, const char *path2)
+int llapi_swap_layouts(const char *path1, const char *path2,
+ __u64 dv1, __u64 dv2, __u64 flags)
{
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",
return -errno;
}
- rc = llapi_fswap_layouts(fd1, fd2);
+ rc = llapi_fswap_layouts(fd1, fd2, dv1, dv2, flags);
if (rc < 0)
llapi_error(LLAPI_MSG_ERROR, rc,
"error: cannot swap layouts between %s and %s\n",
git://git.whamcloud.com / fs / lustre-release.git / blobdiff