Whamcloud - gitweb
LU-10822 utils: stop bogus buffer overflow errors
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index 22a312b..a5c1347 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -41,6 +41,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <ctype.h>
 #include <mntent.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <libcfs/util/ioctl.h>
 #include <libcfs/util/param.h>
 #include <libcfs/util/string.h>
-#include <lnet/lnetctl.h>
+#include <linux/lnet/lnetctl.h>
 #include <lustre/lustreapi.h>
-#include <linux/lustre_ostid.h>
-#include <linux/lustre_ioctl.h>
+#include <linux/lustre/lustre_ostid.h>
+#include <linux/lustre/lustre_ioctl.h>
 #include "lustreapi_internal.h"
 
 static int llapi_msg_level = LLAPI_MSG_MAX;
+const char *liblustreapi_cmd;
 
 char *mdt_hash_name[] = { "none",
                          LMV_HASH_NAME_ALL_CHARS,
@@ -99,9 +101,24 @@ int llapi_msg_get_level(void)
        return llapi_msg_level;
 }
 
+void llapi_set_command_name(const char *cmd)
+{
+       liblustreapi_cmd = cmd;
+}
+
+void llapi_clear_command_name(void)
+{
+       liblustreapi_cmd = NULL;
+}
+
 static void error_callback_default(enum llapi_message_level level, int err,
                                   const char *fmt, va_list ap)
 {
+       if (liblustreapi_cmd != NULL)
+               fprintf(stderr, "%s %s: ", program_invocation_short_name,
+                       liblustreapi_cmd);
+       else
+               fprintf(stderr, "%s: ", program_invocation_short_name);
        vfprintf(stderr, fmt, ap);
        if (level & LLAPI_MSG_NO_ERRNO)
                fprintf(stderr, "\n");
@@ -112,6 +129,15 @@ static void error_callback_default(enum llapi_message_level level, int err,
 static void info_callback_default(enum llapi_message_level level, int err,
                                  const char *fmt, va_list ap)
 {
+       if (err != 0) {
+               if (liblustreapi_cmd != NULL) {
+                       fprintf(stdout, "%s %s: ",
+                               program_invocation_short_name,
+                               liblustreapi_cmd);
+               } else {
+                       fprintf(stdout, "%s: ", program_invocation_short_name);
+               }
+       }
        vfprintf(stdout, fmt, ap);
 }
 
@@ -254,7 +280,7 @@ int llapi_parse_size(const char *optarg, unsigned long long *size,
        return 0;
 }
 
-int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
+int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
 {
        struct obd_ioctl_data *overlay;
        char *ptr;
@@ -280,28 +306,28 @@ int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
        ptr = overlay->ioc_bulk;
        if (data->ioc_inlbuf1) {
                memcpy(ptr, data->ioc_inlbuf1, data->ioc_inllen1);
-               ptr += cfs_size_round(data->ioc_inllen1);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen1, 8);
        }
 
        if (data->ioc_inlbuf2) {
                memcpy(ptr, data->ioc_inlbuf2, data->ioc_inllen2);
-               ptr += cfs_size_round(data->ioc_inllen2);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen2, 8);
        }
 
        if (data->ioc_inlbuf3) {
                memcpy(ptr, data->ioc_inlbuf3, data->ioc_inllen3);
-               ptr += cfs_size_round(data->ioc_inllen3);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen3, 8);
        }
 
        if (data->ioc_inlbuf4) {
                memcpy(ptr, data->ioc_inlbuf4, data->ioc_inllen4);
-               ptr += cfs_size_round(data->ioc_inllen4);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen4, 8);
        }
 
        return 0;
 }
 
-int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
+int llapi_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 {
        struct obd_ioctl_data *overlay;
        char *ptr;
@@ -322,22 +348,22 @@ int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
        ptr = overlay->ioc_bulk;
        if (data->ioc_inlbuf1) {
                memcpy(data->ioc_inlbuf1, ptr, data->ioc_inllen1);
-               ptr += cfs_size_round(data->ioc_inllen1);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen1, 8);
        }
 
        if (data->ioc_inlbuf2) {
                memcpy(data->ioc_inlbuf2, ptr, data->ioc_inllen2);
-               ptr += cfs_size_round(data->ioc_inllen2);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen2, 8);
        }
 
        if (data->ioc_inlbuf3) {
                memcpy(data->ioc_inlbuf3, ptr, data->ioc_inllen3);
-               ptr += cfs_size_round(data->ioc_inllen3);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen3, 8);
        }
 
        if (data->ioc_inlbuf4) {
                memcpy(data->ioc_inlbuf4, ptr, data->ioc_inllen4);
-               ptr += cfs_size_round(data->ioc_inllen4);
+               ptr += __ALIGN_KERNEL(data->ioc_inllen4, 8);
        }
 
        return 0;
@@ -389,6 +415,33 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
        return 0;
 }
 
+int llapi_dir_stripe_limit_check(int stripe_offset, int stripe_count,
+                                int hash_type)
+{
+       int rc;
+
+       if (!llapi_dir_stripe_index_is_valid(stripe_offset)) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe offset %d",
+                               stripe_offset);
+               return rc;
+       }
+       if (!llapi_dir_stripe_count_is_valid(stripe_count)) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe count %d",
+                               stripe_count);
+               return rc;
+       }
+
+       if (!llapi_dir_hash_type_is_valid(hash_type)) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad hash type %d",
+                               hash_type);
+               return rc;
+       }
+       return 0;
+}
+
 /*
  * Trim a trailing newline from a string, if it exists.
  */
@@ -468,13 +521,13 @@ int llapi_get_agent_uuid(char *path, char *buf, size_t bufsize)
 }
 
 /*
- * if pool is NULL, search ostname in target_obd
+ * if pool is NULL, search tgtname in target_obd
  * if pool is not NULL:
  *  if pool not found returns errno < 0
- *  if ostname is NULL, returns 1 if pool is not empty and 0 if pool empty
- *  if ostname is not NULL, returns 1 if OST is in pool and 0 if not
+ *  if tgtname is NULL, returns 1 if pool is not empty and 0 if pool empty
+ *  if tgtname is not NULL, returns 1 if OST is in pool and 0 if not
  */
-int llapi_search_ost(char *fsname, char *poolname, char *ostname)
+int llapi_search_tgt(char *fsname, char *poolname, char *tgtname, bool is_mdt)
 {
        char buffer[PATH_MAX];
        size_t len = 0;
@@ -486,8 +539,8 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname)
        if (poolname == NULL && fsname == NULL)
                return -EINVAL;
 
-       if (ostname != NULL)
-               len = strlen(ostname);
+       if (tgtname != NULL)
+               len = strlen(tgtname);
 
        if (poolname == NULL && len == 0)
                return -EINVAL;
@@ -500,7 +553,7 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname)
                                 param.gl_pathv[0], poolname);
                }
        } else if (fsname != NULL) {
-               rc = get_lustre_param_path("lov", fsname,
+               rc = get_lustre_param_path(is_mdt ? "lmv" : "lov", fsname,
                                           FILTER_BY_FS_NAME,
                                           "target_obd", &param);
                if (rc == 0) {
@@ -514,33 +567,38 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname)
        if (rc)
                return rc;
 
-        fd = fopen(buffer, "r");
-        if (fd == NULL)
-                return -errno;
+       fd = fopen(buffer, "r");
+       if (fd == NULL)
+               return -errno;
 
-        while (fgets(buffer, sizeof(buffer), fd) != NULL) {
-                if (poolname == NULL) {
-                        char *ptr;
-                        /* Search for an ostname in the list of OSTs
-                         Line format is IDX: fsname-OSTxxxx_UUID STATUS */
-                        ptr = strchr(buffer, ' ');
-                        if ((ptr != NULL) &&
-                            (strncmp(ptr + 1, ostname, len) == 0)) {
-                                fclose(fd);
-                                return 1;
-                        }
-                } else {
-                        /* Search for an ostname in a pool,
-                         (or an existing non-empty pool if no ostname) */
-                        if ((ostname == NULL) ||
-                            (strncmp(buffer, ostname, len) == 0)) {
-                                fclose(fd);
-                                return 1;
-                        }
-                }
-        }
-        fclose(fd);
-        return 0;
+       while (fgets(buffer, sizeof(buffer), fd) != NULL) {
+               if (poolname == NULL) {
+                       char *ptr;
+                       /* Search for an tgtname in the list of targets
+                        * Line format is IDX: fsname-OST/MDTxxxx_UUID STATUS */
+                       ptr = strchr(buffer, ' ');
+                       if ((ptr != NULL) &&
+                           (strncmp(ptr + 1, tgtname, len) == 0)) {
+                               fclose(fd);
+                               return 1;
+                       }
+               } else {
+                       /* Search for an tgtname in a pool,
+                        * (or an existing non-empty pool if no tgtname) */
+                       if ((tgtname == NULL) ||
+                           (strncmp(buffer, tgtname, len) == 0)) {
+                               fclose(fd);
+                               return 1;
+                       }
+               }
+       }
+       fclose(fd);
+       return 0;
+}
+
+int llapi_search_ost(char *fsname, char *poolname, char *ostname)
+{
+       return llapi_search_tgt(fsname, poolname, ostname, false);
 }
 
 /**
@@ -771,29 +829,131 @@ int llapi_file_create_pool(const char *name, unsigned long long stripe_size,
         return 0;
 }
 
-int llapi_dir_set_default_lmv_stripe(const char *name, int stripe_offset,
-                                    int stripe_count, int stripe_pattern,
-                                    const char *pool_name)
+static int verify_dir_param(const char *name,
+                           const struct llapi_stripe_param *param)
 {
-       struct lmv_user_md      lum = { 0 };
-       int                     fd;
-       int                     rc = 0;
+       char fsname[MAX_OBD_NAME + 1] = { 0 };
+       char *pool_name = param->lsp_pool;
+       int rc;
+
+       /* Make sure we are on a Lustre file system */
+       rc = llapi_search_fsname(name, fsname);
+       if (rc) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "'%s' is not on a Lustre filesystem",
+                           name);
+               return rc;
+       }
 
-       lum.lum_magic = LMV_USER_MAGIC;
-       lum.lum_stripe_offset = stripe_offset;
-       lum.lum_stripe_count = stripe_count;
-       lum.lum_hash_type = stripe_pattern;
+       /* Check if the stripe pattern is sane. */
+       rc = llapi_dir_stripe_limit_check(param->lsp_stripe_offset,
+                                         param->lsp_stripe_count,
+                                         param->lsp_stripe_pattern);
+       if (rc != 0)
+               return rc;
+
+       /* Make sure we have a good pool */
        if (pool_name != NULL) {
-               if (strlen(pool_name) >= sizeof(lum.lum_pool_name)) {
-                       llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                 "error LL_IOC_LMV_SET_DEFAULT_STRIPE '%s'"
-                                 ": too large pool name: %s", name, pool_name);
-                       return -E2BIG;
+               /* in case user gives the full pool name <fsname>.<poolname>,
+                * strip the fsname */
+               char *ptr = strchr(pool_name, '.');
+
+               if (ptr != NULL) {
+                       *ptr = '\0';
+                       if (strcmp(pool_name, fsname) != 0) {
+                               *ptr = '.';
+                               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                       "Pool '%s' is not on filesystem '%s'",
+                                       pool_name, fsname);
+                               return -EINVAL;
+                       }
+                       pool_name = ptr + 1;
+               }
+
+               /* Make sure the pool exists and is non-empty */
+               rc = llapi_search_tgt(fsname, pool_name, NULL, true);
+               if (rc < 1) {
+                       char *err = rc == 0 ? "has no OSTs" : "does not exist";
+
+                       llapi_err_noerrno(LLAPI_MSG_ERROR, "pool '%s.%s' %s",
+                                         fsname, pool_name, err);
+                       return -EINVAL;
                }
-               strncpy(lum.lum_pool_name, pool_name,
-                       sizeof(lum.lum_pool_name));
        }
 
+       /* sanity check of target list */
+       if (param->lsp_is_specific) {
+               char mdtname[MAX_OBD_NAME + 1];
+               bool found = false;
+               int i;
+
+               for (i = 0; i < param->lsp_stripe_count; i++) {
+                       snprintf(mdtname, sizeof(mdtname), "%s-MDT%04x_UUID",
+                                fsname, param->lsp_tgts[i]);
+                       rc = llapi_search_tgt(fsname, pool_name, mdtname, true);
+                       if (rc <= 0) {
+                               if (rc == 0)
+                                       rc = -ENODEV;
+
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "%s: cannot find MDT %s in %s",
+                                           __func__, mdtname,
+                                           pool_name != NULL ?
+                                           "pool" : "system");
+                               return rc;
+                       }
+
+                       /* Make sure stripe offset is in MDT list. */
+                       if (param->lsp_tgts[i] == param->lsp_stripe_offset)
+                               found = true;
+               }
+               if (!found) {
+                       llapi_error(LLAPI_MSG_ERROR, -EINVAL,
+                                   "%s: stripe offset '%d' is not in the "
+                                   "target list",
+                                   __func__, param->lsp_stripe_offset);
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
+static inline void param2lmu(struct lmv_user_md *lmu,
+                            const struct llapi_stripe_param *param)
+{
+       lmu->lum_magic = param->lsp_is_specific ? LMV_USER_MAGIC_SPECIFIC :
+                                                 LMV_USER_MAGIC;
+       lmu->lum_stripe_count = param->lsp_stripe_count;
+       lmu->lum_stripe_offset = param->lsp_stripe_offset;
+       lmu->lum_hash_type = param->lsp_stripe_pattern;
+       if (param->lsp_pool != NULL)
+               strncpy(lmu->lum_pool_name, param->lsp_pool, LOV_MAXPOOLNAME);
+       if (param->lsp_is_specific) {
+               int i;
+
+               for (i = 0; i < param->lsp_stripe_count; i++)
+                       lmu->lum_objects[i].lum_mds = param->lsp_tgts[i];
+       }
+}
+
+int llapi_dir_set_default_lmv(const char *name,
+                             const struct llapi_stripe_param *param)
+{
+       struct lmv_user_md lmu = { 0 };
+       int fd;
+       int rc = 0;
+
+       rc = verify_dir_param(name, param);
+       if (rc)
+               return rc;
+
+       /* TODO: default lmv doesn't support specific targets yet */
+       if (param->lsp_is_specific)
+               return -EINVAL;
+
+       param2lmu(&lmu, param);
+
        fd = open(name, O_DIRECTORY | O_RDONLY);
        if (fd < 0) {
                rc = -errno;
@@ -801,7 +961,7 @@ int llapi_dir_set_default_lmv_stripe(const char *name, int stripe_offset,
                return rc;
        }
 
-       rc = ioctl(fd, LL_IOC_LMV_SET_DEFAULT_STRIPE, &lum);
+       rc = ioctl(fd, LL_IOC_LMV_SET_DEFAULT_STRIPE, &lmu);
        if (rc < 0) {
                char *errmsg = "stripe already set";
                rc = -errno;
@@ -816,11 +976,35 @@ int llapi_dir_set_default_lmv_stripe(const char *name, int stripe_offset,
        return rc;
 }
 
-int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
-                         int stripe_count, int stripe_pattern,
-                         const char *pool_name)
+int llapi_dir_set_default_lmv_stripe(const char *name, int stripe_offset,
+                                    int stripe_count, int stripe_pattern,
+                                    const char *pool_name)
 {
-       struct lmv_user_md lmu = { 0 };
+       const struct llapi_stripe_param param = {
+               .lsp_stripe_count = stripe_count,
+               .lsp_stripe_offset = stripe_offset,
+               .lsp_stripe_pattern = stripe_pattern,
+               .lsp_pool = (char *)pool_name
+       };
+
+       return llapi_dir_set_default_lmv(name, &param);
+}
+
+/**
+ * Create a Lustre directory.
+ *
+ * \param name     the name of the directory to be created
+ * \param mode     permission of the file if it is created, see mode in open(2)
+ * \param param    stripe pattern of the newly created directory
+ *
+ * \retval         0 on success
+ * \retval         negative errno on failure
+ */
+int llapi_dir_create(const char *name, mode_t mode,
+                    const struct llapi_stripe_param *param)
+{
+       struct lmv_user_md *lmu = NULL;
+       size_t lmu_size = sizeof(*lmu);
        struct obd_ioctl_data data = { 0 };
        char rawbuf[8192];
        char *buf = rawbuf;
@@ -828,38 +1012,44 @@ int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
        char *namepath = NULL;
        char *dir;
        char *filename;
-       int fd = -1;
-       int rc;
+       int fd, rc;
+
+       rc = verify_dir_param(name, param);
+       if (rc)
+               return rc;
+
+       if (param->lsp_is_specific)
+               lmu_size = lmv_user_md_size(param->lsp_stripe_count,
+                                           LMV_USER_MAGIC_SPECIFIC);
+
+       lmu = calloc(1, lmu_size);
+       if (lmu == NULL)
+               return -ENOMEM;
 
        dirpath = strdup(name);
-       namepath = strdup(name);
-       if (!dirpath || !namepath)
+       if (!dirpath) {
+               free(lmu);
                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));
+       namepath = strdup(name);
+       if (!namepath) {
+               free(namepath);
+               free(lmu);
+               return -ENOMEM;
        }
 
+       param2lmu(lmu, param);
+
        filename = basename(namepath);
        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);
+       data.ioc_inlbuf2 = (char *)lmu;
+       data.ioc_inllen2 = lmu_size;
        data.ioc_type = mode;
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                llapi_error(LLAPI_MSG_ERROR, rc,
                            "error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
@@ -886,11 +1076,27 @@ int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
        }
        close(fd);
 out:
-       free(dirpath);
        free(namepath);
+       free(dirpath);
+       free(lmu);
        return rc;
 }
 
+
+int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
+                         int stripe_count, int stripe_pattern,
+                         const char *pool_name)
+{
+       const struct llapi_stripe_param param = {
+               .lsp_stripe_count = stripe_count,
+               .lsp_stripe_offset = stripe_offset,
+               .lsp_stripe_pattern = stripe_pattern,
+               .lsp_pool = (char *)pool_name
+       };
+
+       return llapi_dir_create(name, mode, &param);
+}
+
 int llapi_direntry_remove(char *dname)
 {
        char *dirpath = NULL;
@@ -950,7 +1156,7 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
        if (fp == NULL) {
                rc = -EIO;
                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "setmntent(%s) failed", PROC_MOUNTS);
+                           "cannot retrieve filesystem mount point");
                return rc;
        }
         while (1) {
@@ -1018,7 +1224,8 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
                        if (fd < 0) {
                                rc = -errno;
                                llapi_error(LLAPI_MSG_ERROR, rc,
-                                           "error opening '%s'", mntdir);
+                                           "cannot open '%s': %s", mntdir,
+                                           strerror(-rc));
 
                        } else {
                                *outfd = fd;
@@ -1026,8 +1233,8 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
                }
        } else if (want & WANT_ERROR)
                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                 "can't find fs root for '%s': %d",
-                                 (want & WANT_PATH) ? fsname : path, rc);
+                                 "'%s' not on a mounted Lustre filesystem",
+                                 (want & WANT_PATH) ? fsname : path);
        return rc;
 }
 
@@ -1067,42 +1274,67 @@ int llapi_search_fsname(const char *pathname, char *fsname)
 
         path = realpath(pathname, NULL);
         if (path == NULL) {
-               char buf[PATH_MAX], *ptr;
+               char tmp[PATH_MAX - 1];
+               char buf[PATH_MAX];
+               char *ptr;
 
+               tmp[0] = '\0';
                buf[0] = '\0';
                if (pathname[0] != '/') {
                        /* Need an absolute path, but realpath() only works for
                         * pathnames that actually exist.  We go through the
                         * extra hurdle of dirname(getcwd() + pathname) in
                         * case the relative pathname contains ".." in it. */
-                       if (getcwd(buf, sizeof(buf) - 2) == NULL)
-                               return -errno;
-                       rc = strlcat(buf, "/", sizeof(buf));
-                       if (rc >= sizeof(buf))
-                               return -E2BIG;
+                       char realpath[PATH_MAX - 1];
+
+                       if (getcwd(realpath, sizeof(realpath) - 2) == NULL) {
+                               rc = -errno;
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "cannot get current working directory");
+                               return rc;
+                       }
+
+                       rc = snprintf(tmp, sizeof(tmp), "%s/", realpath);
+                       if (rc >= sizeof(tmp)) {
+                               rc = -E2BIG;
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "invalid parent path '%s'",
+                                           tmp);
+                               return rc;
+                       }
                }
-               rc = strlcat(buf, pathname, sizeof(buf));
-               if (rc >= sizeof(buf))
-                       return -E2BIG;
-                path = realpath(buf, NULL);
-                if (path == NULL) {
-                        ptr = strrchr(buf, '/');
-                        if (ptr == NULL)
-                                return -ENOENT;
-                        *ptr = '\0';
-                        path = realpath(buf, NULL);
-                        if (path == NULL) {
-                                rc = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, rc,
-                                            "pathname '%s' cannot expand",
-                                            pathname);
-                                return rc;
-                        }
-                }
-        }
-        rc = get_root_path(WANT_FSNAME | WANT_ERROR, fsname, NULL, path, -1);
-        free(path);
-        return rc;
+
+               rc = snprintf(buf, sizeof(buf), "%s%s", tmp, pathname);
+               if (rc >= sizeof(buf)) {
+                       rc = -E2BIG;
+                       llapi_error(LLAPI_MSG_ERROR, rc,
+                                   "invalid path '%s'", pathname);
+                       return rc;
+               }
+               path = realpath(buf, NULL);
+               if (path == NULL) {
+                       ptr = strrchr(buf, '/');
+                       if (ptr == NULL) {
+                               llapi_error(LLAPI_MSG_ERROR |
+                                           LLAPI_MSG_NO_ERRNO, 0,
+                                           "cannot resolve path '%s'",
+                                           buf);
+                               return -ENOENT;
+                       }
+                       *ptr = '\0';
+                       path = realpath(buf, NULL);
+                       if (path == NULL) {
+                               rc = -errno;
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "cannot resolve path '%s'",
+                                            pathname);
+                               return rc;
+                       }
+               }
+       }
+       rc = get_root_path(WANT_FSNAME | WANT_ERROR, fsname, NULL, path, -1);
+       free(path);
+       return rc;
 }
 
 int llapi_search_rootpath(char *pathname, const char *fsname)
@@ -1160,7 +1392,8 @@ int llapi_get_poolmembers(const char *poolname, char **members,
        /* name is FSNAME.POOLNAME */
        if (strlen(poolname) >= sizeof(fsname))
                return -EOVERFLOW;
-       strlcpy(fsname, poolname, sizeof(fsname));
+
+       snprintf(fsname, sizeof(fsname), "%s", poolname);
        pool = strchr(fsname, '.');
        if (pool == NULL)
                return -EINVAL;
@@ -1234,8 +1467,7 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
        char *fsname;
         char *ptr;
         DIR *dir;
-        struct dirent pool;
-        struct dirent *cookie = NULL;
+       struct dirent *pool;
         int rc = 0;
         unsigned int nb_entries = 0;
         unsigned int used = 0;
@@ -1287,20 +1519,16 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                goto free_path;
        }
 
-       while(1) {
-               rc = readdir_r(dir, &pool, &cookie);
-               if (rc != 0) {
+       do {
+               errno = 0;
+               pool = readdir(dir);
+               if (pool == NULL) {
                        rc = -errno;
-                       llapi_error(LLAPI_MSG_ERROR, rc,
-                                   "Error reading pool list for '%s'", name);
-                       goto free_path;
-               } else if ((rc == 0) && (cookie == NULL)) {
-                       /* end of directory */
-                       break;
+                       goto free_dir;
                }
 
                 /* ignore . and .. */
-                if (!strcmp(pool.d_name, ".") || !strcmp(pool.d_name, ".."))
+               if (!strcmp(pool->d_name, ".") || !strcmp(pool->d_name, ".."))
                         continue;
 
                 /* check output bounds */
@@ -1310,19 +1538,22 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                }
 
                 /* +2 for '.' and final '\0' */
-               if (used + strlen(pool.d_name) + strlen(fsname) + 2
+               if (used + strlen(pool->d_name) + strlen(fsname) + 2
                    > buffer_size) {
                        rc = -EOVERFLOW;
                        goto free_dir;
                }
 
-                sprintf(buffer + used, "%s.%s", fsname, pool.d_name);
+               sprintf(buffer + used, "%s.%s", fsname, pool->d_name);
                 poollist[nb_entries] = buffer + used;
-                used += strlen(pool.d_name) + strlen(fsname) + 2;
+               used += strlen(pool->d_name) + strlen(fsname) + 2;
                 nb_entries++;
-        }
+       } while (1);
 
 free_dir:
+       if (rc)
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Error reading pool list for '%s'", name);
        closedir(dir);
 free_path:
        cfs_free_param_data(&pathname);
@@ -1413,7 +1644,7 @@ static int common_param_init(struct find_param *param, char *path)
                lum_size = PATH_MAX + 1;
 
        param->fp_lum_size = lum_size;
-       param->fp_lmd = calloc(1, sizeof(lstat_t) + param->fp_lum_size);
+       param->fp_lmd = calloc(1, sizeof(lstat_t) + lum_size);
        if (param->fp_lmd == NULL) {
                llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
                            "error: allocation of %zu bytes for ioctl",
@@ -1516,64 +1747,95 @@ again:
        return ret;
 }
 
-static int get_lmd_info(char *path, DIR *parent, DIR *dir,
-                 struct lov_user_mds_data *lmd, int lumlen)
+int get_lmd_info_fd(char *path, int parent_fd, int dir_fd,
+                   void *lmdbuf, int lmdlen, enum get_lmd_info_type type)
 {
-        lstat_t *st = &lmd->lmd_st;
-        int ret = 0;
+       struct lov_user_mds_data *lmd = lmdbuf;
+       lstat_t *st = &lmd->lmd_st;
+       int ret = 0;
 
-        if (parent == NULL && dir == NULL)
-                return -EINVAL;
+       if (parent_fd < 0 && dir_fd < 0)
+               return -EINVAL;
+       if (type != GET_LMD_INFO && type != GET_LMD_STRIPE)
+               return -EINVAL;
 
-        if (dir) {
-                ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, (void *)lmd);
-        } else if (parent) {
+       if (dir_fd >= 0) {
+               /* LL_IOC_MDC_GETINFO operates on the current directory inode
+                * and returns struct lov_user_mds_data, while
+                * LL_IOC_LOV_GETSTRIPE returns only struct lov_user_md.
+                */
+               ret = ioctl(dir_fd, type == GET_LMD_INFO ? LL_IOC_MDC_GETINFO :
+                                                          LL_IOC_LOV_GETSTRIPE,
+                           lmdbuf);
+       } else if (parent_fd >= 0) {
                char *fname = strrchr(path, '/');
 
-               /* To avoid opening, locking, and closing each file on the
-                * client if that is not needed. The GETFILEINFO ioctl can
-                * be done on the patent dir with a single open for all
+               /* IOC_MDC_GETFILEINFO takes as input the filename (relative to
+                * the parent directory) and returns struct lov_user_mds_data,
+                * while IOC_MDC_GETFILESTRIPE returns only struct lov_user_md.
+                *
+                * This avoids opening, locking, and closing each file on the
+                * client if that is not needed. Multiple of these ioctl() can
+                * be done on the parent dir with a single open for all
                 * files in that directory, and it also doesn't pollute the
                 * client dcache with millions of dentries when traversing
-                * a large filesystem.  */
+                * a large filesystem.
+                */
                fname = (fname == NULL ? path : fname + 1);
-               /* retrieve needed file info */
-               strlcpy((char *)lmd, fname, lumlen);
-               ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
-        }
 
-        if (ret) {
-                if (errno == ENOTTY) {
-                        /* ioctl is not supported, it is not a lustre fs.
-                         * Do the regular lstat(2) instead. */
-                        ret = lstat_f(path, st);
-                        if (ret) {
-                                ret = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, ret,
-                                            "error: %s: lstat failed for %s",
-                                            __func__, path);
-                        }
-                } else if (errno == ENOENT) {
-                        ret = -errno;
-                        llapi_error(LLAPI_MSG_WARN, ret,
-                                    "warning: %s: %s does not exist",
-                                    __func__, path);
-                } else if (errno != EISDIR) {
-                        ret = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, ret,
-                                    "%s ioctl failed for %s.",
-                                    dir ? "LL_IOC_MDC_GETINFO" :
-                                    "IOC_MDC_GETFILEINFO", path);
-               } else {
+               ret = snprintf(lmdbuf, lmdlen, "%s", fname);
+               if (ret < 0)
+                       errno = -ret;
+               else if (ret >= lmdlen || ret++ == 0)
+                       errno = EINVAL;
+               else
+                       ret = ioctl(parent_fd, type == GET_LMD_INFO ?
+                                               IOC_MDC_GETFILEINFO :
+                                               IOC_MDC_GETFILESTRIPE, lmdbuf);
+       }
+
+       if (ret && type == GET_LMD_INFO) {
+               if (errno == ENOTTY) {
+                       /* ioctl is not supported, it is not a lustre fs.
+                        * Do the regular lstat(2) instead.
+                        */
+                       ret = lstat_f(path, st);
+                       if (ret) {
+                               ret = -errno;
+                               llapi_error(LLAPI_MSG_ERROR, ret,
+                                           "error: %s: lstat failed for %s",
+                                           __func__, path);
+                       }
+               } else if (errno == ENOENT) {
+                       ret = -errno;
+                       llapi_error(LLAPI_MSG_WARN, ret,
+                                   "warning: %s does not exist", path);
+               } else if (errno != EISDIR && errno != ENODATA) {
                        ret = -errno;
                        llapi_error(LLAPI_MSG_ERROR, ret,
-                                "error: %s: IOC_MDC_GETFILEINFO failed for %s",
-                                  __func__, path);
+                                   "%s ioctl failed for %s.",
+                                   dir_fd >= 0 ? "LL_IOC_MDC_GETINFO" :
+                                   "IOC_MDC_GETFILEINFO", path);
                }
        }
+
        return ret;
 }
 
+static int get_lmd_info(char *path, DIR *parent, DIR *dir, void *lmdbuf,
+                       int lmdlen, enum get_lmd_info_type type)
+{
+       int parent_fd = -1;
+       int dir_fd = -1;
+
+       if (parent)
+               parent_fd = dirfd(parent);
+       if (dir)
+               dir_fd = dirfd(dir);
+
+       return get_lmd_info_fd(path, parent_fd, dir_fd, lmdbuf, lmdlen, type);
+}
+
 static int llapi_semantic_traverse(char *path, int size, DIR *parent,
                                   semantic_func_t sem_init,
                                   semantic_func_t sem_fini, void *data,
@@ -1611,28 +1873,24 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
        while ((dent = readdir64(d)) != NULL) {
                int rc;
 
-                if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
-                        continue;
-
-                /* Don't traverse .lustre directory */
-                if (!(strcmp(dent->d_name, dot_lustre_name)))
-                        continue;
+               if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
+                       continue;
 
-                path[len] = 0;
-                if ((len + dent->d_reclen + 2) > size) {
-                        llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                          "error: %s: string buffer is too small",
-                                          __func__);
-                        break;
-                }
-                strcat(path, "/");
-                strcat(path, dent->d_name);
+               path[len] = 0;
+               if ((len + dent->d_reclen + 2) > size) {
+                       llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                         "error: %s: string buffer too small",
+                                         __func__);
+                       break;
+               }
+               strcat(path, "/");
+               strcat(path, dent->d_name);
 
-                if (dent->d_type == DT_UNKNOWN) {
+               if (dent->d_type == DT_UNKNOWN) {
                        lstat_t *st = &param->fp_lmd->lmd_st;
 
                        rc = get_lmd_info(path, d, NULL, param->fp_lmd,
-                                          param->fp_lum_size);
+                                         param->fp_lum_size, GET_LMD_INFO);
                        if (rc == 0)
                                dent->d_type = IFTODT(st->st_mode);
                        else if (ret == 0)
@@ -1695,7 +1953,7 @@ static int param_callback(char *path, semantic_func_t sem_init,
         if (!buf)
                 return -ENOMEM;
 
-       strlcpy(buf, path, PATH_MAX + 1);
+       snprintf(buf, PATH_MAX + 1, "%s", path);
         ret = common_param_init(param, buf);
         if (ret)
                 goto out;
@@ -2162,7 +2420,7 @@ int sattr_cache_get_defaults(const char *const fsname,
                 if (rc)
                         return rc;
         } else {
-               strlcpy(fsname_buf, fsname, sizeof(fsname_buf));
+               snprintf(fsname_buf, sizeof(fsname_buf), "%s", fsname);
         }
 
        if (strncmp(fsname_buf, cache.fsname, sizeof(fsname_buf) - 1) != 0) {
@@ -2178,7 +2436,7 @@ int sattr_cache_get_defaults(const char *const fsname,
                 cache.stripecount = tmp[0];
                 cache.stripesize = tmp[1];
                 cache.stripeoffset = tmp[2];
-               strlcpy(cache.fsname, fsname_buf, sizeof(cache.fsname));
+               snprintf(cache.fsname, sizeof(cache.fsname), "%s", fsname_buf);
         }
 
         if (scount)
@@ -2191,11 +2449,24 @@ int sattr_cache_get_defaults(const char *const fsname,
         return 0;
 }
 
+static char *layout2name(__u32 layout_pattern)
+{
+       if (layout_pattern == LOV_PATTERN_MDT)
+               return "mdt";
+       else if (layout_pattern == LOV_PATTERN_RAID0)
+               return "raid0";
+       else if (layout_pattern == (LOV_PATTERN_RAID0 | LOV_PATTERN_F_RELEASED))
+               return "released";
+       else
+               return "unknown";
+}
+
 enum lov_dump_flags {
        LDF_IS_DIR      = 0x0001,
        LDF_IS_RAW      = 0x0002,
        LDF_INDENT      = 0x0004,
        LDF_SKIP_OBJS   = 0x0008,
+       LDF_YAML        = 0x0010,
 };
 
 static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
@@ -2206,6 +2477,7 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
        bool is_dir = flags & LDF_IS_DIR;
        bool is_raw = flags & LDF_IS_RAW;
        bool indent = flags & LDF_INDENT;
+       bool yaml = flags & LDF_YAML;
        bool skip_objs = flags & LDF_SKIP_OBJS;
        char *prefix = is_dir ? "" : "lmm_";
        char *separator = "";
@@ -2218,7 +2490,8 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%s(Default) ", space);
        }
 
-       if (!indent && depth && path && ((verbose != VERBOSE_OBJID) || !is_dir))
+       if (!yaml && !indent && depth && path &&
+           ((verbose != VERBOSE_OBJID) || !is_dir))
                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
 
        if ((verbose & VERBOSE_DETAIL) && !is_dir) {
@@ -2232,6 +2505,10 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                             (uintmax_t)lmm_oi_id(&lum->lmm_oi));
        }
        if ((verbose & (VERBOSE_DETAIL | VERBOSE_DFID)) && !is_dir) {
+               __u64 seq;
+               __u32 oid;
+               __u32 ver;
+
                if (verbose & ~VERBOSE_DFID)
                        llapi_printf(LLAPI_MSG_NORMAL, "%slmm_fid:           ",
                                     space);
@@ -2252,13 +2529,17 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                 * separate lmm_oi_seq() and lmm_oi_id() routines for this.
                 *
                 * For newer layout types hopefully this will be a real FID. */
-               llapi_printf(LLAPI_MSG_NORMAL, DFID"\n",
-                            lmm_oi_seq(&lum->lmm_oi) == 0 ?
-                               lmm_oi_id(&lum->lmm_oi) :
-                               lmm_oi_seq(&lum->lmm_oi),
-                            lmm_oi_seq(&lum->lmm_oi) == 0 ?
-                               0 : (__u32)lmm_oi_id(&lum->lmm_oi),
-                            (__u32)(lmm_oi_id(&lum->lmm_oi) >> 32));
+               seq = lmm_oi_seq(&lum->lmm_oi) == 0 ?
+                       lmm_oi_id(&lum->lmm_oi) : lmm_oi_seq(&lum->lmm_oi);
+               oid = lmm_oi_seq(&lum->lmm_oi) == 0 ?
+                       0 : (__u32)lmm_oi_id(&lum->lmm_oi);
+               ver = (__u32)(lmm_oi_id(&lum->lmm_oi) >> 32);
+               if (yaml)
+                       llapi_printf(LLAPI_MSG_NORMAL, DFID_NOBRACE"\n",
+                                    seq, oid, ver);
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, DFID"\n",
+                                    seq, oid, ver);
        }
 
        if (verbose & VERBOSE_COUNT) {
@@ -2266,7 +2547,8 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_count:  ",
                                     space, prefix);
                if (is_dir) {
-                       if (!is_raw && lum->lmm_stripe_count == 0) {
+                       if (!is_raw && lum->lmm_stripe_count == 0 &&
+                           lov_pattern(lum->lmm_pattern) != LOV_PATTERN_MDT) {
                                unsigned int scount;
                                rc = sattr_cache_get_defaults(NULL, path,
                                                              &scount, NULL,
@@ -2288,7 +2570,10 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%hd",
                                     (__s16)lum->lmm_stripe_count);
                }
-               separator = is_dir ? " " : "\n";
+               if (!yaml && is_dir)
+                       separator = " ";
+               else
+                       separator = "\n";
        }
 
        if (verbose & VERBOSE_SIZE) {
@@ -2310,16 +2595,23 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%u",
                                     lum->lmm_stripe_size);
                }
-               separator = is_dir ? " " : "\n";
+               if (!yaml && is_dir)
+                       separator = " ";
+               else
+                       separator = "\n";
        }
 
-       if ((verbose & VERBOSE_LAYOUT) && !is_dir) {
+       if ((verbose & VERBOSE_LAYOUT)) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
                if (verbose & ~VERBOSE_LAYOUT)
                        llapi_printf(LLAPI_MSG_NORMAL, "%s%spattern:       ",
                                     space, prefix);
-               llapi_printf(LLAPI_MSG_NORMAL, "%.x", lum->lmm_pattern);
-               separator = "\n";
+               if (lov_pattern_supported(lum->lmm_pattern))
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s",
+                                    layout2name(lum->lmm_pattern));
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, "%x", lum->lmm_pattern);
+               separator = (!yaml && is_dir) ? " " : "\n";
        }
 
        if ((verbose & VERBOSE_GENERATION) && !is_dir) {
@@ -2328,7 +2620,7 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%s%slayout_gen:    ",
                                     space, prefix);
                llapi_printf(LLAPI_MSG_NORMAL, "%u",
-                            (int)lum->lmm_layout_gen);
+                            skip_objs ? 0 : (int)lum->lmm_layout_gen);
                separator = "\n";
        }
 
@@ -2342,10 +2634,15 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                                     lum->lmm_stripe_offset ==
                                     (typeof(lum->lmm_stripe_offset))(-1) ? -1 :
                                     lum->lmm_stripe_offset);
+               else if (lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)
+                       llapi_printf(LLAPI_MSG_NORMAL, "0");
                else
                        llapi_printf(LLAPI_MSG_NORMAL, "%u",
                                     objects[0].l_ost_idx);
-               separator = is_dir ? " " : "\n";
+               if (!yaml && is_dir)
+                       separator = " ";
+               else
+                       separator = "\n";
        }
 
        if ((verbose & VERBOSE_POOL) && pool_name && (pool_name[0] != '\0')) {
@@ -2354,7 +2651,10 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                        llapi_printf(LLAPI_MSG_NORMAL, "%s%spool:          ",
                                     space, prefix);
                llapi_printf(LLAPI_MSG_NORMAL, "%s", pool_name);
-               separator = is_dir ? " " : "\n";
+               if (!yaml && is_dir)
+                       separator = " ";
+               else
+                       separator = "\n";
        }
 
        if (strlen(separator) != 0)
@@ -2369,30 +2669,35 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
        bool is_dir = flags & LDF_IS_DIR;
        bool indent = flags & LDF_INDENT;
        bool skip_objs = flags & LDF_SKIP_OBJS;
-       int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
+       bool yaml = flags & LDF_YAML;
+       bool obdstripe = obdindex == OBD_NOT_FOUND;
+       int i;
 
-       if (!obdstripe) {
+       if (!obdstripe && !skip_objs) {
                for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
                        if (obdindex == objects[i].l_ost_idx) {
-                               obdstripe = 1;
+                               obdstripe = true;
                                break;
                        }
                }
        }
 
-       if (obdstripe == 0)
+       if (!obdstripe)
                return;
 
        lov_dump_user_lmm_header(lum, path, objects, header, depth, pool_name,
                                 flags);
 
        if (!is_dir && !skip_objs && (header & VERBOSE_OBJID) &&
-           !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
+           !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED ||
+             lov_pattern(lum->lmm_pattern) == LOV_PATTERN_MDT)) {
                char *space = "      - ";
 
                if (indent)
                        llapi_printf(LLAPI_MSG_NORMAL,
                                     "%6slmm_objects:\n", " ");
+               else if (yaml)
+                       llapi_printf(LLAPI_MSG_NORMAL, "lmm_objects:\n");
                else
                        llapi_printf(LLAPI_MSG_NORMAL,
                                "\tobdidx\t\t objid\t\t objid\t\t group\n");
@@ -2405,7 +2710,16 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                        if (obdindex != OBD_NOT_FOUND && obdindex != idx)
                                continue;
 
-                       if (indent) {
+                       if (yaml) {
+                               struct lu_fid fid = { 0 };
+
+                               ostid_to_fid(&fid, &objects[i].l_ost_oi, idx);
+                               llapi_printf(LLAPI_MSG_NORMAL,
+                                   "%sl_ost_idx: %d\n", space, idx);
+                               llapi_printf(LLAPI_MSG_NORMAL,
+                                   "%8sl_fid:     "DFID_NOBRACE"\n",
+                                   " ", PFID(&fid));
+                       } else if (indent) {
                                struct lu_fid fid = { 0 };
 
                                ostid_to_fid(&fid, &objects[i].l_ost_oi, idx);
@@ -2424,35 +2738,38 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                                             obdindex == idx ? " *" : "");
                        }
                }
-               llapi_printf(LLAPI_MSG_NORMAL, "\n");
        }
+       llapi_printf(LLAPI_MSG_NORMAL, "\n");
 }
 
 void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
-                      char *path, int obdindex, int depth, int verbose)
+                      char *path, int obdindex, int depth, int verbose,
+                      enum lov_dump_flags flags)
 {
        struct lmv_user_mds_data *objects = lum->lum_objects;
        char *prefix = lum->lum_magic == LMV_USER_MAGIC ? "(Default)" : "";
-       int i, obdstripe = 0;
        char *separator = "";
+       bool yaml = flags & LDF_YAML;
+       bool obdstripe = false;
+       int i;
 
        if (obdindex != OBD_NOT_FOUND) {
                if (lum->lum_stripe_count == 0) {
                        if (obdindex == lum->lum_stripe_offset)
-                               obdstripe = 1;
+                               obdstripe = true;
                } else {
                        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;
+                                       obdstripe = true;
                                        break;
                                }
                        }
                }
        } else {
-               obdstripe = 1;
+               obdstripe = true;
        }
 
        if (!obdstripe)
@@ -2476,7 +2793,7 @@ void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
                        llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_count: ");
                llapi_printf(LLAPI_MSG_NORMAL, "%u",
                             (int)lum->lum_stripe_count);
-               if (verbose & VERBOSE_OFFSET)
+               if ((verbose & VERBOSE_OFFSET) && !yaml)
                        separator = " ";
                else
                        separator = "\n";
@@ -2488,7 +2805,7 @@ void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
                        llapi_printf(LLAPI_MSG_NORMAL, "lmv_stripe_offset: ");
                llapi_printf(LLAPI_MSG_NORMAL, "%d",
                             (int)lum->lum_stripe_offset);
-               if (verbose & VERBOSE_HASH_TYPE)
+               if (verbose & VERBOSE_HASH_TYPE && !yaml)
                        separator = " ";
                else
                        separator = "\n";
@@ -2511,7 +2828,7 @@ void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
 
        if (verbose & VERBOSE_OBJID && lum->lum_magic != LMV_USER_MAGIC) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
-               if (obdstripe == 1 && lum->lum_stripe_count > 0)
+               if (lum->lum_stripe_count > 0)
                        llapi_printf(LLAPI_MSG_NORMAL,
                                     "mdtidx\t\t FID[seq:oid:ver]\n");
                for (i = 0; i < lum->lum_stripe_count; i++) {
@@ -2546,40 +2863,84 @@ static void lov_dump_comp_v1_header(struct find_param *param, char *path,
        struct lov_comp_md_v1 *comp_v1 = (void *)&param->fp_lmd->lmd_lmm;
        int depth = param->fp_max_depth;
        int verbose = param->fp_verbose;
+       bool yaml = flags & LDF_YAML;
 
        if (depth && path && ((verbose != VERBOSE_OBJID) ||
-                             !(flags & LDF_IS_DIR)))
+                             !(flags & LDF_IS_DIR)) && !yaml)
                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
 
        if (verbose & VERBOSE_DETAIL) {
                llapi_printf(LLAPI_MSG_NORMAL, "composite_header:\n");
-               llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_magic:       0x%08X\n",
+               llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_magic:         0x%08X\n",
                             " ", comp_v1->lcm_magic);
-               llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_size:        %u\n",
+               llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_size:          %u\n",
                             " ", comp_v1->lcm_size);
-               llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_flags:       %u\n",
-                            " ", comp_v1->lcm_flags);
+               if (flags & LDF_IS_DIR)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%2slcm_flags:         %s\n", " ",
+                                    comp_v1->lcm_mirror_count > 0 ?
+                                                       "mirrored" : "");
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%2slcm_flags:         %s\n", " ",
+                               llapi_layout_flags_string(comp_v1->lcm_flags));
        }
 
        if (verbose & VERBOSE_GENERATION) {
                if (verbose & ~VERBOSE_GENERATION)
-                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_layout_gen:  ",
+                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_layout_gen:    ",
                                     " ");
                llapi_printf(LLAPI_MSG_NORMAL, "%u\n", comp_v1->lcm_layout_gen);
        }
 
+       if (verbose & VERBOSE_MIRROR_COUNT) {
+               if (verbose & ~VERBOSE_MIRROR_COUNT)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_mirror_count:  ",
+                                    " ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%u\n",
+                            comp_v1->lcm_magic == LOV_USER_MAGIC_COMP_V1 ?
+                            comp_v1->lcm_mirror_count + 1 : 1);
+       }
+
        if (verbose & VERBOSE_COMP_COUNT) {
                if (verbose & ~VERBOSE_COMP_COUNT)
-                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_entry_count: ",
+                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_entry_count:   ",
                                     " ");
                llapi_printf(LLAPI_MSG_NORMAL, "%u\n",
-                            comp_v1->lcm_entry_count);
+                            comp_v1->lcm_magic == LOV_USER_MAGIC_COMP_V1 ?
+                            comp_v1->lcm_entry_count : 0);
        }
 
-       if (verbose & VERBOSE_DETAIL)
+       if (verbose & VERBOSE_DETAIL && !yaml)
                llapi_printf(LLAPI_MSG_NORMAL, "components:\n");
 }
 
+static void lcme_flags2str(__u32 comp_flags)
+{
+       bool found = false;
+       int i = 0;
+
+       if (!comp_flags) {
+               llapi_printf(LLAPI_MSG_NORMAL, "0");
+               return;
+       }
+       for (i = 0; i < ARRAY_SIZE(comp_flags_table); i++) {
+               if (comp_flags & comp_flags_table[i].cfn_flag) {
+                       if (found)
+                               llapi_printf(LLAPI_MSG_NORMAL, ",");
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s",
+                                    comp_flags_table[i].cfn_name);
+                       comp_flags &= ~comp_flags_table[i].cfn_flag;
+                       found = true;
+               }
+       }
+       if (comp_flags) {
+               if (found)
+                       llapi_printf(LLAPI_MSG_NORMAL, ",");
+               llapi_printf(LLAPI_MSG_NORMAL, "%#x", comp_flags);
+       }
+}
+
 static void lov_dump_comp_v1_entry(struct find_param *param,
                                   enum lov_dump_flags flags, int index)
 {
@@ -2587,29 +2948,46 @@ static void lov_dump_comp_v1_entry(struct find_param *param,
        struct lov_comp_md_entry_v1 *entry;
        char *separator = "";
        int verbose = param->fp_verbose;
+       bool yaml = flags & LDF_YAML;
 
        entry = &comp_v1->lcm_entries[index];
 
+       if (yaml)
+               llapi_printf(LLAPI_MSG_NORMAL, "%2scomponent%d:\n", " ", index);
+
        if (verbose & VERBOSE_COMP_ID) {
-               if (verbose & VERBOSE_DETAIL)
+               if (verbose & VERBOSE_DETAIL && !yaml)
                        llapi_printf(LLAPI_MSG_NORMAL,
                                     "%slcme_id:             ", "  - ");
                else if (verbose & ~VERBOSE_COMP_ID)
                        llapi_printf(LLAPI_MSG_NORMAL,
                                     "%4slcme_id:             ", " ");
-               if (!(flags & LDF_IS_DIR))
+               if (entry->lcme_id != LCME_ID_INVAL)
                        llapi_printf(LLAPI_MSG_NORMAL, "%u", entry->lcme_id);
                else
                        llapi_printf(LLAPI_MSG_NORMAL, "N/A");
                separator = "\n";
        }
 
+       if (verbose & VERBOSE_MIRROR_ID) {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               if (verbose & ~VERBOSE_MIRROR_ID)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%4slcme_mirror_id:      ", " ");
+               if (entry->lcme_id != LCME_ID_INVAL)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%u",
+                                    mirror_id_of(entry->lcme_id));
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, "N/A");
+               separator = "\n";
+       }
+
        if (verbose & VERBOSE_COMP_FLAGS) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
                if (verbose & ~VERBOSE_COMP_FLAGS)
                        llapi_printf(LLAPI_MSG_NORMAL,
                                     "%4slcme_flags:          ", " ");
-               llapi_printf(LLAPI_MSG_NORMAL, "%#x", entry->lcme_flags);
+               lcme_flags2str(entry->lcme_flags);
                separator = "\n";
        }
 
@@ -2636,7 +3014,10 @@ static void lov_dump_comp_v1_entry(struct find_param *param,
                separator = "\n";
        }
 
-       if (verbose & VERBOSE_DETAIL) {
+       if (yaml) {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               llapi_printf(LLAPI_MSG_NORMAL, "%4ssub_layout:\n", " ");
+       } else if (verbose & VERBOSE_DETAIL) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
                llapi_printf(LLAPI_MSG_NORMAL, "%4slcme_offset:         %u\n",
                             " ", entry->lcme_offset);
@@ -2712,12 +3093,52 @@ static inline void
 lov_v1v3_pool_name(struct lov_user_md *v1, char *pool_name)
 {
        if (v1->lmm_magic == LOV_USER_MAGIC_V3)
-               strlcpy(pool_name, ((struct lov_user_md_v3 *)v1)->lmm_pool_name,
-                       LOV_MAXPOOLNAME);
+               snprintf(pool_name, LOV_MAXPOOLNAME, "%s",
+                        ((struct lov_user_md_v3 *)v1)->lmm_pool_name);
        else
                pool_name[0] = '\0';
 }
 
+static inline bool
+print_last_init_comp(struct find_param *param)
+{
+       /* print all component info */
+       if ((param->fp_verbose & VERBOSE_DEFAULT) == VERBOSE_DEFAULT)
+               return false;
+
+       /* print specific component info */
+       if (param->fp_check_comp_id || param->fp_check_comp_flags ||
+           param->fp_check_comp_start || param->fp_check_comp_end)
+               return false;
+
+       return true;
+}
+
+static int find_comp_end_cmp(unsigned long long end, struct find_param *param)
+{
+       int match;
+
+       if (param->fp_comp_end == LUSTRE_EOF) {
+               if (param->fp_comp_end_sign == 0) /* equal to EOF */
+                       match = end == LUSTRE_EOF ? 1 : -1;
+               else if (param->fp_comp_end_sign > 0) /* at most EOF */
+                       match = end == LUSTRE_EOF ? -1 : 1;
+               else /* at least EOF */
+                       match = -1;
+               if (param->fp_exclude_comp_end)
+                       match = ~match + 1;
+       } else {
+               unsigned long long margin;
+
+               margin = end == LUSTRE_EOF ? 0 : param->fp_comp_end_units;
+               match = find_value_cmp(end, param->fp_comp_end,
+                                      param->fp_comp_end_sign,
+                                      param->fp_exclude_comp_end, margin, 0);
+       }
+
+       return match;
+}
+
 /**
  * An example of "getstripe -v" for a two components PFL file:
  *
@@ -2741,7 +3162,7 @@ lov_v1v3_pool_name(struct lov_user_md *v1, char *pool_name)
  *     lmm_fid:           [0x200000401:0x1:0x0]
  *     lmm_stripe_count:  1
  *     lmm_stripe_size:   1048576
- *     lmm_pattern:       1
+ *     lmm_pattern:       raid0
  *     lmm_layout_gen:    0
  *     lmm_stripe_offset: 0
  *     lmm_objects:
@@ -2760,7 +3181,7 @@ lov_v1v3_pool_name(struct lov_user_md *v1, char *pool_name)
  *     lmm_fid:           [0x200000401:0x1:0x0]
  *     lmm_stripe_count:  2
  *     lmm_stripe_size:   1048576
- *     lmm_pattern:       1
+ *     lmm_pattern:       raid0
  *     lmm_layout_gen:    0
  *     lmm_stripe_offset: 1
  *     lmm_objects:
@@ -2776,10 +3197,11 @@ static void lov_dump_comp_v1(struct find_param *param, char *path,
        struct lov_user_md_v1 *v1;
        char pool_name[LOV_MAXPOOLNAME + 1];
        int obdindex = param->fp_obd_index;
-       int i, j, match, obdstripe = 0;
+       int i, j, match;
+       bool obdstripe = false;
 
        if (obdindex != OBD_NOT_FOUND) {
-               for (i = 0; !(flags & LDF_IS_DIR) &&
+               for (i = 0; !(flags & LDF_IS_DIR) && !obdstripe &&
                            i < comp_v1->lcm_entry_count; i++) {
                        if (!(comp_v1->lcm_entries[i].lcme_flags &
                              LCME_FL_INIT))
@@ -2790,16 +3212,16 @@ static void lov_dump_comp_v1(struct find_param *param, char *path,
 
                        for (j = 0; j < v1->lmm_stripe_count; j++) {
                                if (obdindex == objects[j].l_ost_idx) {
-                                       obdstripe = 1;
+                                       obdstripe = true;
                                        break;
                                }
                        }
                }
        } else {
-               obdstripe = 1;
+               obdstripe = true;
        }
 
-       if (obdstripe == 0)
+       if (!obdstripe)
                return;
 
        lov_dump_comp_v1_header(param, path, flags);
@@ -2809,14 +3231,12 @@ static void lov_dump_comp_v1(struct find_param *param, char *path,
        for (i = 0; i < comp_v1->lcm_entry_count; i++) {
                entry = &comp_v1->lcm_entries[i];
 
-               if (param->fp_check_comp_flags &&
-                   !(param->fp_comp_flags & entry->lcme_flags))
-                       continue;
-
-               if (entry->lcme_flags & LCME_FL_INIT)
-                       flags &= ~LDF_SKIP_OBJS;
-               else
-                       flags |= LDF_SKIP_OBJS;
+               if (param->fp_check_comp_flags) {
+                       if (((param->fp_comp_flags & entry->lcme_flags) !=
+                            param->fp_comp_flags) ||
+                           (param->fp_comp_neg_flags & entry->lcme_flags))
+                               continue;
+               }
 
                if (param->fp_check_comp_id &&
                    param->fp_comp_id != entry->lcme_id)
@@ -2833,19 +3253,65 @@ static void lov_dump_comp_v1(struct find_param *param, char *path,
                }
 
                if (param->fp_check_comp_end) {
-                       unsigned long long margin;
-
-                       margin = entry->lcme_extent.e_end == LUSTRE_EOF ?
-                               0 : param->fp_comp_end_units;
-
-                       match = find_value_cmp(entry->lcme_extent.e_end,
-                                              param->fp_comp_end,
-                                              param->fp_comp_end_sign,
-                                              0, margin, 0);
+                       match = find_comp_end_cmp(entry->lcme_extent.e_end,
+                                                 param);
                        if (match == -1)
                                continue;
                }
 
+               if (print_last_init_comp(param)) {
+                       /**
+                        * if part of stripe info is needed, we'd print only
+                        * the last instantiated component info.
+                        */
+                       if (entry->lcme_flags & LCME_FL_INIT)
+                               continue;
+                       else
+                               break;
+               }
+
+               if (entry->lcme_flags & LCME_FL_INIT) {
+                       if (obdindex != OBD_NOT_FOUND) {
+                               flags |= LDF_SKIP_OBJS;
+                               v1 = lov_comp_entry(comp_v1, i);
+                               objects = lov_v1v3_objects(v1);
+
+                               for (j = 0; j < v1->lmm_stripe_count; j++) {
+                                       if (obdindex == objects[j].l_ost_idx) {
+                                               flags &= ~LDF_SKIP_OBJS;
+                                               break;
+                                       }
+                               }
+                       } else {
+                               flags &= ~LDF_SKIP_OBJS;
+                       }
+               } else {
+                       flags |= LDF_SKIP_OBJS;
+               }
+
+               if (obdindex != OBD_NOT_FOUND && (flags & LDF_SKIP_OBJS))
+                       continue;
+               lov_dump_comp_v1_entry(param, flags, i);
+
+               v1 = lov_comp_entry(comp_v1, i);
+               objects = lov_v1v3_objects(v1);
+               lov_v1v3_pool_name(v1, pool_name);
+
+               lov_dump_user_lmm_v1v3(v1, pool_name, objects, path, obdindex,
+                                      param->fp_max_depth, param->fp_verbose,
+                                      flags);
+       }
+       if (print_last_init_comp(param)) {
+               /**
+                * directory layout contains only layout template, print the
+                * last component.
+                */
+               if (i == 0)
+                       i = comp_v1->lcm_entry_count - 1;
+               else
+                       i--;
+               flags &= ~LDF_SKIP_OBJS;
+
                lov_dump_comp_v1_entry(param, flags, i);
 
                v1 = lov_comp_entry(comp_v1, i);
@@ -2858,49 +3324,136 @@ static void lov_dump_comp_v1(struct find_param *param, char *path,
        }
 }
 
-static void llapi_lov_dump_user_lmm(struct find_param *param, char *path,
-                                   enum lov_dump_flags flags)
+#define VERBOSE_COMP_OPTS      (VERBOSE_COMP_COUNT | VERBOSE_COMP_ID | \
+                                VERBOSE_COMP_START | VERBOSE_COMP_END | \
+                                VERBOSE_COMP_FLAGS)
+
+static inline bool has_any_comp_options(struct find_param *param)
 {
-       __u32 magic;
+       int verbose = param->fp_verbose;
 
-       if (param->fp_get_lmv || param->fp_get_default_lmv)
-               magic = (__u32)param->fp_lmv_md->lum_magic;
-       else
-               magic = *(__u32 *)&param->fp_lmd->lmd_lmm; /* lum->lmm_magic */
+       if (param->fp_check_comp_id || param->fp_check_comp_count ||
+           param->fp_check_comp_start || param->fp_check_comp_end ||
+           param->fp_check_comp_flags)
+               return true;
 
-       if (param->fp_raw)
-               flags |= LDF_IS_RAW;
+       /* show full layout information, not component specific */
+       if ((verbose & ~VERBOSE_DETAIL) == VERBOSE_DEFAULT)
+               return false;
 
-       switch (magic) {
-       case LOV_USER_MAGIC_V1:
+       return verbose & VERBOSE_COMP_OPTS;
+}
+
+struct lov_user_mds_data *lov_forge_comp_v1(struct lov_user_mds_data *orig,
+                                           bool is_dir)
+{
+       struct lov_user_md *lum = &orig->lmd_lmm;
+       struct lov_user_mds_data *new;
+       struct lov_comp_md_v1 *comp_v1;
+       struct lov_comp_md_entry_v1 *ent;
+       int lum_off = sizeof(*comp_v1) + sizeof(*ent);
+       int lum_size = lov_user_md_size(is_dir ? 0 : lum->lmm_stripe_count,
+                                       lum->lmm_magic);
+
+       new = malloc(sizeof(lstat_t) + lum_off + lum_size);
+       if (new == NULL) {
+               llapi_printf(LLAPI_MSG_NORMAL, "out of memory\n");
+               return new;
+       }
+
+       memcpy(new, orig, sizeof(lstat_t));
+
+       comp_v1 = (struct lov_comp_md_v1 *)&new->lmd_lmm;
+       comp_v1->lcm_magic = lum->lmm_magic;
+       comp_v1->lcm_size = lum_off + lum_size;
+       comp_v1->lcm_layout_gen = is_dir ? 0 : lum->lmm_layout_gen;
+       comp_v1->lcm_flags = 0;
+       comp_v1->lcm_entry_count = 1;
+
+       ent = &comp_v1->lcm_entries[0];
+       ent->lcme_id = 0;
+       ent->lcme_flags = is_dir ? 0 : LCME_FL_INIT;
+       ent->lcme_extent.e_start = 0;
+       ent->lcme_extent.e_end = LUSTRE_EOF;
+       ent->lcme_offset = lum_off;
+       ent->lcme_size = lum_size;
+
+       memcpy((char *)comp_v1 + lum_off, lum, lum_size);
+
+       return new;
+}
+
+static void lov_dump_plain_user_lmm(struct find_param *param, char *path,
+                                   enum lov_dump_flags flags)
+{
+       __u32 magic = *(__u32 *)&param->fp_lmd->lmd_lmm;
+
+       if (has_any_comp_options(param)) {
+               struct lov_user_mds_data *new_lmd, *orig_lmd;
+
+               orig_lmd = param->fp_lmd;
+               new_lmd = lov_forge_comp_v1(orig_lmd, flags & LDF_IS_DIR);
+               if (new_lmd != NULL) {
+                       param->fp_lmd = new_lmd;
+                       lov_dump_comp_v1(param, path, flags);
+                       param->fp_lmd = orig_lmd;
+                       free(new_lmd);
+               }
+               return;
+       }
+
+       if (magic == LOV_USER_MAGIC_V1) {
                lov_dump_user_lmm_v1v3(&param->fp_lmd->lmd_lmm, NULL,
                                       param->fp_lmd->lmd_lmm.lmm_objects,
                                       path, param->fp_obd_index,
                                       param->fp_max_depth, param->fp_verbose,
                                       flags);
-               break;
-       case LOV_USER_MAGIC_V3: {
+       } else {
                char pool_name[LOV_MAXPOOLNAME + 1];
                struct lov_user_ost_data_v1 *objects;
                struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_lmd->lmd_lmm;
 
-               strlcpy(pool_name, lmmv3->lmm_pool_name, sizeof(pool_name));
+               snprintf(pool_name, sizeof(pool_name), "%s",
+                        lmmv3->lmm_pool_name);
                objects = lmmv3->lmm_objects;
                lov_dump_user_lmm_v1v3(&param->fp_lmd->lmd_lmm, pool_name,
                                       objects, path, param->fp_obd_index,
                                       param->fp_max_depth, param->fp_verbose,
                                       flags);
+       }
+}
+
+static void llapi_lov_dump_user_lmm(struct find_param *param, char *path,
+                                   enum lov_dump_flags flags)
+{
+       __u32 magic;
+
+       if (param->fp_get_lmv || param->fp_get_default_lmv)
+               magic = (__u32)param->fp_lmv_md->lum_magic;
+       else
+               magic = *(__u32 *)&param->fp_lmd->lmd_lmm; /* lum->lmm_magic */
+
+       if (param->fp_raw)
+               flags |= LDF_IS_RAW;
+       if (param->fp_yaml)
+               flags |= LDF_YAML;
+
+       switch (magic) {
+       case LOV_USER_MAGIC_V1:
+       case LOV_USER_MAGIC_V3:
+               lov_dump_plain_user_lmm(param, path, flags);
                break;
-        }
        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;
-               strlcpy(pool_name, lum->lum_pool_name, sizeof(pool_name));
+               snprintf(pool_name, sizeof(pool_name), "%s",
+                        lum->lum_pool_name);
                lmv_dump_user_lmm(lum, pool_name, path, param->fp_obd_index,
-                                 param->fp_max_depth, param->fp_verbose);
+                                 param->fp_max_depth, param->fp_verbose,
+                                 flags);
                break;
        }
        case LOV_USER_MAGIC_COMP_V1:
@@ -2973,7 +3526,7 @@ int llapi_file_lookup(int dirfd, const char *name)
         data.ioc_inlbuf1 = (char *)name;
         data.ioc_inllen1 = strlen(name) + 1;
 
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 llapi_error(LLAPI_MSG_ERROR, rc,
                             "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d",
@@ -3071,6 +3624,9 @@ static int check_obd_match(struct find_param *param)
                objects = lov_v1v3_objects(v1);
 
                for (j = 0; j < v1->lmm_stripe_count; j++) {
+                       if (comp_v1 && !(comp_v1->lcm_entries[i].lcme_flags &
+                                        LCME_FL_INIT))
+                               continue;
                        for (k = 0; k < param->fp_num_obds; k++) {
                                if (param->fp_obd_indexes[k] ==
                                    objects[j].l_ost_idx)
@@ -3258,104 +3814,112 @@ static int find_check_pool(struct find_param *param)
 
 static int find_check_comp_options(struct find_param *param)
 {
-       struct lov_comp_md_v1 *comp_v1;
+       lstat_t *st = &param->fp_lmd->lmd_st;
+       struct lov_comp_md_v1 *comp_v1, *forged_v1 = NULL;
        struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
        struct lov_comp_md_entry_v1 *entry;
-       int i, ret;
-
-       if (v1->lmm_magic != LOV_USER_MAGIC_COMP_V1) {
-               if ((param->fp_check_comp_count &&
-                    !param->fp_exclude_comp_count) ||
-                   (param->fp_check_comp_flags &&
-                    !param->fp_exclude_comp_flags) ||
-                   (param->fp_check_comp_start &&
-                    !param->fp_exclude_comp_start) ||
-                   (param->fp_check_comp_end &&
-                    !param->fp_exclude_comp_end))
+       int i, ret = 0;
+
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+       } else {
+               forged_v1 = malloc(sizeof(*forged_v1) + sizeof(*entry));
+               if (forged_v1 == NULL)
                        return -1;
-               else
-                       return 1;
+               comp_v1 = forged_v1;
+               comp_v1->lcm_entry_count = 1;
+               entry = &comp_v1->lcm_entries[0];
+               entry->lcme_flags = S_ISDIR(st->st_mode) ? 0 : LCME_FL_INIT;
+               entry->lcme_extent.e_start = 0;
+               entry->lcme_extent.e_end = LUSTRE_EOF;
        }
 
-       comp_v1 = (struct lov_comp_md_v1 *)v1;
+       /* invalid case, don't match for any kind of search. */
+       if (comp_v1->lcm_entry_count == 0) {
+               ret = -1;
+               goto out;
+       }
 
        if (param->fp_check_comp_count) {
-               ret = find_value_cmp(comp_v1->lcm_entry_count,
+               ret = find_value_cmp(forged_v1 ? 0 : comp_v1->lcm_entry_count,
                                     param->fp_comp_count,
                                     param->fp_comp_count_sign,
                                     param->fp_exclude_comp_count, 1, 0);
                if (ret == -1)
-                       return ret;
-       }
-
-       if (comp_v1->lcm_entry_count == 0) {
-               if ((param->fp_check_comp_flags &&
-                    !param->fp_exclude_comp_flags) ||
-                   (param->fp_check_comp_start &&
-                    !param->fp_exclude_comp_start) ||
-                   (param->fp_check_comp_end &&
-                    !param->fp_exclude_comp_end))
-                       return -1;
+                       goto out;
        }
 
-       if (param->fp_check_comp_flags) {
-               for (i = 0; i < comp_v1->lcm_entry_count; i++) {
-                       entry = &comp_v1->lcm_entries[i];
+       ret = 1;
+       for (i = 0; i < comp_v1->lcm_entry_count; i++) {
+               entry = &comp_v1->lcm_entries[i];
 
-                       if (((entry->lcme_flags & param->fp_comp_flags) &&
-                            param->fp_exclude_comp_flags) ||
-                           (!(entry->lcme_flags & param->fp_comp_flags) &&
-                            !param->fp_exclude_comp_flags))
+               if (param->fp_check_comp_flags) {
+                       ret = 1;
+                       if (((param->fp_comp_flags & entry->lcme_flags) !=
+                            param->fp_comp_flags) ||
+                           (param->fp_comp_neg_flags & entry->lcme_flags)) {
                                ret = -1;
-                       else
-                               ret = 1;
-                       /* If any flags matches */
-                       if (ret != -1)
-                               break;
+                               continue;
+                       }
                }
-               if (ret == -1)
-                       return ret;
-       }
-
-       if (param->fp_check_comp_start) {
-               for (i = 0; i < comp_v1->lcm_entry_count; i++) {
-                       entry = &comp_v1->lcm_entries[i];
 
+               if (param->fp_check_comp_start) {
                        ret = find_value_cmp(entry->lcme_extent.e_start,
                                             param->fp_comp_start,
                                             param->fp_comp_start_sign,
                                             param->fp_exclude_comp_start,
                                             param->fp_comp_start_units, 0);
-                       /* If any extent start matches */
-                       if (ret != -1)
-                               break;
+                       if (ret == -1)
+                               continue;
                }
-               if (ret == -1)
-                       return ret;
+
+               if (param->fp_check_comp_end) {
+                       ret = find_comp_end_cmp(entry->lcme_extent.e_end,
+                                               param);
+                       if (ret == -1)
+                               continue;
+               }
+
+               /* the component matches all criteria */
+               break;
        }
+out:
+       if (forged_v1 != NULL)
+               free(forged_v1);
+       return ret;
+}
+
+static int find_check_mirror_options(struct find_param *param)
+{
+       struct lov_comp_md_v1 *comp_v1;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
+       int ret = 0;
 
-       if (param->fp_check_comp_end) {
-               for (i = 0; i < comp_v1->lcm_entry_count; i++) {
-                       unsigned long long margin;
-                       entry = &comp_v1->lcm_entries[i];
+       if (v1->lmm_magic != LOV_USER_MAGIC_COMP_V1)
+               return -1;
 
-                       margin = entry->lcme_extent.e_end == LUSTRE_EOF ?
-                               0 : param->fp_comp_end_units;
+       comp_v1 = (struct lov_comp_md_v1 *)v1;
 
-                       ret = find_value_cmp(entry->lcme_extent.e_end,
-                                            param->fp_comp_end,
-                                            param->fp_comp_end_sign,
-                                            param->fp_exclude_comp_end, margin,
-                                            0);
-                       /* If any extent end matches */
-                       if (ret != -1)
-                               break;
-               }
+       if (param->fp_check_mirror_count) {
+               ret = find_value_cmp(comp_v1->lcm_mirror_count + 1,
+                                    param->fp_mirror_count,
+                                    param->fp_mirror_count_sign,
+                                    param->fp_exclude_mirror_count, 1, 0);
                if (ret == -1)
                        return ret;
        }
 
-       return 1;
+       if (param->fp_check_mirror_state) {
+               ret = 1;
+               __u16 file_state = comp_v1->lcm_flags & LCM_FL_FLR_MASK;
+
+               if ((param->fp_mirror_state != 0 &&
+                   file_state != param->fp_mirror_state) ||
+                   file_state == param->fp_mirror_neg_state)
+                       return -1;
+       }
+
+       return ret;
 }
 
 static bool find_check_lmm_info(struct find_param *param)
@@ -3363,7 +3927,28 @@ static bool find_check_lmm_info(struct find_param *param)
        return param->fp_check_pool || param->fp_check_stripe_count ||
               param->fp_check_stripe_size || param->fp_check_layout ||
               param->fp_check_comp_count || param->fp_check_comp_end ||
-              param->fp_check_comp_start || param->fp_check_comp_flags;
+              param->fp_check_comp_start || param->fp_check_comp_flags ||
+              param->fp_check_mirror_count ||
+              param->fp_check_mirror_state ||
+              param->fp_check_projid;
+}
+
+/*
+ * Get file/directory project id.
+ * by the open fd resides on.
+ * Return 0 and project id on success, or -ve errno.
+ */
+static int fget_projid(int fd, int *projid)
+{
+       struct fsxattr fsx;
+       int rc;
+
+       rc = ioctl(fd, LL_IOC_FSGETXATTR, &fsx);
+       if (rc)
+               return -errno;
+
+       *projid = fsx.fsx_projid;
+       return 0;
 }
 
 static int cb_find_init(char *path, DIR *parent, DIR **dirp,
@@ -3377,6 +3962,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
        int checked_type = 0;
        int ret = 0;
        __u32 stripe_count = 0;
+       int fd = -2;
 
        if (parent == NULL && dir == NULL)
                return -EINVAL;
@@ -3411,7 +3997,8 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
        if (param->fp_obd_uuid || param->fp_mdt_uuid ||
            param->fp_check_uid || param->fp_check_gid ||
            param->fp_atime || param->fp_mtime || param->fp_ctime ||
-           param->fp_check_size || find_check_lmm_info(param) ||
+           param->fp_check_size || param->fp_check_blocks ||
+           find_check_lmm_info(param) ||
            param->fp_check_mdt_count || param->fp_check_hash_type)
                decision = 0;
 
@@ -3425,8 +4012,10 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                        if (ret != 0)
                                return ret;
                }
+
+               param->fp_lmd->lmd_lmm.lmm_magic = 0;
                ret = get_lmd_info(path, parent, dir, param->fp_lmd,
-                                  param->fp_lum_size);
+                                  param->fp_lum_size, GET_LMD_INFO);
                if (ret == 0 && param->fp_lmd->lmd_lmm.lmm_magic == 0 &&
                    find_check_lmm_info(param)) {
                        struct lov_user_md *lmm = &param->fp_lmd->lmd_lmm;
@@ -3434,7 +4023,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                        /* We need to "fake" the "use the default" values
                         * since the lmm struct is zeroed out at this point. */
                        lmm->lmm_magic = LOV_USER_MAGIC_V1;
-                       lmm->lmm_pattern = 0xFFFFFFFF;
+                       lmm->lmm_pattern = LOV_PATTERN_DEFAULT;
                        if (!param->fp_raw)
                                ostid_set_seq(&lmm->lmm_oi,
                                              FID_SEQ_LOV_DEFAULT);
@@ -3447,8 +4036,6 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                                ret = llapi_file_fget_mdtidx(dirfd(dir),
                                                     &param->fp_file_mdt_index);
                        } else if (S_ISREG(st->st_mode)) {
-                               int fd;
-
                                /* FIXME: we could get the MDT index from the
                                 * file's FID in lmd->lmd_lmm.lmm_oi without
                                 * opening the file, once we are sure that
@@ -3459,7 +4046,6 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                                if (fd > 0) {
                                        ret = llapi_file_fget_mdtidx(fd,
                                                     &param->fp_file_mdt_index);
-                                       close(fd);
                                } else {
                                        ret = -errno;
                                }
@@ -3476,7 +4062,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                        if (ret == -ENOENT)
                                goto decided;
 
-                       return ret;
+                       goto out;
                } else {
                        stripe_count = find_get_stripe_count(param);
                }
@@ -3507,7 +4093,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                        ret = setup_target_indexes(dir ? dir : parent, path,
                                                   param);
                        if (ret)
-                               return ret;
+                               goto out;
 
                        param->fp_dev = st->st_dev;
                } else if (!lustre_fs && param->fp_got_uuids) {
@@ -3608,6 +4194,27 @@ obd_matches:
                }
        }
 
+       if (param->fp_check_projid) {
+               int projid = 0;
+
+               if (fd == -2)
+                       fd = open(path, O_RDONLY);
+
+               if (fd > 0)
+                       ret = fget_projid(fd, &projid);
+               else
+                       ret = -errno;
+               if (ret)
+                       goto out;
+               if (projid == param->fp_projid) {
+                       if (param->fp_exclude_uid)
+                               goto decided;
+               } else {
+                       if (!param->fp_exclude_projid)
+                               goto decided;
+               }
+       }
+
        if (param->fp_check_pool) {
                decision = find_check_pool(param);
                if (decision == -1)
@@ -3621,6 +4228,12 @@ obd_matches:
                        goto decided;
        }
 
+       if (param->fp_check_mirror_count || param->fp_check_mirror_state) {
+               decision = find_check_mirror_options(param);
+               if (decision == -1)
+                       goto decided;
+       }
+
        /* Check the time on mds. */
        decision = 1;
        if (param->fp_atime || param->fp_mtime || param->fp_ctime) {
@@ -3637,10 +4250,8 @@ obd_matches:
            The regular stat is almost of the same speed as some new
            'glimpse-size-ioctl'. */
 
-       if (param->fp_check_size && S_ISREG(st->st_mode) && stripe_count)
-               decision = 0;
-
-       if (param->fp_check_size && S_ISDIR(st->st_mode))
+       if ((param->fp_check_size || param->fp_check_blocks) &&
+           ((S_ISREG(st->st_mode) && stripe_count) || S_ISDIR(st->st_mode)))
                decision = 0;
 
        if (!decision) {
@@ -3667,42 +4278,56 @@ obd_matches:
                                             __func__, path);
                                 goto decided;
                         } else {
-                                ret = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, ret,
-                                            "%s: IOC_LOV_GETINFO on %s failed",
-                                            __func__, path);
-                                return ret;
-                        }
-                }
+                               ret = -errno;
+                               llapi_error(LLAPI_MSG_ERROR, ret,
+                                           "%s: IOC_LOV_GETINFO on %s failed",
+                                           __func__, path);
+                               goto out;
+                       }
+               }
 
-                /* Check the time on osc. */
-                decision = find_time_check(st, param, 0);
-                if (decision == -1)
-                        goto decided;
-        }
+               /* Check the time on osc. */
+               decision = find_time_check(st, param, 0);
+               if (decision == -1)
+                       goto decided;
+       }
 
-       if (param->fp_check_size)
+       if (param->fp_check_size) {
                decision = find_value_cmp(st->st_size, param->fp_size,
                                          param->fp_size_sign,
                                          param->fp_exclude_size,
                                          param->fp_size_units, 0);
+               if (decision == -1)
+                       goto decided;
+       }
 
-        if (decision != -1) {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
-               if (param->fp_zero_end)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
-                else
-                        llapi_printf(LLAPI_MSG_NORMAL, "\n");
-        }
+       if (param->fp_check_blocks) { /* convert st_blocks to bytes */
+               decision = find_value_cmp(st->st_blocks * 512, param->fp_blocks,
+                                         param->fp_blocks_sign,
+                                         param->fp_exclude_blocks,
+                                         param->fp_blocks_units, 0);
+               if (decision == -1)
+                       goto decided;
+       }
 
-decided:
-        /* Do not get down anymore? */
-       if (param->fp_depth == param->fp_max_depth)
-               return 1;
+       llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
+       if (param->fp_zero_end)
+               llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
+       else
+               llapi_printf(LLAPI_MSG_NORMAL, "\n");
 
+decided:
+       ret = 0;
+       /* Do not get down anymore? */
+       if (param->fp_depth == param->fp_max_depth) {
+               ret = 1;
+               goto out;
+       }
        param->fp_depth++;
-
-       return 0;
+out:
+       if (fd > 0)
+               close(fd);
+       return ret;
 }
 
 static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
@@ -3710,7 +4335,7 @@ static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
 {
        struct find_param       *param = (struct find_param *)param_data;
        DIR                     *tmp_parent = parent;
-       char                    raw[OBD_MAX_IOCTL_BUFFER] = {'\0'};
+       char                    raw[MAX_IOC_BUFLEN] = {'\0'};
        char                    *rawbuf = raw;
        struct obd_ioctl_data   data = { 0 };
        int                     fd;
@@ -3744,7 +4369,7 @@ static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
        data.ioc_inllen1 = strlen(filename) + 1;
        data.ioc_inlbuf2 = (char *)&param->fp_mdt_index;
        data.ioc_inllen2 = sizeof(param->fp_mdt_index);
-       ret = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
+       ret = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
        if (ret != 0) {
                llapi_error(LLAPI_MSG_ERROR, ret,
                            "llapi_obd_statfs: error packing ioctl data");
@@ -3913,26 +4538,14 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
                        return ret;
        }
 
-       if (d) {
-               if (param->fp_get_lmv || param->fp_get_default_lmv) {
-                       ret = cb_get_dirstripe(path, d, param);
-               } else {
-                       ret = ioctl(dirfd(d), LL_IOC_LOV_GETSTRIPE,
-                                    (void *)&param->fp_lmd->lmd_lmm);
-               }
-
-       } else if (parent && !param->fp_get_lmv && !param->fp_get_default_lmv) {
-               char *fname = strrchr(path, '/');
-               fname = (fname == NULL ? path : fname + 1);
-
-               strlcpy((char *)&param->fp_lmd->lmd_lmm, fname,
-                       param->fp_lum_size);
-
-               ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
-                           (void *)&param->fp_lmd->lmd_lmm);
-       } else {
+       if (d && (param->fp_get_lmv || param->fp_get_default_lmv))
+               ret = cb_get_dirstripe(path, d, param);
+       else if (d ||
+                (parent && !param->fp_get_lmv && !param->fp_get_default_lmv))
+               ret = get_lmd_info(path, parent, d, &param->fp_lmd->lmd_lmm,
+                                  param->fp_lum_size, GET_LMD_STRIPE);
+       else
                return 0;
-       }
 
         if (ret) {
                 if (errno == ENODATA && d != NULL) {
@@ -4024,7 +4637,7 @@ int llapi_getstripe(char *path, struct find_param *param)
 int llapi_obd_fstatfs(int fd, __u32 type, __u32 index,
                      struct obd_statfs *stat_buf, struct obd_uuid *uuid_buf)
 {
-        char raw[OBD_MAX_IOCTL_BUFFER] = {'\0'};
+       char raw[MAX_IOC_BUFLEN] = {'\0'};
         char *rawbuf = raw;
         struct obd_ioctl_data data = { 0 };
         int rc = 0;
@@ -4038,7 +4651,7 @@ int llapi_obd_fstatfs(int fd, __u32 type, __u32 index,
         data.ioc_pbuf2 = (char *)uuid_buf;
         data.ioc_plen2 = sizeof(struct obd_uuid);
 
-        rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
+       rc = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
         if (rc != 0) {
                 llapi_error(LLAPI_MSG_ERROR, rc,
                             "llapi_obd_statfs: error packing ioctl data");
@@ -4201,16 +4814,13 @@ int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
        int rc;
 
        rc = llapi_search_fsname(mnt, fsname);
-       if (rc) {
-               llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                 "'%s' isn't on Lustre filesystem", mnt);
+       if (rc)
                return rc;
-       }
 
        root = open(mnt, O_RDONLY | O_DIRECTORY);
        if (root < 0) {
                rc = -errno;
-               llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+               llapi_error(LLAPI_MSG_ERROR, rc, "cannot open '%s'", mnt);
                return rc;
        }
 
@@ -4243,7 +4853,7 @@ static int get_mdtname(char *name, char *format, char *buf)
                 } else {
                         /* Not enough room to add suffix */
                         llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                          "MDT name too long |%s|", name);
+                                         "Invalid MDT name |%s|", name);
                         return -EINVAL;
                 }
         }
@@ -4259,42 +4869,42 @@ static int get_mdtname(char *name, char *format, char *buf)
 int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
               int want_error)
 {
-        char fsname[20];
-        char *ptr;
+       char fsname[20];
+       char *ptr;
        int fd, rc;
        long index;
 
-        /* Take path, fsname, or MDTname.  Assume MDT0000 in the former cases.
-         Open root and parse mdt index. */
-        if (mdtname[0] == '/') {
-                index = 0;
-                rc = get_root_path(WANT_FD | want_error, NULL, &fd,
-                                   (char *)mdtname, -1);
-        } else {
-                if (get_mdtname((char *)mdtname, "%s%s", fsname) < 0)
-                        return -EINVAL;
-                ptr = fsname + strlen(fsname) - 8;
-                *ptr = '\0';
-                index = strtol(ptr + 4, NULL, 10);
-                rc = get_root_path(WANT_FD | want_error, fsname, &fd, NULL, -1);
-        }
-        if (rc < 0) {
-                if (want_error)
-                        llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                          "Can't open %s: %d\n", mdtname, rc);
-                return rc;
-        }
+       /* Take path, fsname, or MDTname.  Assume MDT0000 in the former cases.
+        Open root and parse mdt index. */
+       if (mdtname[0] == '/') {
+               index = 0;
+               rc = get_root_path(WANT_FD | want_error, NULL, &fd,
+                                  (char *)mdtname, -1);
+       } else {
+               if (get_mdtname((char *)mdtname, "%s%s", fsname) < 0)
+                       return -EINVAL;
+               ptr = fsname + strlen(fsname) - 8;
+               *ptr = '\0';
+               index = strtol(ptr + 4, NULL, 16);
+               rc = get_root_path(WANT_FD | want_error, fsname, &fd, NULL, -1);
+       }
+       if (rc < 0) {
+               if (want_error)
+                       llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                         "Can't open %s: %d\n", mdtname, rc);
+               return rc;
+       }
 
-        if (mdtidxp)
-                *mdtidxp = index;
+       if (mdtidxp)
+               *mdtidxp = index;
 
-        rc = ioctl(fd, opc, data);
-        if (rc == -1)
-                rc = -errno;
-        else
-                rc = 0;
-        close(fd);
-        return rc;
+       rc = ioctl(fd, opc, data);
+       if (rc == -1)
+               rc = -errno;
+       else
+               rc = 0;
+       close(fd);
+       return rc;
 }
 
 int llapi_fid2path(const char *device, const char *fidstr, char *buf,
@@ -4303,6 +4913,8 @@ int llapi_fid2path(const char *device, const char *fidstr, char *buf,
        const char *fidstr_orig = fidstr;
        struct lu_fid fid;
        struct getinfo_fid2path *gf;
+       char *a;
+       char *b;
        int rc;
 
        while (*fidstr == '[')
@@ -4331,11 +4943,21 @@ int llapi_fid2path(const char *device, const char *fidstr, char *buf,
        if (rc)
                goto out_free;
 
-       memcpy(buf, gf->gf_u.gf_path, gf->gf_pathlen);
+       b = buf;
+       /* strip out instances of // */
+       for (a = gf->gf_u.gf_path; *a != '\0'; a++) {
+               if ((*a == '/') && (*(a + 1) == '/'))
+                       continue;
+               *b = *a;
+               b++;
+       }
+       *b = '\0';
+
        if (buf[0] == '\0') { /* ROOT path */
                buf[0] = '/';
                buf[1] = '\0';
        }
+
        *recno = gf->gf_recno;
        *linkno = gf->gf_linkno;
 
@@ -4344,7 +4966,7 @@ out_free:
        return rc;
 }
 
-static int fid_from_lma(const char *path, const int fd, lustre_fid *fid)
+static int fid_from_lma(const char *path, int fd, struct lu_fid *fid)
 {
        char                     buf[512];
        struct lustre_mdt_attrs *lma;
@@ -4361,7 +4983,7 @@ static int fid_from_lma(const char *path, const int fd, lustre_fid *fid)
        return 0;
 }
 
-int llapi_get_mdt_index_by_fid(int fd, const lustre_fid *fid,
+int llapi_get_mdt_index_by_fid(int fd, const struct lu_fid *fid,
                               int *mdt_index)
 {
        int     rc;
@@ -4375,7 +4997,7 @@ int llapi_get_mdt_index_by_fid(int fd, const lustre_fid *fid,
        return rc;
 }
 
-int llapi_fd2fid(const int fd, lustre_fid *fid)
+int llapi_fd2fid(int fd, struct lu_fid *fid)
 {
        int rc;
 
@@ -4388,7 +5010,7 @@ int llapi_fd2fid(const int fd, lustre_fid *fid)
        return rc;
 }
 
-int llapi_path2fid(const char *path, lustre_fid *fid)
+int llapi_path2fid(const char *path, struct lu_fid *fid)
 {
        int fd, rc;
 
@@ -4408,7 +5030,7 @@ int llapi_path2fid(const char *path, lustre_fid *fid)
        return rc;
 }
 
-int llapi_fd2parent(int fd, unsigned int linkno, lustre_fid *parent_fid,
+int llapi_fd2parent(int fd, unsigned int linkno, struct lu_fid *parent_fid,
                    char *name, size_t name_size)
 {
        struct getparent        *gp;
@@ -4438,7 +5060,7 @@ err_free:
 }
 
 int llapi_path2parent(const char *path, unsigned int linkno,
-                     lustre_fid *parent_fid, char *name, size_t name_size)
+                     struct lu_fid *parent_fid, char *name, size_t name_size)
 {
        int     fd;
        int     rc;
@@ -4493,18 +5115,53 @@ int llapi_get_connect_flags(const char *mnt, __u64 *flags)
  */
 int llapi_get_data_version(int fd, __u64 *data_version, __u64 flags)
 {
-        int rc;
-        struct ioc_data_version idv;
+       int rc;
+       struct ioc_data_version idv;
 
-        idv.idv_flags = flags;
+       idv.idv_flags = (__u32)flags;
 
-        rc = ioctl(fd, LL_IOC_DATA_VERSION, &idv);
-        if (rc)
-                rc = -errno;
-        else
-                *data_version = idv.idv_version;
+       rc = ioctl(fd, LL_IOC_DATA_VERSION, &idv);
+       if (rc)
+               rc = -errno;
+       else
+               *data_version = idv.idv_version;
 
-        return rc;
+       return rc;
+}
+
+/**
+ * Flush cached pages from all clients.
+ *
+ * \param fd   File descriptor
+ * \retval 0   success
+ * \retval < 0 error
+ */
+int llapi_file_flush(int fd)
+{
+       __u64 dv;
+
+       return llapi_get_data_version(fd, &dv, LL_DV_WR_FLUSH);
+}
+
+/*
+ * Fetch layout version from OST objects. Layout version on OST objects are
+ * only set when the file is a mirrored file AND after the file has been
+ * written at least once.
+ *
+ * It actually fetches the least layout version from the objects.
+ */
+int llapi_get_ost_layout_version(int fd, __u32 *layout_version)
+{
+       int rc;
+       struct ioc_data_version idv = { 0 };
+
+       rc = ioctl(fd, LL_IOC_DATA_VERSION, &idv);
+       if (rc)
+               rc = -errno;
+       else
+               *layout_version = idv.idv_layout_version;
+
+       return rc;
 }
 
 /*
@@ -4709,7 +5366,8 @@ out:
  * \retval                     non-negative file descriptor on successful open
  * \retval                     -1 if an error occurred
  */
-int llapi_open_by_fid(const char *lustre_dir, const lustre_fid *fid, int flags)
+int llapi_open_by_fid(const char *lustre_dir, const struct lu_fid *fid,
+                     int flags)
 {
        char mntdir[PATH_MAX];
        char path[PATH_MAX];