#include <unistd.h>
#endif
#include <poll.h>
+#include <time.h>
#include <libcfs/util/ioctl.h>
#include <libcfs/util/param.h>
data->ioc_version = OBD_IOCTL_VERSION;
if (*pbuf != NULL && data->ioc_len > max_len) {
- fprintf(stderr, "pbuf = %p, ioc_len = %u, max_len = %d\n",
- *pbuf, data->ioc_len, max_len);
+ llapi_error(LLAPI_MSG_ERROR, -EINVAL,
+ "pbuf = %p, ioc_len = %u, max_len = %d\n",
+ *pbuf, data->ioc_len, max_len);
return -EINVAL;
}
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;
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;
rc = llapi_getname(path, inst, sizeof(inst));
if (rc != 0)
- return md_size;
+ return rc;
/* Get the max ea size from llite parameters. */
rc = get_lustre_param_value("llite", inst, FILTER_BY_EXACT,
"max_easize", buf, sizeof(buf));
if (rc != 0)
- return md_size;
+ return rc;
rc = atoi(buf);
errmsg = strerror(errno);
llapi_err_noerrno(LLAPI_MSG_ERROR,
- "error on ioctl %#jx for '%s' (%d): %s",
- (uintmax_t)LL_IOC_LOV_SETSTRIPE, name, fd,
- errmsg);
+ "setstripe error for '%s': %s", name, errmsg);
close(fd);
fd = rc;
errmsg = strerror(errno);
llapi_err_noerrno(LLAPI_MSG_ERROR,
- "error on LL_IOC_LMV_SETSTRIPE '%s' (%d): %s",
- name, fd, errmsg);
+ "default dirstripe error on '%s': %s",
+ name, errmsg);
}
close(fd);
return rc;
* \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);
+ size_t lmu_size;
struct obd_ioctl_data data = { 0 };
char rawbuf[8192];
char *buf = rawbuf;
if (rc)
return rc;
- if (param->lsp_is_specific)
- lmu_size = lmv_user_md_size(param->lsp_stripe_count,
- LMV_USER_MAGIC_SPECIFIC);
+ lmu_size = lmv_user_md_size(param->lsp_stripe_count,
+ param->lsp_is_specific ?
+ LMV_USER_MAGIC_SPECIFIC :
+ LMV_USER_MAGIC);
lmu = calloc(1, lmu_size);
if (lmu == NULL)
namepath = strdup(name);
if (!namepath) {
- free(namepath);
+ free(dirpath);
free(lmu);
return -ENOMEM;
}
if (ioctl(fd, LL_IOC_LMV_SETSTRIPE, buf)) {
char *errmsg = "stripe already set";
+
rc = -errno;
if (errno != EEXIST && errno != EALREADY)
errmsg = strerror(errno);
llapi_err_noerrno(LLAPI_MSG_ERROR,
- "error on LL_IOC_LMV_SETSTRIPE '%s' (%d): %s",
- name, fd, errmsg);
+ "dirstripe error on '%s': %s", name, errmsg);
}
close(fd);
out:
.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,
int llapi_getname(const char *path, char *buf, size_t size)
{
- struct obd_uuid uuid_buf;
- char *uuid = uuid_buf.uuid;
- int rc, nr;
+ struct obd_uuid uuid_buf;
+ char *uuid = uuid_buf.uuid;
+ char *cfg_instance;
+ int rc, len, fsname_len;
- memset(&uuid_buf, 0, sizeof(uuid_buf));
- rc = llapi_file_get_lov_uuid(path, &uuid_buf);
- if (rc)
- return rc;
+ memset(&uuid_buf, 0, sizeof(uuid_buf));
+ rc = llapi_file_get_lov_uuid(path, &uuid_buf);
+ if (rc)
+ return rc;
- /* We want to turn lustre-clilov-ffff88002738bc00 into
- * lustre-ffff88002738bc00. */
+ /*
+ * We want to turn testfs-clilov-ffff88002738bc00 into
+ * testfs-ffff88002738bc00 in a portable way that doesn't depend
+ * on what is after "-clilov-" as it may change in the future.
+ * Unfortunately, the "fsname" part may contain a dash, so we
+ * can't just skip to the first dash, and the "instance" may be a
+ * UUID in the future, so we can't necessarily go to the last dash.
+ */
+ cfg_instance = strstr(uuid, "-clilov-");
+ if (!cfg_instance)
+ return -EINVAL;
- nr = snprintf(buf, size, "%.*s-%s",
- (int) (strlen(uuid) - 24), uuid,
- uuid + strlen(uuid) - 16);
+ fsname_len = cfg_instance - uuid;
+ cfg_instance += strlen("-clilov-");
+ len = snprintf(buf, size, "%.*s-%s", fsname_len, uuid, cfg_instance);
- if (nr >= size)
- rc = -ENAMETOOLONG;
+ if (len >= size)
+ rc = -ENAMETOOLONG;
- return rc;
+ return 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;
goto free_path;
}
- llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname);
dir = opendir(pathname.gl_pathv[0]);
if (dir == NULL) {
rc = -errno;
/* check output bounds */
if (nb_entries >= list_size) {
rc = -EOVERFLOW;
- goto free_dir;
+ goto free_dir_no_msg;
}
/* +2 for '.' and final '\0' */
if (used + strlen(pool->d_name) + strlen(fsname) + 2
> buffer_size) {
rc = -EOVERFLOW;
- goto free_dir;
+ goto free_dir_no_msg;
}
sprintf(buffer + used, "%s.%s", fsname, pool->d_name);
if (rc)
llapi_error(LLAPI_MSG_ERROR, rc,
"Error reading pool list for '%s'", name);
+ else
+ llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname);
+
+free_dir_no_msg:
closedir(dir);
free_path:
cfs_free_param_data(&pathname);
{
int lum_size = get_mds_md_size(path);
+ if (lum_size < 0)
+ return lum_size;
+
+ /* migrate has fp_lmv_md initialized outside */
+ if (param->fp_migrate)
+ return 0;
+
if (lum_size < PATH_MAX + 1)
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",
param->fp_lmv_stripe_count = 256;
param->fp_lmv_md = calloc(1,
lmv_user_md_size(param->fp_lmv_stripe_count,
- LMV_MAGIC_V1));
+ LMV_USER_MAGIC_SPECIFIC));
if (param->fp_lmv_md == NULL) {
llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
"error: allocation of %d bytes for ioctl",
lmv_user_md_size(param->fp_lmv_stripe_count,
- LMV_MAGIC_V1));
+ LMV_USER_MAGIC_SPECIFIC));
return -ENOMEM;
}
param->fp_got_uuids = 0;
param->fp_obd_indexes = NULL;
param->fp_obd_index = OBD_NOT_FOUND;
- if (!param->fp_migrate)
- param->fp_mdt_index = OBD_NOT_FOUND;
+ param->fp_mdt_index = OBD_NOT_FOUND;
return 0;
}
static void find_param_fini(struct find_param *param)
{
+ if (param->fp_migrate)
+ return;
+
if (param->fp_obd_indexes)
free(param->fp_obd_indexes);
free(param->fp_lmv_md);
param->fp_lmv_stripe_count = stripe_count;
- lmv_size = lmv_user_md_size(stripe_count, LMV_MAGIC_V1);
+ lmv_size = lmv_user_md_size(stripe_count,
+ LMV_USER_MAGIC_SPECIFIC);
param->fp_lmv_md = malloc(lmv_size);
if (param->fp_lmv_md == NULL) {
llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
"error: allocation of %d bytes for ioctl",
lmv_user_md_size(param->fp_lmv_stripe_count,
- LMV_MAGIC_V1));
+ LMV_USER_MAGIC_SPECIFIC));
return -ENOMEM;
}
goto again;
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)
rc = 0;
if (sem_init) {
rc = sem_init(path, d, NULL, data, dent);
- if (rc < 0 && ret == 0)
+ if (rc < 0 && ret == 0) {
ret = rc;
+ break;
+ }
}
if (sem_fini && rc == 0)
sem_fini(path, d, NULL, data, dent);
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;
int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_name)
{
- int rc = ioctl(fd, OBD_IOC_GETNAME, lov_name);
- if (rc) {
- rc = -errno;
- llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lov name.");
- }
- return rc;
+ int rc = ioctl(fd, OBD_IOC_GETNAME, lov_name);
+
+ if (rc) {
+ rc = -errno;
+ llapi_error(LLAPI_MSG_ERROR, rc, "cannot get lov name");
+ }
+ return rc;
}
int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name)
fd = open(path, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
rc = -errno;
- llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
+ llapi_error(LLAPI_MSG_ERROR, rc, "cannot open '%s'", path);
return rc;
}
ret = -ENOMEM;
}
- llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed");
- goto out_free;
- }
+ llapi_error(LLAPI_MSG_ERROR, ret, "cannot get ost uuid");
+ goto out_free;
+ }
indexes = malloc(num_obds * sizeof(*obdindex));
if (indexes == NULL) {
}
}
}
- if (i >= obdcount) {
- indexes[obdnum] = OBD_NOT_FOUND;
- llapi_err_noerrno(LLAPI_MSG_ERROR,
- "error: %s: unknown obduuid: %s",
- __func__, obduuids[obdnum].uuid);
- ret = -EINVAL;
- }
- }
+ if (i >= obdcount) {
+ indexes[obdnum] = OBD_NOT_FOUND;
+ llapi_err_noerrno(LLAPI_MSG_ERROR,
+ "invalid obduuid '%s'",
+ obduuids[obdnum].uuid);
+ ret = -EINVAL;
+ }
+ }
if (obd_valid == 0)
*obdindex = OBD_NOT_FOUND;
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)
static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
struct lov_user_ost_data_v1 *objects,
- int verbose, int depth, char *pool_name,
+ enum llapi_layout_verbose verbose,
+ int depth, char *pool_name,
enum lov_dump_flags flags)
{
bool is_dir = flags & LDF_IS_DIR;
seq, oid, ver);
}
- if (verbose & VERBOSE_COUNT) {
- if (verbose & ~VERBOSE_COUNT)
+ if (verbose & VERBOSE_STRIPE_COUNT) {
+ if (verbose & ~VERBOSE_STRIPE_COUNT)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_count: ",
space, prefix);
if (is_dir) {
separator = "\n";
}
- if (verbose & VERBOSE_SIZE) {
+ if (verbose & VERBOSE_STRIPE_SIZE) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_SIZE)
+ if (verbose & ~VERBOSE_STRIPE_SIZE)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_size: ",
space, prefix);
if (is_dir && !is_raw && lum->lmm_stripe_size == 0) {
separator = "\n";
}
- if ((verbose & VERBOSE_LAYOUT)) {
+ if ((verbose & VERBOSE_PATTERN)) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_LAYOUT)
+ if (verbose & ~VERBOSE_PATTERN)
llapi_printf(LLAPI_MSG_NORMAL, "%s%spattern: ",
space, prefix);
if (lov_pattern_supported(lum->lmm_pattern))
layout2name(lum->lmm_pattern));
else
llapi_printf(LLAPI_MSG_NORMAL, "%x", lum->lmm_pattern);
- separator = is_dir ? " " : "\n";
+ 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";
}
- if (verbose & VERBOSE_OFFSET) {
+ if (verbose & VERBOSE_STRIPE_OFFSET) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_OFFSET)
+ if (verbose & ~VERBOSE_STRIPE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_offset: ",
space, prefix);
if (is_dir || skip_objs)
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);
void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
struct lov_user_ost_data_v1 *objects,
char *path, int obdindex, int depth,
- int header, enum lov_dump_flags flags)
+ enum llapi_layout_verbose verbose,
+ enum lov_dump_flags flags)
{
bool is_dir = flags & LDF_IS_DIR;
bool indent = flags & LDF_INDENT;
if (!obdstripe)
return;
- lov_dump_user_lmm_header(lum, path, objects, header, depth, pool_name,
+ lov_dump_user_lmm_header(lum, path, objects, verbose, depth, pool_name,
flags);
- if (!is_dir && !skip_objs && (header & VERBOSE_OBJID) &&
- !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
+ if (!is_dir && !skip_objs && (verbose & VERBOSE_OBJID) &&
+ !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED ||
+ lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)) {
char *space = " - ";
if (indent)
}
void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
- char *path, int obdindex, int depth, int verbose,
+ char *path, int obdindex, int depth,
+ enum llapi_layout_verbose verbose,
enum lov_dump_flags flags)
{
struct lmv_user_mds_data *objects = lum->lum_objects;
/* show all information default */
if (!verbose) {
if (lum->lum_magic == LMV_USER_MAGIC)
- verbose = VERBOSE_POOL | VERBOSE_COUNT |
- VERBOSE_OFFSET | VERBOSE_HASH_TYPE;
+ verbose = VERBOSE_POOL | VERBOSE_STRIPE_COUNT |
+ VERBOSE_STRIPE_OFFSET | VERBOSE_HASH_TYPE;
else
verbose = VERBOSE_OBJID;
}
if (depth && path && ((verbose != VERBOSE_OBJID)))
llapi_printf(LLAPI_MSG_NORMAL, "%s%s\n", prefix, path);
- if (verbose & VERBOSE_COUNT) {
+ if (verbose & VERBOSE_STRIPE_COUNT) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_COUNT)
+ if (verbose & ~VERBOSE_STRIPE_COUNT)
llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_count: ");
llapi_printf(LLAPI_MSG_NORMAL, "%u",
(int)lum->lum_stripe_count);
- if ((verbose & VERBOSE_OFFSET) && !yaml)
+ if ((verbose & VERBOSE_STRIPE_OFFSET) && !yaml)
separator = " ";
else
separator = "\n";
}
- if (verbose & VERBOSE_OFFSET) {
+ if (verbose & VERBOSE_STRIPE_OFFSET) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
- if (verbose & ~VERBOSE_OFFSET)
+ if (verbose & ~VERBOSE_STRIPE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_offset: ");
llapi_printf(LLAPI_MSG_NORMAL, "%d",
(int)lum->lum_stripe_offset);
}
if (verbose & VERBOSE_HASH_TYPE) {
- unsigned int type = lum->lum_hash_type;
+ unsigned int type = lum->lum_hash_type & LMV_HASH_TYPE_MASK;
+ unsigned int flags = lum->lum_hash_type & ~LMV_HASH_TYPE_MASK;
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
if (verbose & ~VERBOSE_HASH_TYPE)
llapi_printf(LLAPI_MSG_NORMAL, "%s",
mdt_hash_name[type]);
else
- llapi_printf(LLAPI_MSG_NORMAL, "%d",
- (int)type);
+ llapi_printf(LLAPI_MSG_NORMAL, "%#x", type);
+
+ if (flags & LMV_HASH_FLAG_MIGRATION)
+ llapi_printf(LLAPI_MSG_NORMAL, ",migrating");
+ if (flags & LMV_HASH_FLAG_DEAD)
+ llapi_printf(LLAPI_MSG_NORMAL, ",dead");
+ if (flags & LMV_HASH_FLAG_BAD_TYPE)
+ llapi_printf(LLAPI_MSG_NORMAL, ",bad_type");
+ if (flags & LMV_HASH_FLAG_LOST_LMV)
+ llapi_printf(LLAPI_MSG_NORMAL, ",lost_lmv");
separator = "\n";
+
}
if (verbose & VERBOSE_OBJID && lum->lum_magic != LMV_USER_MAGIC) {
{
struct lov_comp_md_v1 *comp_v1 = (void *)¶m->fp_lmd->lmd_lmm;
int depth = param->fp_max_depth;
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
bool yaml = flags & LDF_YAML;
if (depth && path && ((verbose != VERBOSE_OBJID) ||
struct lov_comp_md_v1 *comp_v1 = (void *)¶m->fp_lmd->lmd_lmm;
struct lov_comp_md_entry_v1 *entry;
char *separator = "";
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
bool yaml = flags & LDF_YAML;
entry = &comp_v1->lcm_entries[index];
lcme_flags2str(entry->lcme_flags);
separator = "\n";
}
+ /* print snapshot timestamp if its a nosync comp */
+ if ((verbose & VERBOSE_COMP_FLAGS) &&
+ (entry->lcme_flags & LCME_FL_NOSYNC)) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+ if (verbose & ~VERBOSE_COMP_FLAGS)
+ llapi_printf(LLAPI_MSG_NORMAL,
+ "%4slcme_timestamp: ", " ");
+ if (yaml) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%llu",
+ entry->lcme_timestamp);
+ } else {
+ time_t stamp = entry->lcme_timestamp;
+ char *date_str = asctime(localtime(&stamp));
+
+ date_str[strlen(date_str) - 1] = '\0';
+ llapi_printf(LLAPI_MSG_NORMAL, "'%s'", date_str);
+ }
+
+ separator = "\n";
+ }
if (verbose & VERBOSE_COMP_START) {
llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
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';
}
/* print specific component info */
if (param->fp_check_comp_id || param->fp_check_comp_flags ||
- param->fp_check_comp_start || param->fp_check_comp_end)
+ param->fp_check_comp_start || param->fp_check_comp_end ||
+ param->fp_check_mirror_id || param->fp_check_mirror_index)
return false;
return true;
int obdindex = param->fp_obd_index;
int i, j, match;
bool obdstripe = false;
+ __u16 mirror_index = 0;
+ __u16 mirror_id = 0;
if (obdindex != OBD_NOT_FOUND) {
for (i = 0; !(flags & LDF_IS_DIR) && !obdstripe &&
continue;
}
+ if (param->fp_check_mirror_index) {
+ if (mirror_id != mirror_id_of(entry->lcme_id)) {
+ mirror_index++;
+ mirror_id = mirror_id_of(entry->lcme_id);
+ }
+
+ match = find_value_cmp(mirror_index,
+ param->fp_mirror_index,
+ param->fp_mirror_index_sign,
+ param->fp_exclude_mirror_index,
+ 1, 0);
+ if (match == -1)
+ continue;
+ } else if (param->fp_check_mirror_id) {
+ if (mirror_id != mirror_id_of(entry->lcme_id))
+ mirror_id = mirror_id_of(entry->lcme_id);
+
+ match = find_value_cmp(mirror_id,
+ param->fp_mirror_id,
+ param->fp_mirror_id_sign,
+ param->fp_exclude_mirror_id,
+ 1, 0);
+ if (match == -1)
+ continue;
+ }
+
if (print_last_init_comp(param)) {
/**
* if part of stripe info is needed, we'd print only
static inline bool has_any_comp_options(struct find_param *param)
{
- int verbose = param->fp_verbose;
+ enum llapi_layout_verbose verbose = param->fp_verbose;
if (param->fp_check_comp_id || param->fp_check_comp_count ||
param->fp_check_comp_start || param->fp_check_comp_end ||
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,
switch (magic) {
case LOV_USER_MAGIC_V1:
case LOV_USER_MAGIC_V3:
+ case LOV_USER_MAGIC_SPECIFIC:
lov_dump_plain_user_lmm(param, path, flags);
break;
case LMV_MAGIC_V1:
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);
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? */
static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
void *param_data, struct dirent64 *de)
{
- struct find_param *param = (struct find_param *)param_data;
- DIR *tmp_parent = parent;
- char raw[MAX_IOC_BUFLEN] = {'\0'};
- char *rawbuf = raw;
- struct obd_ioctl_data data = { 0 };
- int fd;
- int ret;
- char *path_copy;
- char *filename;
- bool retry = false;
+ struct find_param *param = (struct find_param *)param_data;
+ struct lmv_user_md *lmu = param->fp_lmv_md;
+ DIR *tmp_parent = parent;
+ char raw[MAX_IOC_BUFLEN] = {'\0'};
+ char *rawbuf = raw;
+ struct obd_ioctl_data data = { 0 };
+ int fd;
+ int ret;
+ char *path_copy;
+ char *filename;
+ bool retry = false;
if (parent == NULL && dirp == NULL)
return -EINVAL;
+ if (!lmu)
+ return -EINVAL;
+
if (dirp != NULL)
closedir(*dirp);
path_copy = strdup(path);
filename = basename(path_copy);
+
data.ioc_inlbuf1 = (char *)filename;
data.ioc_inllen1 = strlen(filename) + 1;
- data.ioc_inlbuf2 = (char *)¶m->fp_mdt_index;
- data.ioc_inllen2 = sizeof(param->fp_mdt_index);
+ data.ioc_inlbuf2 = (char *)lmu;
+ data.ioc_inllen2 = lmv_user_md_size(lmu->lum_stripe_count,
+ lmu->lum_magic);
ret = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
if (ret != 0) {
llapi_error(LLAPI_MSG_ERROR, ret,
sync();
retry = true;
goto migrate;
+ } else if (errno == EALREADY) {
+ if (param->fp_verbose & VERBOSE_DETAIL)
+ llapi_printf(LLAPI_MSG_NORMAL,
+ "%s was migrated to MDT%d already\n",
+ path, lmu->lum_stripe_offset);
+ ret = 0;
+ } else {
+ ret = -errno;
+ llapi_error(LLAPI_MSG_ERROR, ret,
+ "%s migrate failed: %s (%d)\n",
+ path, strerror(-ret), ret);
+ goto out;
}
- ret = -errno;
- fprintf(stderr, "%s migrate failed: %s (%d)\n",
- path, strerror(-ret), ret);
- goto out;
} else if (param->fp_verbose & VERBOSE_DETAIL) {
- fprintf(stdout, "migrate %s to MDT%d\n",
- path, param->fp_mdt_index);
+ llapi_printf(LLAPI_MSG_NORMAL,
+ "migrate %s to MDT%d stripe count %d\n",
+ path, lmu->lum_stripe_offset,
+ lmu->lum_stripe_count);
}
out:
return ret;
}
+/* dir migration finished, shrink its stripes */
+static int cb_migrate_mdt_fini(char *path, DIR *parent, DIR **dirp, void *data,
+ struct dirent64 *de)
+{
+ struct find_param *param = data;
+ struct lmv_user_md *lmu = param->fp_lmv_md;
+ int lmulen = lmv_user_md_size(lmu->lum_stripe_count, lmu->lum_magic);
+ int ret = 0;
+
+ if (de && de->d_type != DT_DIR)
+ goto out;
+
+ if (*dirp) {
+ /*
+ * close it before setxattr because the latter may destroy the
+ * original object, and cause close fail.
+ */
+ ret = closedir(*dirp);
+ *dirp = NULL;
+ if (ret)
+ goto out;
+ }
+
+ ret = setxattr(path, XATTR_NAME_LMV, lmu, lmulen, 0);
+ if (ret == -EALREADY)
+ ret = 0;
+out:
+ cb_common_fini(path, parent, dirp, data, de);
+ return ret;
+}
+
int llapi_migrate_mdt(char *path, struct find_param *param)
{
- return param_callback(path, cb_migrate_mdt_init, cb_common_fini, param);
+ return param_callback(path, cb_migrate_mdt_init, cb_migrate_mdt_fini,
+ param);
}
int llapi_mv(char *path, struct find_param *param)
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) {
int llapi_ping(char *obd_type, char *obd_name)
{
+ int flags = O_RDONLY;
+ char buf[1] = { 0 };
glob_t path;
- char buf[1];
int rc, fd;
rc = cfs_get_param_paths(&path, "%s/%s/ping",
obd_type, obd_name);
if (rc != 0)
return -errno;
-
- fd = open(path.gl_pathv[0], O_WRONLY);
+retry_open:
+ fd = open(path.gl_pathv[0], flags);
if (fd < 0) {
+ if (errno == EACCES && flags == O_RDONLY) {
+ flags = O_WRONLY;
+ goto retry_open;
+ }
rc = -errno;
llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s",
path.gl_pathv[0]);
goto failed;
}
- /* The purpose is to send a byte as a ping, whatever this byte is. */
- /* coverity[uninit_use_in_call] */
- rc = write(fd, buf, 1);
+ if (flags == O_RDONLY)
+ rc = read(fd, buf, sizeof(buf));
+ else
+ rc = write(fd, buf, sizeof(buf));
if (rc < 0)
rc = -errno;
close(fd);
}
/*
- * Create a file without any name open it for read/write
+ * Create a file without any name and open it for read/write
*
* - file is created as if it were a standard file in the given \a directory
* - file does not appear in \a directory and mtime does not change because
* the filename is handled specially by the Lustre MDS.
- * - file is removed at final close
- * - file modes are rw------- since it doesn't make sense to have a read-only
- * or write-only file that cannot be opened again.
- * - if user wants another mode it must use fchmod() on the open file, no
- * security problems arise because it cannot be opened by another process.
+ * - file is destroyed at final close
*
* \param[in] directory directory from which to inherit layout/MDT idx
- * \param[in] idx MDT index on which the file is created,
+ * \param[in] mdt_idx MDT index on which the file is created,
* \a idx == -1 means no specific MDT is requested
- * \param[in] open_flags standard open(2) flags
+ * \param[in] mode standard open(2) mode
+ * \param[in] stripe_param stripe parameters. May be NULL.
*
- * \retval 0 on success.
+ * \retval a file descriptor on success.
* \retval -errno on error.
*/
-int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
+int llapi_create_volatile_param(const char *directory, int mdt_idx,
+ int open_flags, mode_t mode,
+ const struct llapi_stripe_param *stripe_param)
{
- char file_path[PATH_MAX];
- char filename[PATH_MAX];
- int saved_errno = errno;
- int fd;
- int rnumber;
- int rc;
+ char file_path[PATH_MAX];
+ int saved_errno = errno;
+ int fd;
+ unsigned int rnumber;
+ int rc;
do {
rnumber = random();
- if (idx == -1)
- snprintf(filename, sizeof(filename),
- LUSTRE_VOLATILE_HDR"::%.4X", rnumber);
+ if (mdt_idx == -1)
+ rc = snprintf(file_path, sizeof(file_path),
+ "%s/" LUSTRE_VOLATILE_HDR "::%.4X",
+ directory, rnumber);
else
- snprintf(filename, sizeof(filename),
- LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber);
+ rc = snprintf(file_path, sizeof(file_path),
+ "%s/" LUSTRE_VOLATILE_HDR ":%.4X:%.4X",
+ directory, mdt_idx, rnumber);
+
+ if (rc < 0 || rc >= sizeof(file_path))
+ return -ENAMETOOLONG;
+
+ /*
+ * Either open O_WRONLY or O_RDWR, creating RDONLY
+ * is non-sensical here
+ */
+ if ((open_flags & O_ACCMODE) == O_RDONLY)
+ open_flags = O_RDWR | (open_flags & ~O_ACCMODE);
- rc = snprintf(file_path, sizeof(file_path),
- "%s/%s", directory, filename);
- if (rc >= sizeof(file_path))
- return -E2BIG;
+ open_flags |= O_CREAT | O_EXCL | O_NOFOLLOW;
- fd = open(file_path,
- O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | open_flags,
- S_IRUSR | S_IWUSR);
- } while (fd < 0 && errno == EEXIST);
+ if (stripe_param != NULL) {
+ fd = llapi_file_open_param(file_path, open_flags,
+ mode, stripe_param);
+ if (fd < 0)
+ rc = fd;
+ } else {
+ fd = open(file_path, open_flags, mode);
+ if (fd < 0)
+ rc = -errno;
+ }
+ } while (fd < 0 && rc == -EEXIST);
if (fd < 0) {
- llapi_error(LLAPI_MSG_ERROR, errno,
+ llapi_error(LLAPI_MSG_ERROR, rc,
"Cannot create volatile file '%s' in '%s'",
- filename + LUSTRE_VOLATILE_HDR_LEN,
+ file_path + strlen(directory) + 1 +
+ LUSTRE_VOLATILE_HDR_LEN,
directory);
- return -errno;
+ return rc;
}
- /* Unlink file in case this wasn't a Lustre filesystem and the
- * magic volatile filename wasn't handled as intended. The
- * effect is the same. If volatile open was supported then we
- * expect unlink() to return -ENOENT. */
+ /*
+ * Unlink file in case this wasn't a Lustre filesystem and the magic
+ * volatile filename wasn't handled as intended. The effect is the
+ * same. If volatile open was supported then we expect unlink() to
+ * return -ENOENT.
+ */
(void)unlink(file_path);
- /* Since we are returning successfully we restore errno (and
- * mask out possible EEXIST from open() and ENOENT from
- * unlink(). */
+ /*
+ * Since we are returning successfully we restore errno (and
+ * mask out possible EEXIST from open() and ENOENT from unlink().
+ */
errno = saved_errno;
return fd;
}
+/*
+ * Create a file without any name open it for read/write
+ *
+ * - file is created as if it were a standard file in the given \a directory
+ * - file does not appear in \a directory and mtime does not change because
+ * the filename is handled specially by the Lustre MDS.
+ * - file is removed at final close
+ * - file modes are rw------- since it doesn't make sense to have a read-only
+ * or write-only file that cannot be opened again.
+ * - if user wants another mode it must use fchmod() on the open file, no
+ * security problems arise because it cannot be opened by another process.
+ *
+ * \param[in] directory directory from which to inherit layout/MDT idx
+ * \param[in] idx MDT index on which the file is created,
+ * \a idx == -1 means no specific MDT is requested
+ * \param[in] open_flags standard open(2) flags
+ *
+ * \retval a file descriptor on success.
+ * \retval -errno on error.
+ */
+int llapi_create_volatile_idx(const char *directory, int mdt_idx,
+ int open_flags)
+{
+ return llapi_create_volatile_param(directory, mdt_idx, open_flags,
+ S_IRUSR | S_IWUSR, NULL);
+}
+
/**
* Swap the layouts between 2 file descriptors
* the 2 files must be open for writing