Whamcloud - gitweb
LU-3363 api: HSM import uses new released pattern
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index 48a1453..818d54c 100644 (file)
@@ -27,7 +27,7 @@
  * 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/
@@ -61,6 +61,7 @@
 #include <sys/xattr.h>
 #include <fnmatch.h>
 #include <glob.h>
+#include <libgen.h> /* for dirname() */
 #ifdef HAVE_LINUX_UNISTD_H
 #include <linux/unistd.h>
 #else
@@ -449,16 +450,95 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
         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;
+       }
 
-        /* Now get the maxea from llite proc */
-        if (!get_param_obdvar(NULL, path, "llite", "max_easize",
-                              buf, sizeof(buf)))
-                lumlen = atoi(buf);
-        return lumlen;
+       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;
+
+       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;
 }
 
 /*
@@ -647,6 +727,124 @@ int llapi_file_create_pool(const char *name, unsigned long long stripe_size,
         return 0;
 }
 
+/**
+ * In DNE phase I, only stripe_offset will be used in this function.
+ * stripe_count, stripe_pattern and pool_name will be supported later.
+ */
+int llapi_dir_create_pool(const char *name, int flags, int stripe_offset,
+                         int stripe_count, int stripe_pattern, char *pool_name)
+{
+       struct lmv_user_md lmu = { 0 };
+       struct obd_ioctl_data data = { 0 };
+       char rawbuf[8192];
+       char *buf = rawbuf;
+       char *dirpath = NULL;
+       char *namepath = NULL;
+       char *dir;
+       char *filename;
+       int fd = -1;
+       int rc;
+
+       dirpath = strdup(name);
+       namepath = strdup(name);
+       if (!dirpath || !namepath)
+               return -ENOMEM;
+
+       lmu.lum_magic = LMV_USER_MAGIC;
+       lmu.lum_stripe_offset = stripe_offset;
+       lmu.lum_stripe_count = stripe_count;
+       lmu.lum_hash_type = stripe_pattern;
+       if (pool_name != NULL) {
+               if (strlen(pool_name) >= LOV_MAXPOOLNAME) {
+                       llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "error LL_IOC_LMV_SETSTRIPE '%s' : too large"
+                                 "pool name: %s", name, pool_name);
+                       GOTO(out, rc = -E2BIG);
+               }
+               memcpy(lmu.lum_pool_name, pool_name, strlen(pool_name));
+       }
+
+       filename = basename(namepath);
+       lmu.lum_type = LMV_STRIPE_TYPE;
+       dir = dirname(dirpath);
+
+       data.ioc_inlbuf1 = (char *)filename;
+       data.ioc_inllen1 = strlen(filename) + 1;
+       data.ioc_inlbuf2 = (char *)&lmu;
+       data.ioc_inllen2 = sizeof(struct lmv_user_md);
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
+                           name);
+               GOTO(out, rc);
+       }
+
+       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);
+       }
+
+       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);
+       }
+       close(fd);
+out:
+       free(dirpath);
+       free(namepath);
+       return rc;
+}
+
+int llapi_direntry_remove(char *dname)
+{
+       char *dirpath = NULL;
+       char *namepath = NULL;
+       char *dir;
+       char *filename;
+       int fd = -1;
+       int rc = 0;
+
+       dirpath = strdup(dname);
+       namepath = strdup(dname);
+       if (!dirpath || !namepath)
+               return -ENOMEM;
+
+       filename = basename(namepath);
+
+       dir = dirname(dirpath);
+
+       fd = open(dir, O_DIRECTORY | O_RDONLY);
+       if (fd < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'",
+                           filename);
+               GOTO(out, rc);
+       }
+
+       if (ioctl(fd, LL_IOC_REMOVE_ENTRY, filename)) {
+               char *errmsg = strerror(errno);
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "error on ioctl "LPX64" for '%s' (%d): %s",
+                                 (__u64)LL_IOC_LMV_SETSTRIPE, filename,
+                                 fd, errmsg);
+       }
+out:
+       free(dirpath);
+       free(namepath);
+       if (fd != -1)
+               close(fd);
+       return rc;
+}
+
 /*
  * Find the fsname, the full path, and/or an open fd.
  * Either the fsname or path must not be NULL
@@ -680,10 +878,11 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
 
                 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 */
@@ -1115,20 +1314,34 @@ err:
 }
 
 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);
-        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",
-                            sizeof(lstat_t) + param->lumlen);
-                return -ENOMEM;
-        }
+       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",
+                           sizeof(lstat_t) + param->lumlen);
+               return -ENOMEM;
+       }
+
+       param->fp_lmv_count = 256;
+       param->fp_lmv_md = malloc(lmv_user_md_size(256, LMV_MAGIC_V1));
+       if (param->fp_lmv_md == NULL) {
+               llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
+                           "error: allocation of %d bytes for ioctl",
+                           lmv_user_md_size(256, LMV_MAGIC_V1));
+               return -ENOMEM;
+       }
 
        param->got_uuids = 0;
        param->obdindexes = NULL;
@@ -1139,15 +1352,18 @@ static int common_param_init(struct find_param *param, char *path)
 
 static void find_param_fini(struct find_param *param)
 {
-        if (param->obdindexes)
-                free(param->obdindexes);
+       if (param->obdindexes)
+               free(param->obdindexes);
+
+       if (param->lmd)
+               free(param->lmd);
 
-        if (param->lmd)
-                free(param->lmd);
+       if (param->fp_lmv_md)
+               free(param->fp_lmv_md);
 }
 
 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--;
@@ -1172,6 +1388,17 @@ static DIR *opendir_parent(char *path)
         return parent;
 }
 
+static int cb_get_dirstripe(char *path, DIR *d, struct find_param *param)
+{
+       struct lmv_user_md *lmv = (struct lmv_user_md *)param->fp_lmv_md;
+       int ret = 0;
+
+       lmv->lum_stripe_count = param->fp_lmv_count;
+       lmv->lum_magic = LMV_MAGIC_V1;
+       ret = ioctl(dirfd(d), LL_IOC_LMV_GETSTRIPE, lmv);
+       return ret;
+}
+
 static int get_lmd_info(char *path, DIR *parent, DIR *dir,
                  struct lov_user_mds_data *lmd, int lumlen)
 {
@@ -1216,32 +1443,25 @@ static int get_lmd_info(char *path, DIR *parent, DIR *dir,
                                     "%s ioctl failed for %s.",
                                     dir ? "LL_IOC_MDC_GETINFO" :
                                     "IOC_MDC_GETFILEINFO", path);
-                } else {
-                        ret = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, ret,
-                                   "error: %s: IOC_MDC_GETFILEINFO failed for %s",
-                                   __func__, path);
-                }
-        }
-        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);
+               } else {
+                       ret = -errno;
+                       llapi_error(LLAPI_MSG_ERROR, ret,
+                                "error: %s: IOC_MDC_GETFILEINFO failed for %s",
+                                  __func__, path);
+               }
+       }
+       return ret;
 }
 
 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)
+                                  semantic_func_t sem_init,
+                                  semantic_func_t sem_fini, void *data,
+                                  struct dirent64 *de)
 {
-        cfs_dirent_t *dent;
-        int len, ret;
-        DIR *d, *p = NULL;
+       struct find_param *param = (struct find_param *)data;
+       struct dirent64 *dent;
+       int len, ret;
+       DIR *d, *p = NULL;
 
         ret = 0;
         len = strlen(path);
@@ -1262,11 +1482,11 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
         if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de)))
                 goto err;
 
-        if (!d)
-                GOTO(out, ret = 0);
+       if (!d || (param->get_lmv && !param->recursive))
+               GOTO(out, ret = 0);
 
-        while ((dent = readdir64(d)) != NULL) {
-                ((struct find_param *)data)->have_fileinfo = 0;
+       while ((dent = readdir64(d)) != NULL) {
+               param->have_fileinfo = 0;
 
                 if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
                         continue;
@@ -1286,20 +1506,18 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
                 strcat(path, dent->d_name);
 
                 if (dent->d_type == DT_UNKNOWN) {
-                        lstat_t *st = &((struct find_param *)data)->lmd->lmd_st;
+                       lstat_t *st = &param->lmd->lmd_st;
 
-                        ret = llapi_mds_getfileinfo(path, d,
-                                             ((struct find_param *)data)->lmd);
+                       ret = get_lmd_info(path, d, NULL, param->lmd,
+                                          param->lumlen);
                         if (ret == 0) {
-                                ((struct find_param *)data)->have_fileinfo = 1;
-                                dent->d_type =
-                                        llapi_filetype_dir_table[st->st_mode &
-                                                                 S_IFMT];
-                        }
+                               dent->d_type =
+                                       llapi_filetype_dir_table[st->st_mode &
+                                                                S_IFMT];
+                       }
                         if (ret == -ENOENT)
                                 continue;
-                }
-
+               }
                 switch (dent->d_type) {
                 case DT_UNKNOWN:
                         llapi_err_noerrno(LLAPI_MSG_ERROR,
@@ -1405,6 +1623,23 @@ int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
         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
@@ -1594,10 +1829,12 @@ static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
         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 *
@@ -1881,23 +2118,23 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
         char nl = is_dir ? ' ' : '\n';
         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)
@@ -1949,17 +2186,19 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                 }
         }
 
-        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)
                         llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen:     ",
                                      prefix);
                 llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
-                             (int)lum->u.lum_layout_gen, nl);
+                               (int)lum->lmm_layout_gen, nl);
         }
 
         if (verbose & VERBOSE_OFFSET) {
@@ -2007,15 +2246,16 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                 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",
@@ -2033,10 +2273,89 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
         }
 }
 
-void llapi_lov_dump_user_lmm(struct find_param *param,
-                             char *path, int is_dir)
+void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
+                      char *path, int obdindex, int depth, int verbose)
 {
-        switch(*(__u32 *)&param->lmd->lmd_lmm) { /* lum->lmm_magic */
+       struct lmv_user_mds_data *objects = lum->lum_objects;
+       char *prefix = lum->lum_magic == LMV_USER_MAGIC ? "(Default)" : "";
+       int i, obdstripe = 0;
+
+       if (obdindex != OBD_NOT_FOUND) {
+               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;
+                               break;
+                       }
+               }
+       } else {
+               obdstripe = 1;
+       }
+
+       /* show all information default */
+       if (!verbose) {
+               if (lum->lum_magic == LMV_USER_MAGIC)
+                       verbose = VERBOSE_POOL | VERBOSE_COUNT | VERBOSE_OFFSET;
+               else
+                       verbose = VERBOSE_OBJID;
+       }
+
+       if (lum->lum_magic == LMV_USER_MAGIC)
+               verbose &= ~VERBOSE_OBJID;
+
+       if (depth && path && ((verbose != VERBOSE_OBJID)))
+               llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
+
+       if (verbose & VERBOSE_COUNT) {
+               if (verbose & ~VERBOSE_COUNT)
+                       llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_count: ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%u\n",
+                            (int)lum->lum_stripe_count);
+       }
+
+       if (verbose & VERBOSE_OFFSET) {
+               if (verbose & ~VERBOSE_OFFSET)
+                       llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_offset: ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%d\n",
+                            (int)lum->lum_stripe_offset);
+       }
+
+       if (verbose & VERBOSE_OBJID) {
+               if ((obdstripe == 1))
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "\tmdtidx\t\t FID[seq:oid:ver]\n");
+               for (i = 0; i < lum->lum_stripe_count; i++) {
+                       int idx = objects[i].lum_mds;
+                       struct lu_fid *fid = &objects[i].lum_fid;
+                       if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx))
+                               llapi_printf(LLAPI_MSG_NORMAL,
+                                            "\t%6u\t\t "DFID"\t\t%s\n",
+                                           idx, PFID(fid),
+                                           obdindex == idx ? " *" : "");
+               }
+
+       }
+
+       if ((verbose & VERBOSE_POOL) && (pool_name[0] != '\0')) {
+               if (verbose & ~VERBOSE_POOL)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%slmv_pool:           ",
+                                    prefix);
+               llapi_printf(LLAPI_MSG_NORMAL, "%s%c ", pool_name, ' ');
+       }
+       llapi_printf(LLAPI_MSG_NORMAL, "\n");
+}
+
+void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
+{
+       __u32 magic;
+
+       if (param->get_lmv)
+               magic = (__u32)param->fp_lmv_md->lum_magic;
+       else
+               magic = *(__u32 *)&param->lmd->lmd_lmm; /* lum->lmm_magic */
+
+       switch (magic) {
         case LOV_USER_MAGIC_V1:
                 lov_dump_user_lmm_v1v3(&param->lmd->lmd_lmm, NULL,
                                        param->lmd->lmd_lmm.lmm_objects,
@@ -2058,13 +2377,26 @@ void llapi_lov_dump_user_lmm(struct find_param *param,
                                        param->verbose, param->raw);
                 break;
         }
-        default:
-                llapi_printf(LLAPI_MSG_NORMAL, "unknown lmm_magic:  %#x "
-                             "(expecting one of %#x %#x %#x)\n",
-                             *(__u32 *)&param->lmd->lmd_lmm,
-                             LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3);
-                return;
-        }
+       case LMV_MAGIC_V1:
+       case LMV_USER_MAGIC: {
+               char pool_name[LOV_MAXPOOLNAME + 1];
+               struct lmv_user_md *lum;
+
+               lum = (struct lmv_user_md *)param->fp_lmv_md;
+               strncpy(pool_name, lum->lum_pool_name, LOV_MAXPOOLNAME);
+               lmv_dump_user_lmm(lum, pool_name, path,
+                                 param->obdindex, param->maxdepth,
+                                 param->verbose);
+               break;
+       }
+       default:
+               llapi_printf(LLAPI_MSG_NORMAL, "unknown lmm_magic:  %#x "
+                            "(expecting one of %#x %#x %#x %#x)\n",
+                            *(__u32 *)&param->lmd->lmd_lmm,
+                            LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3,
+                            LMV_USER_MAGIC, LMV_MAGIC_V1);
+               return;
+       }
 }
 
 int llapi_file_get_stripe(const char *path, struct lov_user_md *lum)
@@ -2332,7 +2664,7 @@ static int print_failed_tgt(struct find_param *param, char *path, int type)
 }
 
 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. */
@@ -2373,11 +2705,12 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
 
         /* 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;
@@ -2482,6 +2815,18 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
                         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))
@@ -2653,7 +2998,7 @@ int llapi_file_fget_mdtidx(int fd, int *mdtidx)
 }
 
 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;
@@ -2720,7 +3065,7 @@ out:
 }
 
 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;
@@ -2734,38 +3079,50 @@ static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
                         return ret;
         }
 
-        if (d) {
-                ret = ioctl(dirfd(d), LL_IOC_LOV_GETSTRIPE,
-                            (void *)&param->lmd->lmd_lmm);
-        } else if (parent) {
-                char *fname = strrchr(path, '/');
-                fname = (fname == NULL ? path : fname + 1);
+       if (d) {
+               if (param->get_lmv) {
+                       ret = cb_get_dirstripe(path, d, param);
+               } else {
+                       ret = ioctl(dirfd(d), LL_IOC_LOV_GETSTRIPE,
+                                    (void *)&param->lmd->lmd_lmm);
+               }
 
-                strncpy((char *)&param->lmd->lmd_lmm, fname, param->lumlen);
+       } else if (parent) {
+               char *fname = strrchr(path, '/');
+               fname = (fname == NULL ? path : fname + 1);
 
-                ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
-                            (void *)&param->lmd->lmd_lmm);
-        }
+               if (param->get_lmv) {
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%s get dirstripe information for file\n",
+                                    path);
+                       goto out;
+               }
+
+               strncpy((char *)&param->lmd->lmd_lmm, fname, param->lumlen);
+
+               ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
+                           (void *)&param->lmd->lmd_lmm);
+       }
 
         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 = &param->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 = &param->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)
+                       if (!param->obduuid && !param->mdtuuid)
                                 llapi_printf(LLAPI_MSG_NORMAL,
                                              "%s has no stripe info\n", path);
                         goto out;
@@ -3028,7 +3385,7 @@ int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
 }
 
 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;
@@ -3122,7 +3479,9 @@ static int rmtacl_notify(int ops)
                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;
                 }
 
@@ -3877,13 +4236,18 @@ int llapi_create_volatile_idx(char *directory, int idx, int mode)
                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",
@@ -3894,4 +4258,62 @@ int llapi_create_volatile_idx(char *directory, int idx, int mode)
        return fd;
 }
 
+/**
+ * Swap the layouts between 2 file descriptors
+ * the 2 files must be open in write
+ * 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, __u64 dv1, __u64 dv2, __u64 flags)
+{
+       struct lustre_swap_layouts lsl;
+       int rc;
+
+       srandom(time(NULL));
+       lsl.sl_fd = fd2;
+       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;
+       return rc;
+}
+
+/**
+ * Swap the layouts between 2 files
+ * the 2 files are open in write
+ */
+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 | O_LOV_DELAY_CREATE);
+       if (fd1 < 0) {
+               llapi_error(LLAPI_MSG_ERROR, -errno,
+                               "error: cannot open for write %s",
+                               path1);
+               return -errno;
+       }
+
+       fd2 = open(path2, O_WRONLY | O_LOV_DELAY_CREATE);
+       if (fd2 < 0) {
+               llapi_error(LLAPI_MSG_ERROR, -errno,
+                               "error: cannot open for write %s",
+                               path2);
+               close(fd1);
+               return -errno;
+       }
+
+       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",
+                       path1, path2);
 
+       close(fd1);
+       close(fd2);
+       return rc;
+}