Whamcloud - gitweb
LU-4100 utils: Remove extra space of lfs getstripe
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index ab65f33..843574f 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
@@ -73,6 +74,7 @@
 #include <obd.h>
 #include <obd_lov.h>
 #include <lustre/lustreapi.h>
+#include "lustreapi_internal.h"
 
 static unsigned llapi_dir_filetype_table[] = {
         [DT_UNKNOWN]= 0,
@@ -128,48 +130,97 @@ void llapi_msg_set_level(int level)
                 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;
 
@@ -239,9 +290,9 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
                                "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;
@@ -414,7 +465,12 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
                         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) {
@@ -434,9 +490,14 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
                         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;
                 }
         }
@@ -448,16 +509,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);
 
-        /* Now get the maxea from llite proc */
-        if (!get_param_obdvar(NULL, path, "llite", "max_easize",
-                              buf, sizeof(buf)))
-                lumlen = atoi(buf);
-        return lumlen;
+       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;
+
+       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;
 }
 
 /*
@@ -476,10 +616,14 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname)
         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;
 
@@ -646,17 +790,130 @@ 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);
+                       rc = -E2BIG;
+                       goto out;
+               }
+               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;
+       }
+
+       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;
+       }
+
+       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;
+       }
+
+       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
  */
-#define WANT_PATH   0x1
-#define WANT_FSNAME 0x2
-#define WANT_FD     0x4
-#define WANT_INDEX  0x8
-#define WANT_ERROR  0x10
-static int get_root_path(int want, char *fsname, int *outfd, char *path,
-                         int index)
+int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
 {
         struct mntent mnt;
         char buf[PATH_MAX], mntdir[PATH_MAX];
@@ -685,10 +942,11 @@ static int get_root_path(int want, char *fsname, int *outfd, char *path,
 
                 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 */
@@ -807,6 +1065,11 @@ int llapi_search_fsname(const char *pathname, char *fsname)
         return rc;
 }
 
+int llapi_search_rootpath(char *pathname, const char *fsname)
+{
+       return get_root_path(WANT_PATH, (char *)fsname, NULL, pathname, -1);
+}
+
 int llapi_getname(const char *path, char *buf, size_t size)
 {
         struct obd_uuid uuid_buf;
@@ -988,10 +1251,14 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                                     " 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) {
@@ -1115,20 +1382,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 %zu 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 +1420,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 +1456,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)
 {
@@ -1190,8 +1485,6 @@ static int get_lmd_info(char *path, DIR *parent, DIR *dir,
                 /* retrieve needed file info */
                 strncpy((char *)lmd, fname, lumlen);
                 ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
-        } else {
-                return ret;
         }
 
         if (ret) {
@@ -1216,32 +1509,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);
@@ -1255,18 +1541,22 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
         } 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)
-                GOTO(out, ret = 0);
+       if (!d || (param->get_lmv && !param->recursive)) {
+               ret = 0;
+               goto out;
+       }
 
-        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 +1576,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 +1693,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
@@ -1589,15 +1894,18 @@ static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
                          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 *
@@ -1878,26 +2186,26 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                                      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)
@@ -1910,25 +2218,27 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                                                               &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);
@@ -1937,53 +2247,62 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                         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->u.lum_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");
 }
 
@@ -2007,15 +2326,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 +2353,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 +2457,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)
@@ -2292,12 +2704,10 @@ static int check_mdt_match(struct find_param *param)
                 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;
@@ -2332,7 +2742,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 +2783,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 +2893,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 +3076,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 +3143,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 +3157,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 +3463,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 +3557,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;
                 }
 
@@ -3424,12 +3861,13 @@ static int get_mdtname(char *name, char *format, char *buf)
  * \param mdtidxp pointer to integer within data to be filled in with the
  *    mdt index (0 if no mdt is specified).  NULL won't be filled.
  */
-static int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
-                      int want_error)
+int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
+              int want_error)
 {
         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. */
@@ -3523,7 +3961,7 @@ int llapi_changelog_start(void **priv, int flags, const char *device,
                              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);
@@ -3578,24 +4016,24 @@ static inline int changelog_extend_rec(struct changelog_ext_rec *ext)
  */
 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;
-
-        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;
+       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(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) &&
@@ -3649,7 +4087,7 @@ int llapi_changelog_free(struct changelog_ext_rec **rech)
 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,
@@ -3711,215 +4149,54 @@ int llapi_fid2path(const char *device, const char *fidstr, char *buf,
         return rc;
 }
 
-static int path2fid_from_lma(const char *path, lustre_fid *fid)
-{
-        char buf[512];
-        struct lustre_mdt_attrs *lma;
-        int rc;
-
-        rc = lgetxattr(path, XATTR_NAME_LMA, buf, sizeof(buf));
-        if (rc < 0)
-                return -errno;
-        lma = (struct lustre_mdt_attrs *)buf;
-        fid_le_to_cpu(fid, &lma->lma_self_fid);
-        return 0;
-}
-
-int llapi_path2fid(const char *path, lustre_fid *fid)
+static int fid_from_lma(const char *path, const int fd, lustre_fid *fid)
 {
-        int fd, rc;
-
-        memset(fid, 0, sizeof(*fid));
-        fd = open(path, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
-        if (fd < 0) {
-                if (errno == ELOOP || errno == ENXIO)
-                        return path2fid_from_lma(path, fid);
-                return -errno;
-        }
-
-        rc = ioctl(fd, LL_IOC_PATH2FID, fid) < 0 ? -errno : 0;
-        if (rc == -EINVAL || rc == -ENOTTY)
-                rc = path2fid_from_lma(path, fid);
-
-        close(fd);
-        return rc;
-}
-
-/****** HSM Copytool API ********/
-#define CT_PRIV_MAGIC 0xC0BE2001
-struct copytool_private {
-        int magic;
-        char *fsname;
-        lustre_kernelcomm kuc;
-        __u32 archives;
-};
-
-#include <libcfs/libcfs.h>
-
-/** Register a copytool
- * @param[out] priv Opaque private control structure
- * @param fsname Lustre filesystem
- * @param flags Open flags, currently unused (e.g. O_NONBLOCK)
- * @param archive_count
- * @param archives Which archive numbers this copytool is responsible for
- */
-int llapi_copytool_start(void **priv, char *fsname, int flags,
-                         int archive_count, int *archives)
-{
-        struct copytool_private *ct;
-        int rc;
-
-        if (archive_count > 0 && archives == NULL) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "NULL archive numbers");
-                return -EINVAL;
-        }
-
-        ct = calloc(1, sizeof(*ct));
-        if (ct == NULL)
-                return -ENOMEM;
-
-        ct->fsname = malloc(strlen(fsname) + 1);
-        if (ct->fsname == NULL) {
-                rc = -ENOMEM;
-                goto out_err;
-        }
-        strcpy(ct->fsname, fsname);
-        ct->magic = CT_PRIV_MAGIC;
-        ct->archives = 0;
-        for (rc = 0; rc < archive_count; rc++) {
-                if (archives[rc] > sizeof(ct->archives)) {
-                        llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                          "Maximum of %d archives supported",
-                                          sizeof(ct->archives));
-                        goto out_err;
-                }
-                ct->archives |= 1 << archives[rc];
-        }
-        /* special case: if no archives specified, default to archive #0. */
-        if (ct->archives == 0)
-                ct->archives = 1;
-
-        rc = libcfs_ukuc_start(&ct->kuc, KUC_GRP_HSM);
-        if (rc < 0)
-                goto out_err;
-
-        /* Storing archive(s) in lk_data; see mdc_ioc_hsm_ct_start */
-        ct->kuc.lk_data = ct->archives;
-        rc = root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL,
-                        WANT_ERROR);
-        /* Only the kernel reference keeps the write side open */
-        close(ct->kuc.lk_wfd);
-        ct->kuc.lk_wfd = 0;
-        if (rc < 0)
-                goto out_err;
-
-        *priv = ct;
-        return 0;
-
-out_err:
-        if (ct->fsname)
-                free(ct->fsname);
-        free(ct);
-        return rc;
+       char                     buf[512];
+       struct lustre_mdt_attrs *lma;
+       int                      rc;
+
+       if (path == NULL)
+               rc = fgetxattr(fd, XATTR_NAME_LMA, buf, sizeof(buf));
+       else
+               rc = lgetxattr(path, XATTR_NAME_LMA, buf, sizeof(buf));
+       if (rc < 0)
+               return -errno;
+       lma = (struct lustre_mdt_attrs *)buf;
+       fid_le_to_cpu(fid, &lma->lma_self_fid);
+       return 0;
 }
 
-/** Deregister a copytool */
-int llapi_copytool_fini(void **priv)
+int llapi_fd2fid(const int fd, lustre_fid *fid)
 {
-        struct copytool_private *ct = (struct copytool_private *)*priv;
-
-        if (!ct || (ct->magic != CT_PRIV_MAGIC))
-                return -EINVAL;
+       int rc;
 
-        /* Tell the kernel to stop sending us messages */
-        ct->kuc.lk_flags = LK_FLG_STOP;
-        root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL, 0);
+       memset(fid, 0, sizeof(*fid));
 
-        /* Shut down the kernelcomms */
-        libcfs_ukuc_stop(&ct->kuc);
+       rc = ioctl(fd, LL_IOC_PATH2FID, fid) < 0 ? -errno : 0;
+       if (rc == -EINVAL || rc == -ENOTTY)
+               rc = fid_from_lma(NULL, fd, fid);
 
-        free(ct->fsname);
-        free(ct);
-        *priv = NULL;
-        return 0;
+       return rc;
 }
 
-/** Wait for the next hsm_action_list
- * @param priv Opaque private control structure
- * @param halh Action list handle, will be allocated here
- * @param msgsize Number of bytes in the message, will be set here
- * @return 0 valid message received; halh and msgsize are set
- *         <0 error code
- */
-int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize)
+int llapi_path2fid(const char *path, lustre_fid *fid)
 {
-        struct copytool_private *ct = (struct copytool_private *)priv;
-        struct kuc_hdr *kuch;
-        struct hsm_action_list *hal;
-        int rc = 0;
-
-        if (!ct || (ct->magic != CT_PRIV_MAGIC))
-                return -EINVAL;
-        if (halh == NULL || msgsize == NULL)
-                return -EINVAL;
-
-        kuch = malloc(HAL_MAXSIZE + sizeof(*kuch));
-        if (kuch == NULL)
-                return -ENOMEM;
-
-        rc = libcfs_ukuc_msg_get(&ct->kuc, (char *)kuch,
-                                 HAL_MAXSIZE + sizeof(*kuch),
-                                 KUC_TRANSPORT_HSM);
-        if (rc < 0)
-                goto out_free;
-
-        /* Handle generic messages */
-        if (kuch->kuc_transport == KUC_TRANSPORT_GENERIC &&
-            kuch->kuc_msgtype == KUC_MSG_SHUTDOWN) {
-                rc = -ESHUTDOWN;
-                goto out_free;
-        }
-
-        if (kuch->kuc_transport != KUC_TRANSPORT_HSM ||
-            kuch->kuc_msgtype != HMT_ACTION_LIST) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "Unknown HSM message type %d:%d\n",
-                                  kuch->kuc_transport, kuch->kuc_msgtype);
-                rc = -EPROTO;
-                goto out_free;
-        }
-
-        /* Our message is a hsm_action_list.  Use pointer math to skip
-         * kuch_hdr and point directly to the message payload.
-         */
-        hal = (struct hsm_action_list *)(kuch + 1);
-
-        /* Check that we have registered for this archive # */
-        if (((1 << hal->hal_archive_num) & ct->archives) == 0) {
-                    llapi_err_noerrno(LLAPI_MSG_INFO,
-                             "Ignoring request for archive #%d (bitmask %#x)\n",
-                             hal->hal_archive_num, ct->archives);
-                rc = 0;
-                goto out_free;
-        }
-
-        *halh = hal;
-        *msgsize = kuch->kuc_msglen - sizeof(*kuch);
-        return 0;
+       int fd, rc;
+
+       memset(fid, 0, sizeof(*fid));
+       fd = open(path, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
+       if (fd < 0) {
+               if (errno == ELOOP || errno == ENXIO)
+                       return fid_from_lma(path, -1, fid);
+               return -errno;
+       }
 
-out_free:
-        *halh = NULL;
-        *msgsize = 0;
-        free(kuch);
-        return rc;
-}
+       rc = llapi_fd2fid(fd, fid);
+       if (rc == -EINVAL || rc == -ENOTTY)
+               rc = fid_from_lma(path, -1, fid);
 
-/** Release the action list when done with it. */
-int llapi_copytool_free(struct hsm_action_list **hal)
-{
-       /* Reuse the llapi_changelog_free function */
-       return llapi_changelog_free((struct changelog_ext_rec **)hal);
+       close(fd);
+       return rc;
 }
 
 int llapi_get_connect_flags(const char *mnt, __u64 *flags)
@@ -3979,9 +4256,12 @@ int llapi_get_version(char *buffer, int buffer_size,
  * 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.
@@ -4001,3 +4281,121 @@ int llapi_get_data_version(int fd, __u64 *data_version, __u64 flags)
 
         return rc;
 }
+
+/*
+ * Create a volatile file and open it for write:
+ * - file is created as a standard file in the directory
+ * - file does not appears in directory and directory mtime does not change
+ * - file is removed at close
+ * - file modes are rw-------, if user wants another one it must use fchmod()
+ * \param      directory       Directory where the file is created
+ * \param      idx             MDT index on which the file is created
+ * \param      flags           Std open flags
+ *
+ * \retval     0 on success.
+ * \retval     -errno on error.
+ */
+int llapi_create_volatile_idx(char *directory, int idx, int mode)
+{
+       char    file_path[PATH_MAX];
+       char    filename[PATH_MAX];
+       int     fd;
+       int     random;
+       int     rc;
+
+       fd = open("/dev/urandom", O_RDONLY);
+       if (fd < 0) {
+               llapi_error(LLAPI_MSG_ERROR, errno,
+                           "Cannot open /dev/urandom\n");
+               return -errno;
+       }
+       rc = read(fd, &random, sizeof(random));
+       close(fd);
+       if (rc < sizeof(random)) {
+               llapi_error(LLAPI_MSG_ERROR, errno,
+                           "cannot read %zu bytes from /dev/urandom",
+                           sizeof(random));
+               return -errno;
+       }
+       if (idx == -1)
+               snprintf(filename, sizeof(filename),
+                        LUSTRE_VOLATILE_HDR"::%.4X", random);
+       else
+               snprintf(filename, sizeof(filename),
+                        LUSTRE_VOLATILE_IDX"%.4X", 0, random);
+
+       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));
+       if (fd < 0) {
+               llapi_error(LLAPI_MSG_ERROR, errno,
+                           "Cannot create volatile file %s in %s\n",
+                           filename + LUSTRE_VOLATILE_HDR_LEN,
+                           directory);
+               return -errno;
+       }
+       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;
+}