Whamcloud - gitweb
LU-9505 llapi: treat MDT index as a hex number
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index 74ab27f..2df30c6 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,6 +41,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <ctype.h>
 #include <mntent.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
-#include <sys/types.h>
 #include <sys/syscall.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <sys/xattr.h>
+#include <time.h>
 #include <fnmatch.h>
-#include <glob.h>
 #include <libgen.h> /* for dirname() */
 #ifdef HAVE_LINUX_UNISTD_H
 #include <linux/unistd.h>
 #endif
 #include <poll.h>
 
+#include <libcfs/util/ioctl.h>
+#include <libcfs/util/param.h>
 #include <libcfs/util/string.h>
-#include <libcfs/libcfs.h>
 #include <lnet/lnetctl.h>
 #include <lustre/lustreapi.h>
-#include <lustre_ioctl.h>
+#include <linux/lustre_ostid.h>
+#include <linux/lustre_ioctl.h>
 #include "lustreapi_internal.h"
 
 static int llapi_msg_level = LLAPI_MSG_MAX;
 
+char *mdt_hash_name[] = { "none",
+                         LMV_HASH_NAME_ALL_CHARS,
+                         LMV_HASH_NAME_FNV_1A_64 };
+
 void llapi_msg_set_level(int level)
 {
         /* ensure level is in the good range */
@@ -188,55 +192,156 @@ llapi_log_callback_t llapi_info_callback_set(llapi_log_callback_t cb)
 int llapi_parse_size(const char *optarg, unsigned long long *size,
                     unsigned long long *size_units, int bytes_spec)
 {
-        char *end;
-
-        if (strncmp(optarg, "-", 1) == 0)
-                return -1;
-
-        if (*size_units == 0)
-                *size_units = 1;
-
-        *size = strtoull(optarg, &end, 0);
-
-        if (*end != '\0') {
-                if ((*end == 'b') && *(end + 1) == '\0' &&
-                    (*size & (~0ULL << (64 - 9))) == 0 &&
-                    !bytes_spec) {
-                        *size_units = 1 << 9;
-                } else if ((*end == 'b') &&
-                           *(end + 1) == '\0' &&
-                           bytes_spec) {
-                        *size_units = 1;
-                } else if ((*end == 'k' || *end == 'K') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 10))) == 0) {
-                        *size_units = 1 << 10;
-                } else if ((*end == 'm' || *end == 'M') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 20))) == 0) {
-                        *size_units = 1 << 20;
-                } else if ((*end == 'g' || *end == 'G') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 30))) == 0) {
-                        *size_units = 1 << 30;
-                } else if ((*end == 't' || *end == 'T') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 40))) == 0) {
-                        *size_units = 1ULL << 40;
-                } else if ((*end == 'p' || *end == 'P') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 50))) == 0) {
-                        *size_units = 1ULL << 50;
-                } else if ((*end == 'e' || *end == 'E') &&
-                           *(end + 1) == '\0' &&
-                           (*size & (~0ULL << (64 - 60))) == 0) {
-                        *size_units = 1ULL << 60;
-                } else {
-                        return -1;
-                }
-        }
-        *size *= *size_units;
-        return 0;
+       char *end;
+       char *argbuf = (char *)optarg;
+       unsigned long long frac = 0, frac_d = 1;
+
+       if (strncmp(optarg, "-", 1) == 0)
+               return -1;
+
+       if (*size_units == 0)
+               *size_units = 1;
+
+       *size = strtoull(argbuf, &end, 0);
+       if (end != NULL && *end == '.') {
+               int i;
+
+               argbuf = end + 1;
+               frac = strtoull(argbuf, &end, 10);
+               /* count decimal places */
+               for (i = 0; i < (end - argbuf); i++)
+                       frac_d *= 10;
+       }
+
+       if (*end != '\0') {
+               if ((*end == 'b') && *(end + 1) == '\0' &&
+                   (*size & (~0ULL << (64 - 9))) == 0 &&
+                   !bytes_spec) {
+                       *size_units = 1 << 9;
+               } else if ((*end == 'b') &&
+                          *(end + 1) == '\0' &&
+                          bytes_spec) {
+                       *size_units = 1;
+               } else if ((*end == 'k' || *end == 'K') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 10))) == 0) {
+                       *size_units = 1 << 10;
+               } else if ((*end == 'm' || *end == 'M') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 20))) == 0) {
+                       *size_units = 1 << 20;
+               } else if ((*end == 'g' || *end == 'G') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 30))) == 0) {
+                       *size_units = 1 << 30;
+               } else if ((*end == 't' || *end == 'T') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 40))) == 0) {
+                       *size_units = 1ULL << 40;
+               } else if ((*end == 'p' || *end == 'P') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 50))) == 0) {
+                       *size_units = 1ULL << 50;
+               } else if ((*end == 'e' || *end == 'E') &&
+                          *(end + 1) == '\0' &&
+                          (*size & (~0ULL << (64 - 60))) == 0) {
+                       *size_units = 1ULL << 60;
+               } else {
+                       return -1;
+               }
+       }
+       *size = *size * *size_units + frac * *size_units / frac_d;
+
+       return 0;
+}
+
+int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
+{
+       struct obd_ioctl_data *overlay;
+       char *ptr;
+
+       data->ioc_len = obd_ioctl_packlen(data);
+       data->ioc_version = OBD_IOCTL_VERSION;
+
+       if (*pbuf != NULL && data->ioc_len > max_len) {
+               fprintf(stderr, "pbuf = %p, ioc_len = %u, max_len = %d\n",
+                       *pbuf, data->ioc_len, max_len);
+               return -EINVAL;
+       }
+
+       if (*pbuf == NULL)
+               *pbuf = malloc(data->ioc_len);
+
+       if (*pbuf == NULL)
+               return -ENOMEM;
+
+       overlay = (struct obd_ioctl_data *)*pbuf;
+       memcpy(*pbuf, data, sizeof(*data));
+
+       ptr = overlay->ioc_bulk;
+       if (data->ioc_inlbuf1) {
+               memcpy(ptr, data->ioc_inlbuf1, data->ioc_inllen1);
+               ptr += cfs_size_round(data->ioc_inllen1);
+       }
+
+       if (data->ioc_inlbuf2) {
+               memcpy(ptr, data->ioc_inlbuf2, data->ioc_inllen2);
+               ptr += cfs_size_round(data->ioc_inllen2);
+       }
+
+       if (data->ioc_inlbuf3) {
+               memcpy(ptr, data->ioc_inlbuf3, data->ioc_inllen3);
+               ptr += cfs_size_round(data->ioc_inllen3);
+       }
+
+       if (data->ioc_inlbuf4) {
+               memcpy(ptr, data->ioc_inlbuf4, data->ioc_inllen4);
+               ptr += cfs_size_round(data->ioc_inllen4);
+       }
+
+       return 0;
+}
+
+int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
+{
+       struct obd_ioctl_data *overlay;
+       char *ptr;
+
+       if (pbuf == NULL)
+               return 1;
+
+       overlay = (struct obd_ioctl_data *)pbuf;
+
+       /* Preserve the caller's buffer pointers */
+       overlay->ioc_inlbuf1 = data->ioc_inlbuf1;
+       overlay->ioc_inlbuf2 = data->ioc_inlbuf2;
+       overlay->ioc_inlbuf3 = data->ioc_inlbuf3;
+       overlay->ioc_inlbuf4 = data->ioc_inlbuf4;
+
+       memcpy(data, pbuf, sizeof(*data));
+
+       ptr = overlay->ioc_bulk;
+       if (data->ioc_inlbuf1) {
+               memcpy(data->ioc_inlbuf1, ptr, data->ioc_inllen1);
+               ptr += cfs_size_round(data->ioc_inllen1);
+       }
+
+       if (data->ioc_inlbuf2) {
+               memcpy(data->ioc_inlbuf2, ptr, data->ioc_inllen2);
+               ptr += cfs_size_round(data->ioc_inllen2);
+       }
+
+       if (data->ioc_inlbuf3) {
+               memcpy(data->ioc_inlbuf3, ptr, data->ioc_inllen3);
+               ptr += cfs_size_round(data->ioc_inllen3);
+       }
+
+       if (data->ioc_inlbuf4) {
+               memcpy(data->ioc_inlbuf4, ptr, data->ioc_inllen4);
+               ptr += cfs_size_round(data->ioc_inllen4);
+       }
+
+       return 0;
 }
 
 /* XXX: llapi_xxx() functions return negative values upon failure */
@@ -263,7 +368,7 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
                                stripe_size, page_size);
                return rc;
        }
-       if (!llapi_stripe_offset_is_valid(stripe_offset)) {
+       if (!llapi_stripe_index_is_valid(stripe_offset)) {
                rc = -EINVAL;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe offset %d",
                                stripe_offset);
@@ -285,67 +390,6 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
        return 0;
 }
 
-/* return the first file matching this pattern */
-static int first_match(char *pattern, char *buffer)
-{
-        glob_t glob_info;
-
-        if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
-                return -ENOENT;
-
-        if (glob_info.gl_pathc < 1) {
-                globfree(&glob_info);
-                return -ENOENT;
-        }
-
-        strcpy(buffer, glob_info.gl_pathv[0]);
-
-        globfree(&glob_info);
-        return 0;
-}
-
-static int find_target_obdpath(char *fsname, char *path)
-{
-        glob_t glob_info;
-        char pattern[PATH_MAX + 1];
-        int rc;
-
-        snprintf(pattern, PATH_MAX,
-                 "/proc/fs/lustre/lov/%s-*/target_obd",
-                 fsname);
-        rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
-        if (rc == GLOB_NOMATCH)
-                return -ENODEV;
-        else if (rc)
-                return -EINVAL;
-
-        strcpy(path, glob_info.gl_pathv[0]);
-        globfree(&glob_info);
-        return 0;
-}
-
-static int find_poolpath(char *fsname, char *poolname, char *poolpath)
-{
-        glob_t glob_info;
-        char pattern[PATH_MAX + 1];
-        int rc;
-
-        snprintf(pattern, PATH_MAX,
-                 "/proc/fs/lustre/lov/%s-*/pools/%s",
-                 fsname, poolname);
-        rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
-        /* If no pools, make sure the lov is available */
-        if ((rc == GLOB_NOMATCH) &&
-            (find_target_obdpath(fsname, poolpath) == -ENODEV))
-                return -ENODEV;
-        if (rc)
-                return -EINVAL;
-
-        strcpy(poolpath, glob_info.gl_pathv[0]);
-        globfree(&glob_info);
-        return 0;
-}
-
 /*
  * Trim a trailing newline from a string, if it exists.
  */
@@ -364,200 +408,11 @@ int llapi_chomp_string(char *buf)
        return '\n';
 }
 
-/**
-  * return a parameter string for a specific device type or mountpoint
-  *
-  * \param param_path the path to the file containing parameter data
-  * \param result buffer for parameter value string
-  * \param result_size size of buffer for return value
-  *
-  * The \param param_path is appended to /proc/{fs,sys}/{lnet,lustre} to
-  * complete the absolute path to the file containing the parameter data
-  * the user is requesting. If that file exist then the data is read from
-  * the file and placed into the \param result buffer that is passed by
-  * the user. Data is only copied up to the \param result_size to prevent
-  * overflow of the array.
-  *
-  * Return 0 for success, with a NUL-terminated string in \param result.
-  * Return -ve value for error.
-  */
-int get_param(const char *param_path, char *result,
-                     unsigned int result_size)
-{
-        char file[PATH_MAX + 1], pattern[PATH_MAX + 1], buf[result_size];
-        FILE *fp = NULL;
-        int rc = 0;
-
-        snprintf(pattern, PATH_MAX, "/proc/{fs,sys}/{lnet,lustre}/%s",
-                 param_path);
-        rc = first_match(pattern, file);
-       if (rc != 0 || result == NULL)
-                return rc;
-
-        fp = fopen(file, "r");
-        if (fp != NULL) {
-                while (fgets(buf, result_size, fp) != NULL)
-                        strcpy(result, buf);
-                fclose(fp);
-        } else {
-                rc = -errno;
-        }
-        return rc;
-}
-
-#define DEVICES_LIST "/proc/fs/lustre/devices"
-
-/**
-  * return a parameter string for a specific device type or mountpoint
-  *
-  * \param fsname Lustre filesystem name (optional)
-  * \param file_path path to file in filesystem (optional, if fsname unset)
-  * \param obd_type Lustre OBD device type
-  * \param param_name parameter name to fetch
-  * \param value return buffer for parameter value string
-  * \param val_len size of buffer for return value
-  *
-  * If fsname is specified then the parameter will be from that filesystem
-  * (if it exists). If file_path is given and it is in a mounted Lustre
-  * filesystem, then the parameter will be otherwise the value may be
-  * from any mounted filesystem (if there is more than one).
-  *
-  * If "obd_type" matches a Lustre device then the first matching device
-  * (as with "lctl dl", constrained by \param fsname or \param mount_path)
-  * will be used to provide the return value, otherwise the first such
-  * device found will be used.
-  *
-  * Return 0 for success, with a NUL-terminated string in \param buffer.
-  * Return -ve value for error.
-  */
-static int get_param_obdvar(const char *fsname, const char *file_path,
-                            const char *obd_type, const char *param_name,
-                            char *value, unsigned int val_len)
-{
-       char devices[PATH_MAX];
-       char dev[PATH_MAX] = "*";
-       char fs[PATH_MAX];
-       FILE *fp = NULL;
-       int rc = 0;
-
-       fp = fopen(DEVICES_LIST, "r");
-       if (fp == NULL) {
-               rc = -errno;
-               llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
-               goto out;
-       }
-
-       if (fsname == NULL && file_path != NULL) {
-               rc = llapi_search_fsname(file_path, fs);
-               if (rc) {
-                       llapi_error(LLAPI_MSG_ERROR, rc,
-                                   "'%s' is not on a Lustre filesystem",
-                                   file_path);
-                       goto out;
-               }
-       } else if (fsname != NULL) {
-               rc = strlcpy(fs, fsname, sizeof(fs));
-               if (rc >= sizeof(fs)) {
-                       rc = -E2BIG;
-                       goto out;
-               }
-       }
-
-       while (fgets(devices, sizeof(devices) - 1, fp) != NULL) {
-               char *bufp = devices, *tmp;
-
-               devices[sizeof(devices) - 1] = '\0';
-               while (bufp[0] == ' ')
-                       ++bufp;
-
-               tmp = strstr(bufp, obd_type);
-               if (tmp != NULL) {
-                       tmp += strlen(obd_type) + 1;
-                       if (strcmp(tmp, fs))
-                               continue;
-                       rc = strlcpy(dev, tmp, sizeof(dev));
-                       if (rc >= sizeof(dev)) {
-                               rc = -E2BIG;
-                               goto out;
-                       }
-
-                       tmp = strchr(dev, ' ');
-                       if (tmp != NULL)
-                               *tmp = '\0';
-                       break;
-               }
-       }
-
-       if (dev[0] == '*' && strlen(fs)) {
-               rc = snprintf(dev, sizeof(dev), "%s-*", fs);
-               if (rc >= sizeof(dev)) {
-                       rc = -E2BIG;
-                       goto out;
-               }
-       }
-       rc = snprintf(devices, sizeof(devices), "%s/%s/%s", obd_type, dev,
-                     param_name);
-       if (rc >= sizeof(devices)) {
-               rc = -E2BIG;
-               goto out;
-       }
-
-       fclose(fp);
-       return get_param(devices, value, val_len);
-out:
-       if (fp != NULL)
-               fclose(fp);
-       return rc;
-}
-
 /*
- * TYPE one of llite, lmv, lov.
- * /proc/fs/lustre/TYPE/INST the directory of interest.
+ * Wrapper to grab parameter settings for lov.*-clilov-*.* values
  */
-static int get_param_cli(const char *type, const char *inst,
-                        const char *param, char *buf, size_t buf_size)
-{
-       char param_path[PATH_MAX + 1];
-       FILE *param_file = NULL;
-       int rc;
-
-       snprintf(param_path, sizeof(param_path),
-                "/proc/fs/lustre/%s/%s/%s", type, inst, param);
-
-       param_file = fopen(param_path, "r");
-       if (param_file == NULL) {
-               rc = -errno;
-               goto out;
-       }
-
-       if (fgets(buf, buf_size, param_file) == NULL) {
-               rc = -errno;
-               goto out;
-       }
-
-       rc = 0;
-out:
-       if (param_file != NULL)
-               fclose(param_file);
-
-       return rc;
-}
-
-static int get_param_llite(const char *path,
-                          const char *param, char *buf, size_t buf_size)
-{
-       char inst[80];
-       int rc;
-
-       rc = llapi_getname(path, inst, sizeof(inst));
-       if (rc != 0)
-               return rc;
-
-       return get_param_cli("llite", inst, param, buf, buf_size);
-}
-
-static int get_param_lov(const char *path,
-                        const char *param, char *buf, size_t buf_size)
+static int get_param_lov(const char *path, const char *param,
+                        char *buf, size_t buf_size)
 {
        struct obd_uuid uuid;
        int rc;
@@ -566,11 +421,15 @@ static int get_param_lov(const char *path,
        if (rc != 0)
                return rc;
 
-       return get_param_cli("lov", uuid.uuid, param, buf, buf_size);
+       return get_lustre_param_value("lov", uuid.uuid, FILTER_BY_EXACT, param,
+                                     buf, buf_size);
 }
 
-static int get_param_lmv(const char *path,
-                        const char *param, char *buf, size_t buf_size)
+/*
+ * Wrapper to grab parameter settings for lmv.*-clilov-*.* values
+ */
+static int get_param_lmv(const char *path, const char *param,
+                        char *buf, size_t buf_size)
 {
        struct obd_uuid uuid;
        int rc;
@@ -579,26 +438,29 @@ static int get_param_lmv(const char *path,
        if (rc != 0)
                return rc;
 
-       return get_param_cli("lmv", uuid.uuid, param, buf, buf_size);
+       return get_lustre_param_value("lmv", uuid.uuid, FILTER_BY_EXACT, param,
+                              buf, buf_size);
 }
 
 static int get_mds_md_size(const char *path)
 {
+       char buf[PATH_MAX], inst[PATH_MAX];
        int md_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
-       char buf[80];
        int rc;
 
-       /* Get the max ea size from llite proc. */
-       rc = get_param_llite(path, "max_easize", buf, sizeof(buf));
+       rc = llapi_getname(path, inst, sizeof(inst));
        if (rc != 0)
-               goto out;
+               return md_size;
+
+       /* Get the max ea size from llite parameters. */
+       rc = get_lustre_param_value("llite", inst, FILTER_BY_EXACT,
+                                   "max_easize", buf, sizeof(buf));
+       if (rc != 0)
+               return md_size;
 
        rc = atoi(buf);
-       if (rc > 0)
-               md_size = rc;
 
-out:
-       return md_size;
+       return rc > 0 ? rc : md_size;
 }
 
 int llapi_get_agent_uuid(char *path, char *buf, size_t bufsize)
@@ -615,23 +477,43 @@ int llapi_get_agent_uuid(char *path, char *buf, size_t bufsize)
  */
 int llapi_search_ost(char *fsname, char *poolname, char *ostname)
 {
-        FILE *fd;
-        char buffer[PATH_MAX + 1];
-        int len = 0, rc;
+       char buffer[PATH_MAX];
+       size_t len = 0;
+       glob_t param;
+       FILE *fd;
+       int rc;
 
-        if (ostname != NULL)
-                len = strlen(ostname);
+       /* You need one or the other */
+       if (poolname == NULL && fsname == NULL)
+               return -EINVAL;
 
-       if (poolname == NULL) {
-               if (len == 0)
-                       rc = -EINVAL;
-               else
-                       rc = find_target_obdpath(fsname, buffer);
+       if (ostname != NULL)
+               len = strlen(ostname);
+
+       if (poolname == NULL && len == 0)
+               return -EINVAL;
+
+       /* Search by poolname and fsname if is not NULL */
+       if (poolname != NULL) {
+               rc = poolpath(&param, fsname, NULL);
+               if (rc == 0) {
+                       snprintf(buffer, sizeof(buffer), "%s/%s",
+                                param.gl_pathv[0], poolname);
+               }
+       } else if (fsname != NULL) {
+               rc = get_lustre_param_path("lov", fsname,
+                                          FILTER_BY_FS_NAME,
+                                          "target_obd", &param);
+               if (rc == 0) {
+                       strncpy(buffer, param.gl_pathv[0],
+                               sizeof(buffer));
+               }
        } else {
-                rc = find_poolpath(fsname, poolname, buffer);
+               return -EINVAL;
        }
-        if (rc)
-                return rc;
+       cfs_free_param_data(&param);
+       if (rc)
+               return rc;
 
         fd = fopen(buffer, "r");
         if (fd == NULL)
@@ -823,8 +705,8 @@ retry_open:
                        errmsg = strerror(errno);
 
                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                 "error on ioctl "LPX64" for '%s' (%d): %s",
-                                 (__u64)LL_IOC_LOV_SETSTRIPE, name, fd,
+                                 "error on ioctl %#jx for '%s' (%d): %s",
+                                 (uintmax_t)LL_IOC_LOV_SETSTRIPE, name, fd,
                                  errmsg);
 
                close(fd);
@@ -1039,8 +921,8 @@ int llapi_direntry_remove(char *dname)
        if (ioctl(fd, LL_IOC_REMOVE_ENTRY, filename)) {
                char *errmsg = strerror(errno);
                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                 "error on ioctl "LPX64" for '%s' (%d): %s",
-                                 (__u64)LL_IOC_LMV_SETSTRIPE, filename,
+                                 "error on ioctl %#jx for '%s' (%d): %s",
+                                 (uintmax_t)LL_IOC_LMV_SETSTRIPE, filename,
                                  fd, errmsg);
        }
 out:
@@ -1057,21 +939,21 @@ out:
  */
 int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
 {
-        struct mntent mnt;
-        char buf[PATH_MAX], mntdir[PATH_MAX];
-        char *ptr;
-        FILE *fp;
-        int idx = 0, len = 0, mntlen, fd;
-        int rc = -ENODEV;
+       struct mntent mnt;
+       char buf[PATH_MAX], mntdir[PATH_MAX];
+       char *ptr, *ptr_end;
+       FILE *fp;
+       int idx = 0, len = 0, mntlen, fd;
+       int rc = -ENODEV;
 
         /* get the mount point */
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                rc = -EIO;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "setmntent(%s) failed", MOUNTED);
-                return rc;
-        }
+       fp = setmntent(PROC_MOUNTS, "r");
+       if (fp == NULL) {
+               rc = -EIO;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                            "setmntent(%s) failed", PROC_MOUNTS);
+               return rc;
+       }
         while (1) {
                 if (getmntent_r(fp, &mnt, buf, sizeof(buf)) == NULL)
                         break;
@@ -1083,58 +965,71 @@ int get_root_path(int want, char *fsname, int *outfd, char *path, int index)
                         continue;
 
                 mntlen = strlen(mnt.mnt_dir);
-                ptr = strrchr(mnt.mnt_fsname, '/');
+               ptr = strchr(mnt.mnt_fsname, '/');
+               while (ptr && *ptr == '/')
+                       ptr++;
                /* thanks to the call to llapi_is_lustre_mnt() above,
                 * we are sure that mnt.mnt_fsname contains ":/",
                 * so ptr should never be NULL */
                if (ptr == NULL)
                        continue;
-                ptr++;
+               ptr_end = ptr;
+               while (*ptr_end != '/' && *ptr_end != '\0')
+                       ptr_end++;
 
-                /* Check the fsname for a match, if given */
+               /* Check the fsname for a match, if given */
                 if (!(want & WANT_FSNAME) && fsname != NULL &&
-                    (strlen(fsname) > 0) && (strcmp(ptr, fsname) != 0))
+                   (strlen(fsname) > 0) &&
+                   (strncmp(ptr, fsname, ptr_end - ptr) != 0))
                         continue;
 
                 /* If the path isn't set return the first one we find */
-                if (path == NULL || strlen(path) == 0) {
-                        strcpy(mntdir, mnt.mnt_dir);
-                        if ((want & WANT_FSNAME) && fsname != NULL)
-                                strcpy(fsname, ptr);
-                        rc = 0;
-                        break;
-                /* Otherwise find the longest matching path */
-                } else if ((strlen(path) >= mntlen) && (mntlen >= len) &&
-                           (strncmp(mnt.mnt_dir, path, mntlen) == 0)) {
-                        strcpy(mntdir, mnt.mnt_dir);
-                        len = mntlen;
-                        if ((want & WANT_FSNAME) && fsname != NULL)
-                                strcpy(fsname, ptr);
-                        rc = 0;
-                }
-        }
-        endmntent(fp);
-
-        /* Found it */
-        if (rc == 0) {
-                if ((want & WANT_PATH) && path != NULL)
-                        strcpy(path, mntdir);
-                if (want & WANT_FD) {
-                        fd = open(mntdir, O_RDONLY | O_DIRECTORY | O_NONBLOCK);
-                        if (fd < 0) {
-                                rc = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, rc,
-                                            "error opening '%s'", mntdir);
+               if (path == NULL || strlen(path) == 0) {
+                       strncpy(mntdir, mnt.mnt_dir, strlen(mnt.mnt_dir));
+                       mntdir[strlen(mnt.mnt_dir)] = '\0';
+                       if ((want & WANT_FSNAME) && fsname != NULL) {
+                               strncpy(fsname, ptr, ptr_end - ptr);
+                               fsname[ptr_end - ptr] = '\0';
+                       }
+                       rc = 0;
+                       break;
+               /* Otherwise find the longest matching path */
+               } else if ((strlen(path) >= mntlen) && (mntlen >= len) &&
+                          (strncmp(mnt.mnt_dir, path, mntlen) == 0)) {
+                       strncpy(mntdir, mnt.mnt_dir, strlen(mnt.mnt_dir));
+                       mntdir[strlen(mnt.mnt_dir)] = '\0';
+                       len = mntlen;
+                       if ((want & WANT_FSNAME) && fsname != NULL) {
+                               strncpy(fsname, ptr, ptr_end - ptr);
+                               fsname[ptr_end - ptr] = '\0';
+                       }
+                       rc = 0;
+               }
+       }
+       endmntent(fp);
 
-                        } else {
-                                *outfd = fd;
-                        }
-                }
-        } 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);
-        return rc;
+       /* Found it */
+       if (rc == 0) {
+               if ((want & WANT_PATH) && path != NULL) {
+                       strncpy(path, mntdir, strlen(mntdir));
+                       path[strlen(mntdir)] = '\0';
+               }
+               if (want & WANT_FD) {
+                       fd = open(mntdir, O_RDONLY | O_DIRECTORY | O_NONBLOCK);
+                       if (fd < 0) {
+                               rc = -errno;
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "error opening '%s'", mntdir);
+
+                       } else {
+                               *outfd = fd;
+                       }
+               }
+       } 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);
+       return rc;
 }
 
 /*
@@ -1240,37 +1135,6 @@ int llapi_getname(const char *path, char *buf, size_t size)
         return rc;
 }
 
-
-/*
- * find the pool directory path under /proc
- * (can be also used to test if a fsname is known)
- */
-static int poolpath(char *fsname, char *pathname, char *pool_pathname)
-{
-        int rc = 0;
-        char pattern[PATH_MAX + 1];
-        char buffer[PATH_MAX];
-
-        if (fsname == NULL) {
-                rc = llapi_search_fsname(pathname, buffer);
-                if (rc != 0)
-                        return rc;
-                fsname = buffer;
-                strcpy(pathname, fsname);
-        }
-
-        snprintf(pattern, PATH_MAX, "/proc/fs/lustre/lov/%s-*/pools", fsname);
-        rc = first_match(pattern, buffer);
-        if (rc)
-                return rc;
-
-        /* in fsname test mode, pool_pathname is NULL */
-        if (pool_pathname != NULL)
-                strcpy(pool_pathname, buffer);
-
-        return 0;
-}
-
 /**
  * Get the list of pool members.
  * \param poolname    string of format \<fsname\>.\<poolname\>
@@ -1287,43 +1151,43 @@ int llapi_get_poolmembers(const char *poolname, char **members,
 {
        char fsname[PATH_MAX];
        char *pool, *tmp;
-       char pathname[PATH_MAX];
-       char path[PATH_MAX];
-       char buf[1024];
-        FILE *fd;
-        int rc = 0;
-        int nb_entries = 0;
-        int used = 0;
+       glob_t pathname;
+       char buf[PATH_MAX];
+       FILE *fd;
+       int rc = 0;
+       int nb_entries = 0;
+       int used = 0;
 
-        /* name is FSNAME.POOLNAME */
+       /* name is FSNAME.POOLNAME */
        if (strlen(poolname) >= sizeof(fsname))
                return -EOVERFLOW;
        strlcpy(fsname, poolname, sizeof(fsname));
-        pool = strchr(fsname, '.');
-        if (pool == NULL)
-                return -EINVAL;
+       pool = strchr(fsname, '.');
+       if (pool == NULL)
+               return -EINVAL;
 
-        *pool = '\0';
-        pool++;
+       *pool = '\0';
+       pool++;
 
-        rc = poolpath(fsname, NULL, pathname);
-        if (rc != 0) {
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "Lustre filesystem '%s' not found",
-                            fsname);
-                return rc;
-        }
+       rc = poolpath(&pathname, fsname, NULL);
+       if (rc != 0) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Lustre filesystem '%s' not found",
+                           fsname);
+               return rc;
+       }
 
-        llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fsname, pool);
-       rc = snprintf(path, sizeof(path), "%s/%s", pathname, pool);
-       if (rc >= sizeof(path))
+       llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fsname, pool);
+       rc = snprintf(buf, sizeof(buf), "%s/%s", pathname.gl_pathv[0], pool);
+       cfs_free_param_data(&pathname);
+       if (rc >= sizeof(buf))
                return -EOVERFLOW;
-        fd = fopen(path, "r");
-        if (fd == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open %s", path);
-                return rc;
-        }
+       fd = fopen(buf, "r");
+       if (fd == NULL) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "cannot open %s", buf);
+               return rc;
+       }
 
         rc = 0;
         while (fgets(buf, sizeof(buf), fd) != NULL) {
@@ -1366,11 +1230,12 @@ int llapi_get_poolmembers(const char *poolname, char **members,
 int llapi_get_poollist(const char *name, char **poollist, int list_size,
                        char *buffer, int buffer_size)
 {
-        char fsname[PATH_MAX + 1], rname[PATH_MAX + 1], pathname[PATH_MAX + 1];
+       char rname[PATH_MAX];
+       glob_t pathname;
+       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;
@@ -1394,87 +1259,86 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                         return rc;
                 }
 
-                rc = poolpath(NULL, rname, pathname);
-                if (rc != 0) {
-                        llapi_error(LLAPI_MSG_ERROR, rc, "'%s' is not"
-                                    " a Lustre filesystem", name);
-                        return rc;
-                }
-               if (strlen(rname) > sizeof(fsname)-1)
-                       return -E2BIG;
-               strncpy(fsname, rname, sizeof(fsname));
-        } else {
-                /* name is FSNAME */
-               if (strlen(name) > sizeof(fsname)-1)
-                       return -E2BIG;
-               strncpy(fsname, name, sizeof(fsname));
-                rc = poolpath(fsname, NULL, pathname);
-        }
-        if (rc != 0) {
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "Lustre filesystem '%s' not found", name);
-                return rc;
-        }
+               fsname = strdup(rname);
+               if (!fsname)
+                       return -ENOMEM;
 
-        llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname);
-        dir = opendir(pathname);
-        if (dir == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "Could not open pool list for '%s'",
-                            name);
-                return rc;
-        }
+               rc = poolpath(&pathname, NULL, rname);
+       } else {
+               /* name is FSNAME */
+               fsname = strdup(name);
+               if (!fsname)
+                       return -ENOMEM;
+               rc = poolpath(&pathname, fsname, NULL);
+       }
+       if (rc != 0) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Lustre filesystem '%s' not found", name);
+               goto free_path;
+       }
 
-        while(1) {
-                rc = readdir_r(dir, &pool, &cookie);
+       llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname);
+       dir = opendir(pathname.gl_pathv[0]);
+       if (dir == NULL) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Could not open pool list for '%s'",
+                           name);
+               goto free_path;
+       }
 
-                if (rc != 0) {
-                        rc = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "Error reading pool list for '%s'", name);
-                       goto out;
-                } else if ((rc == 0) && (cookie == NULL)) {
-                        /* end of directory */
-                        break;
-                }
+       do {
+               errno = 0;
+               pool = readdir(dir);
+               if (pool == NULL) {
+                       rc = -errno;
+                       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 */
                if (nb_entries >= list_size) {
                        rc = -EOVERFLOW;
-                       goto out;
+                       goto free_dir;
                }
 
                 /* +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 out;
+                       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);
 
-out:
-        closedir(dir);
-       return ((rc != 0) ? rc : nb_entries);
+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);
+       if (fsname)
+               free(fsname);
+       return rc != 0 ? rc : nb_entries;
 }
 
 /* wrapper for lfs.c and obd.c */
 int llapi_poollist(const char *name)
 {
-        /* list of pool names (assume that pool count is smaller
-           than OST count) */
-        char **list, *buffer = NULL, *path = NULL, *fsname = NULL;
-        int obdcount, bufsize, rc, nb, i;
-        char *poolname = NULL, *tmp = NULL, data[16];
+       /* list of pool names (assume that pool count is smaller
+          than OST count) */
+       char **list, *buffer = NULL, *fsname = (char *)name;
+       char *poolname = NULL, *tmp = NULL, data[16];
+       enum param_filter type = FILTER_BY_PATH;
+       int obdcount, bufsize, rc, nb, i;
 
        if (name == NULL)
                return -EINVAL;
@@ -1484,18 +1348,17 @@ int llapi_poollist(const char *name)
                if (fsname == NULL)
                        return -ENOMEM;
 
-                poolname = strchr(fsname, '.');
-                if (poolname)
-                        *poolname = '\0';
-        } else {
-                path = (char *) name;
-        }
+               poolname = strchr(fsname, '.');
+               if (poolname)
+                       *poolname = '\0';
+               type = FILTER_BY_FS_NAME;
+       }
 
-        rc = get_param_obdvar(fsname, path, "lov", "numobd",
-                              data, sizeof(data));
-        if (rc < 0)
-                goto err;
-        obdcount = atoi(data);
+       rc = get_lustre_param_value("lov", fsname, type, "numobd",
+                                   data, sizeof(data));
+       if (rc < 0)
+               goto err;
+       obdcount = atoi(data);
 
         /* Allocate space for each fsname-OST0000_UUID, 1 per OST,
          * and also an array to store the pointers for all that
@@ -1531,9 +1394,9 @@ retry_get_pools:
 err:
         if (buffer)
                 free(buffer);
-        if (fsname)
-                free(fsname);
-        return rc;
+       if (fsname != NULL && type == FILTER_BY_FS_NAME)
+               free(fsname);
+       return rc;
 }
 
 typedef int (semantic_func_t)(char *path, DIR *parent, DIR **d,
@@ -1599,21 +1462,21 @@ static int cb_common_fini(char *path, DIR *parent, DIR **dirp, void *data,
 }
 
 /* set errno upon failure */
-static DIR *opendir_parent(char *path)
+static DIR *opendir_parent(const char *path)
 {
-        DIR *parent;
-        char *fname;
-        char c;
-
-        fname = strrchr(path, '/');
-        if (fname == NULL)
-                return opendir(".");
-
-        c = fname[1];
-        fname[1] = '\0';
-        parent = opendir(path);
-        fname[1] = c;
-        return parent;
+       char *path_copy;
+       char *parent_path;
+       DIR *parent;
+
+       path_copy = strdup(path);
+       if (path_copy == NULL)
+               return NULL;
+
+       parent_path = dirname(path_copy);
+       parent = opendir(parent_path);
+       free(path_copy);
+
+       return parent;
 }
 
 static int cb_get_dirstripe(char *path, DIR *d, struct find_param *param)
@@ -1868,26 +1731,26 @@ int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name)
 
 int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
 {
-        int fd, rc;
+       int fd, rc;
 
-        fd = open(path, O_RDONLY);
-        if (fd < 0) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
-                return rc;
-        }
+       fd = open(path, O_RDONLY | O_NONBLOCK);
+       if (fd < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
+               return rc;
+       }
 
-        rc = llapi_file_fget_lov_uuid(fd, lov_uuid);
+       rc = llapi_file_fget_lov_uuid(fd, lov_uuid);
 
-        close(fd);
-        return rc;
+       close(fd);
+       return rc;
 }
 
 int llapi_file_get_lmv_uuid(const char *path, struct obd_uuid *lov_uuid)
 {
        int fd, rc;
 
-       fd = open(path, O_RDONLY);
+       fd = open(path, O_RDONLY | O_NONBLOCK);
        if (fd < 0) {
                rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
@@ -1904,6 +1767,7 @@ enum tgt_type {
         LOV_TYPE = 1,
         LMV_TYPE
 };
+
 /*
  * If uuidp is NULL, return the number of available obd uuids.
  * If uuidp is non-NULL, then it will return the uuids of the obds. If
@@ -1913,32 +1777,33 @@ enum tgt_type {
 static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
                                   int *ost_count, enum tgt_type type)
 {
+       char buf[PATH_MAX], format[32];
+       int rc = 0, index = 0;
        struct obd_uuid name;
-       char buf[1024];
-       char format[32];
+       glob_t param;
        FILE *fp;
-       int rc = 0, index = 0;
 
-        /* Get the lov name */
-        if (type == LOV_TYPE) {
-                rc = llapi_file_fget_lov_uuid(fd, &name);
-                if (rc)
-                        return rc;
-        } else {
-                rc = llapi_file_fget_lmv_uuid(fd, &name);
-                if (rc)
-                        return rc;
-        }
+       /* Get the lov name */
+       if (type == LOV_TYPE)
+               rc = llapi_file_fget_lov_uuid(fd, &name);
+       else
+               rc = llapi_file_fget_lmv_uuid(fd, &name);
+       if (rc != 0)
+               return rc;
 
-        /* Now get the ost uuids from /proc */
-        snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd",
-                 type == LOV_TYPE ? "lov" : "lmv", name.uuid);
-        fp = fopen(buf, "r");
-        if (fp == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf);
-                return rc;
-        }
+       /* Now get the ost uuids */
+       rc = get_lustre_param_path(type == LOV_TYPE ? "lov" : "lmv", name.uuid,
+                                  FILTER_BY_EXACT, "target_obd", &param);
+       if (rc != 0)
+               return -ENOENT;
+
+       fp = fopen(param.gl_pathv[0], "r");
+       if (fp == NULL) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'",
+                           param.gl_pathv[0]);
+               goto free_param;
+       }
 
        snprintf(format, sizeof(format),
                 "%%d: %%%zus", sizeof(uuidp[0].uuid) - 1);
@@ -1955,8 +1820,10 @@ static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
         if (uuidp && (index > *ost_count))
                 rc = -EOVERFLOW;
 
-        *ost_count = index;
-        return rc;
+       *ost_count = index;
+free_param:
+       cfs_free_param_data(&param);
+       return rc;
 }
 
 int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
@@ -1966,23 +1833,23 @@ int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
 
 int llapi_get_obd_count(char *mnt, int *count, int is_mdt)
 {
-        DIR *root;
-        int rc;
+       int root;
+       int rc;
 
-        root = opendir(mnt);
-        if (!root) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
-                return rc;
-        }
+       root = open(mnt, O_RDONLY | O_DIRECTORY);
+       if (root < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+               return rc;
+       }
 
-        *count = is_mdt;
-        rc = ioctl(dirfd(root), LL_IOC_GETOBDCOUNT, count);
-        if (rc < 0)
-                rc = -errno;
+       *count = is_mdt;
+       rc = ioctl(root, LL_IOC_GETOBDCOUNT, count);
+       if (rc < 0)
+               rc = -errno;
 
-        closedir(root);
-        return rc;
+       close(root);
+       return rc;
 }
 
 /* Check if user specified value matches a real uuid.  Ignore _UUID,
@@ -2010,47 +1877,55 @@ int llapi_uuid_match(char *real_uuid, char *search_uuid)
 
 /* Here, param->fp_obd_uuid points to a single obduuid, the index of which is
  * returned in param->fp_obd_index */
-static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
+static int setup_obd_uuid(int fd, char *dname, struct find_param *param)
 {
        struct obd_uuid obd_uuid;
-       char buf[1024];
+       char buf[PATH_MAX];
+       glob_t param_data;
        char format[32];
-       FILE *fp;
        int rc = 0;
+       FILE *fp;
 
        if (param->fp_got_uuids)
-                return rc;
+               return rc;
 
-        /* Get the lov/lmv name */
+       /* Get the lov/lmv name */
        if (param->fp_get_lmv)
-                rc = llapi_file_fget_lmv_uuid(dirfd(dir), &obd_uuid);
-        else
-                rc = llapi_file_fget_lov_uuid(dirfd(dir), &obd_uuid);
-        if (rc) {
-                if (rc != -ENOTTY) {
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "error: can't get lov name: %s", dname);
-                } else {
-                        rc = 0;
-                }
-                return rc;
-        }
+               rc = llapi_file_fget_lmv_uuid(fd, &obd_uuid);
+       else
+               rc = llapi_file_fget_lov_uuid(fd, &obd_uuid);
+       if (rc) {
+               if (rc != -ENOTTY) {
+                       llapi_error(LLAPI_MSG_ERROR, rc,
+                                   "error: can't get %s name: %s",
+                                   param->fp_get_lmv ? "lmv" : "lov",
+                                   dname);
+               } else {
+                       rc = 0;
+               }
+               return rc;
+       }
 
        param->fp_got_uuids = 1;
 
-       /* Now get the ost uuids from /proc */
-       snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd",
-                param->fp_get_lmv ? "lmv" : "lov", obd_uuid.uuid);
-        fp = fopen(buf, "r");
-        if (fp == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf);
-                return rc;
-        }
+       /* Now get the ost uuids */
+       rc = get_lustre_param_path(param->fp_get_lmv ? "lmv" : "lov",
+                                  obd_uuid.uuid, FILTER_BY_EXACT,
+                                  "target_obd", &param_data);
+       if (rc != 0)
+               return -ENOENT;
+
+       fp = fopen(param_data.gl_pathv[0], "r");
+       if (fp == NULL) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'",
+                           param_data.gl_pathv[0]);
+               goto free_param;
+       }
 
        if (!param->fp_obd_uuid && !param->fp_quiet && !param->fp_obds_printed)
                llapi_printf(LLAPI_MSG_NORMAL, "%s:\n",
-                            param->fp_get_lmv ? "MDTS" : "OBDS:");
+                            param->fp_get_lmv ? "MDTS" : "OBDS");
 
        snprintf(format, sizeof(format),
                 "%%d: %%%zus", sizeof(obd_uuid.uuid) - 1);
@@ -2081,8 +1956,9 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
                                  __func__, param->fp_obd_uuid->uuid);
                rc = -EINVAL;
        }
-
-        return (rc);
+free_param:
+       cfs_free_param_data(&param_data);
+       return rc;
 }
 
 /* In this case, param->fp_obd_uuid will be an array of obduuids and
@@ -2105,27 +1981,25 @@ static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
        if (ret != 0)
                return ret;
 
-        obdcount = atoi(buf);
-        uuids = (struct obd_uuid *)malloc(obdcount *
-                                          sizeof(struct obd_uuid));
-        if (uuids == NULL)
-                return -ENOMEM;
+       obdcount = atoi(buf);
+       uuids = malloc(obdcount * sizeof(struct obd_uuid));
+       if (uuids == NULL)
+               return -ENOMEM;
 
 retry_get_uuids:
-        ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type);
-        if (ret) {
-                struct obd_uuid *uuids_temp;
+       ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type);
+       if (ret) {
+               if (ret == -EOVERFLOW) {
+                       struct obd_uuid *uuids_temp;
 
-                if (ret == -EOVERFLOW) {
-                        uuids_temp = realloc(uuids, obdcount *
-                                             sizeof(struct obd_uuid));
+                       uuids_temp = realloc(uuids, obdcount *
+                                            sizeof(struct obd_uuid));
                        if (uuids_temp != NULL) {
                                uuids = uuids_temp;
-                                goto retry_get_uuids;
+                               goto retry_get_uuids;
                        }
-                        else
-                                ret = -ENOMEM;
-                }
+                       ret = -ENOMEM;
+               }
 
                 llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed");
                 goto out_free;
@@ -2206,80 +2080,17 @@ static int setup_target_indexes(DIR *dir, char *path, struct find_param *param)
 
 int llapi_ostlist(char *path, struct find_param *param)
 {
-        DIR *dir;
-        int ret;
-
-        dir = opendir(path);
-        if (dir == NULL)
-                return -errno;
-
-        ret = setup_obd_uuid(dir, path, param);
-        closedir(dir);
-
-        return ret;
-}
-
-/*
- * Given a filesystem name, or a pathname of a file on a lustre filesystem,
- * tries to determine the path to the filesystem's clilov directory under /proc
- *
- * fsname is limited to MTI_NAME_MAXLEN in lustre_idl.h
- * The NUL terminator is compensated by the additional "%s" bytes. */
-#define LOV_LEN (sizeof("/proc/fs/lustre/lov/%s-clilov-*") + MTI_NAME_MAXLEN)
-static int clilovpath(const char *fsname, const char *const pathname,
-                      char *clilovpath)
-{
-        int rc;
-        char pattern[LOV_LEN];
-        char buffer[PATH_MAX + 1];
-
-        if (fsname == NULL) {
-                rc = llapi_search_fsname(pathname, buffer);
-                if (rc != 0)
-                        return rc;
-                fsname = buffer;
-        }
-
-        snprintf(pattern, sizeof(pattern), "/proc/fs/lustre/lov/%s-clilov-*",
-                 fsname);
-
-        rc = first_match(pattern, buffer);
-        if (rc != 0)
-                return rc;
-
-       strlcpy(clilovpath, buffer, sizeof(buffer));
-
-        return 0;
-}
-
-/*
- * Given the path to a stripe attribute proc file, tries to open and
- * read the attribute and return the value using the attr parameter
- */
-static int sattr_read_attr(const char *const fpath,
-                           unsigned int *attr)
-{
-
-        FILE *f;
-        char line[PATH_MAX + 1];
-        int rc = 0;
+       int fd;
+       int ret;
 
-        f = fopen(fpath, "r");
-        if (f == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open '%s'", fpath);
-                return rc;
-        }
+       fd = open(path, O_RDONLY | O_DIRECTORY);
+       if (fd < 0)
+               return -errno;
 
-        if (fgets(line, sizeof(line), f) != NULL) {
-                *attr = atoi(line);
-        } else {
-                llapi_error(LLAPI_MSG_ERROR, errno, "Cannot read from '%s'", fpath);
-                rc = 1;
-        }
+       ret = setup_obd_uuid(fd, path, param);
+       close(fd);
 
-        fclose(f);
-        return rc;
+       return ret;
 }
 
 /*
@@ -2288,41 +2099,38 @@ static int sattr_read_attr(const char *const fpath,
  * using pathname.
  */
 static int sattr_get_defaults(const char *const fsname,
-                              const char *const pathname,
                               unsigned int *scount,
                               unsigned int *ssize,
                               unsigned int *soffset)
 {
-        int rc;
-        char dpath[PATH_MAX + 1];
-        char fpath[PATH_MAX + 1];
-
-        rc = clilovpath(fsname, pathname, dpath);
-        if (rc != 0)
-                return rc;
+       char val[PATH_MAX];
+       int rc;
 
-        if (scount) {
-                snprintf(fpath, PATH_MAX, "%s/stripecount", dpath);
-                rc = sattr_read_attr(fpath, scount);
-                if (rc != 0)
-                        return rc;
-        }
+       if (scount) {
+               rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME,
+                                           "stripecount", val, sizeof(val));
+               if (rc != 0)
+                       return rc;
+               *scount = atoi(val);
+       }
 
-        if (ssize) {
-                snprintf(fpath, PATH_MAX, "%s/stripesize", dpath);
-                rc = sattr_read_attr(fpath, ssize);
-                if (rc != 0)
-                        return rc;
-        }
+       if (ssize) {
+               rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME,
+                                           "stripesize", val, sizeof(val));
+               if (rc != 0)
+                       return rc;
+               *ssize = atoi(val);
+       }
 
-        if (soffset) {
-                snprintf(fpath, PATH_MAX, "%s/stripeoffset", dpath);
-                rc = sattr_read_attr(fpath, soffset);
-                if (rc != 0)
-                        return rc;
-        }
+       if (soffset) {
+               rc = get_lustre_param_value("lov", fsname, FILTER_BY_FS_NAME,
+                                           "stripeoffset", val, sizeof(val));
+               if (rc != 0)
+                       return rc;
+               *soffset = atoi(val);
+       }
 
-        return 0;
+       return 0;
 }
 
 /*
@@ -2331,11 +2139,9 @@ static int sattr_get_defaults(const char *const fsname,
  * next time they are needed. Only a single filesystem's attributes are
  * cached at a time.
  */
-static int sattr_cache_get_defaults(const char *const fsname,
-                                    const char *const pathname,
-                                    unsigned int *scount,
-                                    unsigned int *ssize,
-                                    unsigned int *soffset)
+int sattr_cache_get_defaults(const char *const fsname,
+                            const char *const pathname, unsigned int *scount,
+                            unsigned int *ssize, unsigned int *soffset)
 {
         static struct {
                 char fsname[PATH_MAX + 1];
@@ -2364,8 +2170,7 @@ static int sattr_cache_get_defaults(const char *const fsname,
                  * successfully retrieved and stored in tmp before writing to
                  * cache.
                  */
-                rc = sattr_get_defaults(fsname_buf, NULL, &tmp[0], &tmp[1],
-                                        &tmp[2]);
+               rc = sattr_get_defaults(fsname_buf, &tmp[0], &tmp[1], &tmp[2]);
                 if (rc != 0)
                         return rc;
 
@@ -2385,163 +2190,263 @@ static int sattr_cache_get_defaults(const char *const fsname,
         return 0;
 }
 
+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,
-                                     struct lov_user_ost_data_v1 *objects,
-                                     int is_dir, int verbose, int depth,
-                                     int raw, char *pool_name)
-{
-        char *prefix = is_dir ? "" : "lmm_";
+                                    struct lov_user_ost_data_v1 *objects,
+                                    int verbose, int depth, char *pool_name,
+                                    enum lov_dump_flags flags)
+{
+       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 = "";
-        int rc;
+       char *space = indent ? "      " : "";
+       int rc;
 
        if (is_dir && lmm_oi_seq(&lum->lmm_oi) == FID_SEQ_LOV_DEFAULT) {
                lmm_oi_set_seq(&lum->lmm_oi, 0);
-               if (verbose & VERBOSE_DETAIL)
-                       llapi_printf(LLAPI_MSG_NORMAL, "(Default) ");
+               if (!indent && (verbose & VERBOSE_DETAIL))
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s(Default) ", space);
        }
 
-        if (depth && path && ((verbose != VERBOSE_OBJID) || !is_dir))
-                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
+       if (!yaml && !indent && depth && path &&
+           ((verbose != VERBOSE_OBJID) || !is_dir))
+               llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
 
        if ((verbose & VERBOSE_DETAIL) && !is_dir) {
-               llapi_printf(LLAPI_MSG_NORMAL, "lmm_magic:          0x%08X\n",
-                            lum->lmm_magic);
-               llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq:            "LPX64"\n",
-                            lmm_oi_seq(&lum->lmm_oi));
-               llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id:      "LPX64"\n",
-                            lmm_oi_id(&lum->lmm_oi));
-       }
-
-        if (verbose & VERBOSE_COUNT) {
-                if (verbose & ~VERBOSE_COUNT)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_count:   ",
-                                     prefix);
-                if (is_dir) {
-                        if (!raw && lum->lmm_stripe_count == 0) {
-                                unsigned int scount;
-                                rc = sattr_cache_get_defaults(NULL, path,
-                                                              &scount, NULL,
-                                                              NULL);
-                                if (rc == 0)
+               llapi_printf(LLAPI_MSG_NORMAL, "%s%smagic:         0x%08X\n",
+                            space, prefix, lum->lmm_magic);
+               llapi_printf(LLAPI_MSG_NORMAL, "%s%sseq:           %#jx\n",
+                            space, prefix,
+                            (uintmax_t)lmm_oi_seq(&lum->lmm_oi));
+               llapi_printf(LLAPI_MSG_NORMAL, "%s%sobject_id:     %#jx\n",
+                            space, prefix,
+                            (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);
+               /* This needs a bit of hand-holding since old 1.x lmm_oi
+                * have { oi.oi_id = mds_inum, oi.oi_seq = 0 } and 2.x lmm_oi
+                * have { oi.oi_id = mds_oid, oi.oi_seq = mds_seq } instead of
+                * a real FID.  Ideally the 2.x code would have stored this
+                * like a FID with { oi_id = mds_seq, oi_seq = mds_oid } so the
+                * ostid union lu_fid { f_seq = mds_seq, f_oid = mds_oid }
+                * worked properly (especially since IGIF FIDs use mds_inum as
+                * the FID SEQ), but unfortunately that didn't happen.
+                *
+                * Print it to look like an IGIF FID, even though the fields
+                * are reversed on disk, so that it makes sense to userspace.
+                *
+                * Don't use ostid_id() and ostid_seq(), since they assume the
+                * oi_fid fields are in the right order.  This is why there are
+                * separate lmm_oi_seq() and lmm_oi_id() routines for this.
+                *
+                * For newer layout types hopefully this will be a real FID. */
+               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) {
+               if (verbose & ~VERBOSE_COUNT)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_count:  ",
+                                    space, prefix);
+               if (is_dir) {
+                       if (!is_raw && lum->lmm_stripe_count == 0) {
+                               unsigned int scount;
+                               rc = sattr_cache_get_defaults(NULL, path,
+                                                             &scount, NULL,
+                                                             NULL);
+                               if (rc == 0)
                                        llapi_printf(LLAPI_MSG_NORMAL, "%d",
                                                     scount);
-                                else
-                                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                                    "Cannot determine default"
-                                                    " stripe count.");
-                        } else {
+                               else
+                                       llapi_error(LLAPI_MSG_ERROR, rc,
+                                                   "Cannot determine default"
+                                                   " stripe count.");
+                       } else {
                                llapi_printf(LLAPI_MSG_NORMAL, "%d",
-                                             lum->lmm_stripe_count ==
-                                             (typeof(lum->lmm_stripe_count))(-1)
+                                            lum->lmm_stripe_count ==
+                                            (typeof(lum->lmm_stripe_count))(-1)
                                             ? -1 : lum->lmm_stripe_count);
-                        }
-                } else {
+                       }
+               } else {
                        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) {
+       if (verbose & VERBOSE_SIZE) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
-                if (verbose & ~VERBOSE_SIZE)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size:    ",
-                                     prefix);
-                if (is_dir && !raw && lum->lmm_stripe_size == 0) {
-                        unsigned int ssize;
-                        rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize,
-                                                      NULL);
-                        if (rc == 0)
+               if (verbose & ~VERBOSE_SIZE)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_size:   ",
+                                    space, prefix);
+               if (is_dir && !is_raw && lum->lmm_stripe_size == 0) {
+                       unsigned int ssize;
+                       rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize,
+                                                     NULL);
+                       if (rc == 0)
                                llapi_printf(LLAPI_MSG_NORMAL, "%u", ssize);
-                        else
-                                llapi_error(LLAPI_MSG_ERROR, rc,
-                                            "Cannot determine default"
-                                            " stripe size.");
-                } else {
+                       else
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "Cannot determine default"
+                                           " stripe size.");
+               } else {
                        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) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
                if (verbose & ~VERBOSE_LAYOUT)
-                       llapi_printf(LLAPI_MSG_NORMAL, "%spattern:        ",
-                                    prefix);
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%spattern:       ",
+                                    space, prefix);
                llapi_printf(LLAPI_MSG_NORMAL, "%.x", lum->lmm_pattern);
                separator = "\n";
        }
 
-        if ((verbose & VERBOSE_GENERATION) && !is_dir) {
+       if ((verbose & VERBOSE_GENERATION) && !is_dir) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
-                if (verbose & ~VERBOSE_GENERATION)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen:     ",
-                                     prefix);
+               if (verbose & ~VERBOSE_GENERATION)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%slayout_gen:    ",
+                                    space, prefix);
                llapi_printf(LLAPI_MSG_NORMAL, "%u",
                             (int)lum->lmm_layout_gen);
                separator = "\n";
-        }
+       }
 
-        if (verbose & VERBOSE_OFFSET) {
+       if (verbose & VERBOSE_OFFSET) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
-                if (verbose & ~VERBOSE_OFFSET)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset:  ",
-                                     prefix);
-                if (is_dir)
+               if (verbose & ~VERBOSE_OFFSET)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%sstripe_offset: ",
+                                    space, prefix);
+               if (is_dir || skip_objs)
                        llapi_printf(LLAPI_MSG_NORMAL, "%d",
-                                     lum->lmm_stripe_offset ==
-                                     (typeof(lum->lmm_stripe_offset))(-1) ? -1 :
+                                    lum->lmm_stripe_offset ==
+                                    (typeof(lum->lmm_stripe_offset))(-1) ? -1 :
                                     lum->lmm_stripe_offset);
-                else
+               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 != NULL)) {
+       if ((verbose & VERBOSE_POOL) && pool_name && (pool_name[0] != '\0')) {
                llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
-                if (verbose & ~VERBOSE_POOL)
-                        llapi_printf(LLAPI_MSG_NORMAL, "%spool:           ",
-                                     prefix);
+               if (verbose & ~VERBOSE_POOL)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s%spool:          ",
+                                    space, prefix);
                llapi_printf(LLAPI_MSG_NORMAL, "%s", pool_name);
-        }
+               if (!yaml && is_dir)
+                       separator = " ";
+               else
+                       separator = "\n";
+       }
 
-        if (!is_dir || (is_dir && (verbose != VERBOSE_OBJID)))
-                llapi_printf(LLAPI_MSG_NORMAL, "\n");
+       if (strlen(separator) != 0)
+               llapi_printf(LLAPI_MSG_NORMAL, "\n");
 }
 
 void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
-                            struct lov_user_ost_data_v1 *objects,
-                            char *path, int is_dir, int obdindex,
-                            int depth, int header, int raw)
-{
-        int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
+                           struct lov_user_ost_data_v1 *objects,
+                           char *path, int obdindex, int depth,
+                           int header, enum lov_dump_flags flags)
+{
+       bool is_dir = flags & LDF_IS_DIR;
+       bool indent = flags & LDF_INDENT;
+       bool skip_objs = flags & LDF_SKIP_OBJS;
+       bool yaml = flags & LDF_YAML;
+       int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
+
+       if (!obdstripe) {
+               for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
+                       if (obdindex == objects[i].l_ost_idx) {
+                               obdstripe = 1;
+                               break;
+                       }
+               }
+       }
 
-        if (!obdstripe) {
-                for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
-                        if (obdindex == objects[i].l_ost_idx) {
-                                obdstripe = 1;
-                                break;
-                        }
-                }
-        }
+       if (obdstripe == 0)
+               return;
 
-        if (obdstripe == 1)
-                lov_dump_user_lmm_header(lum, path, objects, is_dir, header,
-                                         depth, raw, pool_name);
+       lov_dump_user_lmm_header(lum, path, objects, header, depth, pool_name,
+                                flags);
 
-        if (!is_dir && (header & VERBOSE_OBJID) &&
+       if (!is_dir && !skip_objs && (header & VERBOSE_OBJID) &&
            !(lum->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
-                if (obdstripe == 1)
-                        llapi_printf(LLAPI_MSG_NORMAL,
-                                  "\tobdidx\t\t objid\t\t objid\t\t group\n");
-
-                for (i = 0; i < lum->lmm_stripe_count; i++) {
-                        int idx = objects[i].l_ost_idx;
-                        long long oid = ostid_id(&objects[i].l_ost_oi);
-                        long long gr = ostid_seq(&objects[i].l_ost_oi);
-                       if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx)) {
+               char *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");
+
+               for (i = 0; i < lum->lmm_stripe_count; i++) {
+                       int idx = objects[i].l_ost_idx;
+                       long long oid = ostid_id(&objects[i].l_ost_oi);
+                       long long gr = ostid_seq(&objects[i].l_ost_oi);
+
+                       if (obdindex != OBD_NOT_FOUND && obdindex != idx)
+                               continue;
+
+                       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);
+                               llapi_printf(LLAPI_MSG_NORMAL,
+                                   "%s%d: { l_ost_idx: %d, l_fid: "DFID" }\n",
+                                   space, i, idx, PFID(&fid));
+                       } else {
                                char fmt[48];
                                sprintf(fmt, "%s%s%s\n",
                                        "\t%6u\t%14llu\t%#13llx\t",
@@ -2552,19 +2457,20 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                                             oid, gr,
                                             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;
 
        if (obdindex != OBD_NOT_FOUND) {
                if (lum->lum_stripe_count == 0) {
@@ -2591,7 +2497,8 @@ void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
        /* show all information default */
        if (!verbose) {
                if (lum->lum_magic == LMV_USER_MAGIC)
-                       verbose = VERBOSE_POOL | VERBOSE_COUNT | VERBOSE_OFFSET;
+                       verbose = VERBOSE_POOL | VERBOSE_COUNT |
+                                 VERBOSE_OFFSET | VERBOSE_HASH_TYPE;
                else
                        verbose = VERBOSE_OBJID;
        }
@@ -2605,7 +2512,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";
@@ -2617,6 +2524,24 @@ 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 && !yaml)
+                       separator = " ";
+               else
+                       separator = "\n";
+       }
+
+       if (verbose & VERBOSE_HASH_TYPE) {
+               unsigned int type = lum->lum_hash_type;
+
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               if (verbose & ~VERBOSE_HASH_TYPE)
+                       llapi_printf(LLAPI_MSG_NORMAL, "lmv_hash_type: ");
+               if (type < LMV_HASH_TYPE_MAX)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s",
+                                    mdt_hash_name[type]);
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, "%d",
+                                    (int)type);
                separator = "\n";
        }
 
@@ -2651,37 +2576,546 @@ void lmv_dump_user_lmm(struct lmv_user_md *lum, char *pool_name,
                llapi_printf(LLAPI_MSG_NORMAL, "\n");
 }
 
-void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
+static void lov_dump_comp_v1_header(struct find_param *param, char *path,
+                                   enum lov_dump_flags flags)
 {
-       __u32 magic;
+       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 (param->fp_get_lmv || param->fp_get_default_lmv)
-               magic = (__u32)param->fp_lmv_md->lum_magic;
+       if (depth && path && ((verbose != VERBOSE_OBJID) ||
+                             !(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",
+                            " ", comp_v1->lcm_magic);
+               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 (verbose & VERBOSE_GENERATION) {
+               if (verbose & ~VERBOSE_GENERATION)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_layout_gen:  ",
+                                    " ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%u\n", comp_v1->lcm_layout_gen);
+       }
+
+       if (verbose & VERBOSE_COMP_COUNT) {
+               if (verbose & ~VERBOSE_COMP_COUNT)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%2slcm_entry_count: ",
+                                    " ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%u\n",
+                            comp_v1->lcm_magic == LOV_USER_MAGIC_COMP_V1 ?
+                            comp_v1->lcm_entry_count : 0);
+       }
+
+       if (verbose & VERBOSE_DETAIL && !yaml)
+               llapi_printf(LLAPI_MSG_NORMAL, "components:\n");
+}
+
+static void comp_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)
+{
+       struct lov_comp_md_v1 *comp_v1 = (void *)&param->fp_lmd->lmd_lmm;
+       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 && !yaml)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%slcme_id:             ", "  - ");
+               else if (verbose & ~VERBOSE_COMP_ID)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%4slcme_id:             ", " ");
+               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_COMP_FLAGS) {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               if (verbose & ~VERBOSE_COMP_FLAGS)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%4slcme_flags:          ", " ");
+               comp_flags2str(entry->lcme_flags);
+               separator = "\n";
+       }
+
+       if (verbose & VERBOSE_COMP_START) {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               if (verbose & ~VERBOSE_COMP_START)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%4slcme_extent.e_start: ", " ");
+               llapi_printf(LLAPI_MSG_NORMAL, "%llu",
+                            entry->lcme_extent.e_start);
+               separator = "\n";
+       }
+
+       if (verbose & VERBOSE_COMP_END) {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+               if (verbose & ~VERBOSE_COMP_END)
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "%4slcme_extent.e_end:   ", " ");
+               if (entry->lcme_extent.e_end == LUSTRE_EOF)
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s", "EOF");
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, "%llu",
+                                       entry->lcme_extent.e_end);
+               separator = "\n";
+       }
+
+       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);
+               llapi_printf(LLAPI_MSG_NORMAL, "%4slcme_size:           %u\n",
+                            " ", entry->lcme_size);
+               llapi_printf(LLAPI_MSG_NORMAL, "%4ssub_layout:\n", " ");
+       } else {
+               llapi_printf(LLAPI_MSG_NORMAL, "%s", separator);
+       }
+}
+
+/* Check if the value matches 1 of the given criteria (e.g. --atime +/-N).
+ * @mds indicates if this is MDS timestamps and there are attributes on OSTs.
+ *
+ * The result is -1 if it does not match, 0 if not yet clear, 1 if matches.
+ * The table below gives the answers for the specified parameters (value and
+ * sign), 1st column is the answer for the MDS value, the 2nd is for the OST:
+ * --------------------------------------
+ * 1 | file > limit; sign > 0 | -1 / -1 |
+ * 2 | file = limit; sign > 0 | -1 / -1 |
+ * 3 | file < limit; sign > 0 |  ? /  1 |
+ * 4 | file > limit; sign = 0 | -1 / -1 |
+ * 5 | file = limit; sign = 0 |  ? /  1 |  <- (see the Note below)
+ * 6 | file < limit; sign = 0 |  ? / -1 |
+ * 7 | file > limit; sign < 0 |  1 /  1 |
+ * 8 | file = limit; sign < 0 |  ? / -1 |
+ * 9 | file < limit; sign < 0 |  ? / -1 |
+ * --------------------------------------
+ * Note: 5th actually means that the value is within the interval
+ * (limit - margin, limit]. */
+static int find_value_cmp(unsigned long long file, unsigned long long limit,
+                         int sign, int negopt, unsigned long long margin,
+                         int mds)
+{
+       int ret = -1;
+
+       if (sign > 0) {
+               /* Drop the fraction of margin (of days). */
+               if (file + margin <= limit)
+                       ret = mds ? 0 : 1;
+       } else if (sign == 0) {
+               if (file <= limit && file + margin > limit)
+                       ret = mds ? 0 : 1;
+               else if (file + margin <= limit)
+                       ret = mds ? 0 : -1;
+       } else if (sign < 0) {
+               if (file > limit)
+                       ret = 1;
+               else if (mds)
+                       ret = 0;
+       }
+
+       return negopt ? ~ret + 1 : ret;
+}
+
+static inline struct lov_user_md *
+lov_comp_entry(struct lov_comp_md_v1 *comp_v1, int ent_idx)
+{
+       return (struct lov_user_md *)((char *)comp_v1 +
+                       comp_v1->lcm_entries[ent_idx].lcme_offset);
+}
+
+static inline struct lov_user_ost_data_v1 *
+lov_v1v3_objects(struct lov_user_md *v1)
+{
+       if (v1->lmm_magic == LOV_USER_MAGIC_V3)
+               return ((struct lov_user_md_v3 *)v1)->lmm_objects;
        else
-               magic = *(__u32 *)&param->fp_lmd->lmd_lmm; /* lum->lmm_magic */
+               return v1->lmm_objects;
+}
 
-       switch (magic) {
-        case LOV_USER_MAGIC_V1:
+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);
+       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:
+ *
+ * composite_header:
+ * lcm_magic:       0x0BD60BD0
+ * lcm_size:        264
+ * lcm_flags:       0
+ * lcm_layout_gen:  2
+ * lcm_entry_count: 2
+ * components:
+ * - lcme_id:             1
+ *   lcme_flags:          0x10
+ *   lcme_extent.e_start: 0
+ *   lcme_extent.e_end:   1048576
+ *   lcme_offset:         128
+ *   lcme_size:           56
+ *   sub_layout:
+ *     lmm_magic:         0x0BD10BD0
+ *     lmm_seq:           0x200000401
+ *     lmm_object_id:     0x1
+ *     lmm_fid:           [0x200000401:0x1:0x0]
+ *     lmm_stripe_count:  1
+ *     lmm_stripe_size:   1048576
+ *     lmm_pattern:       1
+ *     lmm_layout_gen:    0
+ *     lmm_stripe_offset: 0
+ *     lmm_objects:
+ *     - 0: { l_ost_idx: 0, l_fid: [0x100000000:0x2:0x0] }
+ *
+ * - lcme_id:             2
+ *   lcme_flags:          0x10
+ *   lcme_extent.e_start: 1048576
+ *   lcme_extent.e_end:   EOF
+ *   lcme_offset:         184
+ *   lcme_size:           80
+ *     sub_layout:
+ *     lmm_magic:         0x0BD10BD0
+ *     lmm_seq:           0x200000401
+ *     lmm_object_id:     0x1
+ *     lmm_fid:           [0x200000401:0x1:0x0]
+ *     lmm_stripe_count:  2
+ *     lmm_stripe_size:   1048576
+ *     lmm_pattern:       1
+ *     lmm_layout_gen:    0
+ *     lmm_stripe_offset: 1
+ *     lmm_objects:
+ *     - 0: { l_ost_idx: 1, l_fid: [0x100010000:0x2:0x0] }
+ *     - 1: { l_ost_idx: 0, l_fid: [0x100000000:0x3:0x0] }
+ */
+static void lov_dump_comp_v1(struct find_param *param, char *path,
+                            enum lov_dump_flags flags)
+{
+       struct lov_comp_md_entry_v1 *entry;
+       struct lov_user_ost_data_v1 *objects;
+       struct lov_comp_md_v1 *comp_v1 = (void *)&param->fp_lmd->lmd_lmm;
+       struct lov_user_md_v1 *v1;
+       char pool_name[LOV_MAXPOOLNAME + 1];
+       int obdindex = param->fp_obd_index;
+       int i, j, match, obdstripe = 0;
+
+       if (obdindex != OBD_NOT_FOUND) {
+               for (i = 0; !(flags & LDF_IS_DIR) &&
+                           i < comp_v1->lcm_entry_count; i++) {
+                       if (!(comp_v1->lcm_entries[i].lcme_flags &
+                             LCME_FL_INIT))
+                               continue;
+
+                       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) {
+                                       obdstripe = 1;
+                                       break;
+                               }
+                       }
+               }
+       } else {
+               obdstripe = 1;
+       }
+
+       if (obdstripe == 0)
+               return;
+
+       lov_dump_comp_v1_header(param, path, flags);
+
+       flags |= LDF_INDENT;
+
+       for (i = 0; i < comp_v1->lcm_entry_count; i++) {
+               entry = &comp_v1->lcm_entries[i];
+
+               if (param->fp_check_comp_flags) {
+                       if ((param->fp_exclude_comp_flags &&
+                            (param->fp_comp_flags & entry->lcme_flags)) ||
+                           (!param->fp_exclude_comp_flags &&
+                            !(param->fp_comp_flags & entry->lcme_flags)))
+                               continue;
+               }
+
+               if (param->fp_check_comp_id &&
+                   param->fp_comp_id != entry->lcme_id)
+                       continue;
+
+               if (param->fp_check_comp_start) {
+                       match = find_value_cmp(entry->lcme_extent.e_start,
+                                              param->fp_comp_start,
+                                              param->fp_comp_start_sign,
+                                              0,
+                                              param->fp_comp_start_units, 0);
+                       if (match == -1)
+                               continue;
+               }
+
+               if (param->fp_check_comp_end) {
+                       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)
+                       flags &= ~LDF_SKIP_OBJS;
+               else
+                       flags |= LDF_SKIP_OBJS;
+
+               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);
+               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);
+       }
+}
+
+#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)
+{
+       int verbose = param->fp_verbose;
+
+       if (param->fp_check_comp_id || param->fp_check_comp_count ||
+           param->fp_check_comp_start || param->fp_check_comp_end ||
+           param->fp_check_comp_flags)
+               return true;
+
+       /* show full layout information, not component specific */
+       if ((verbose & ~VERBOSE_DETAIL) == VERBOSE_DEFAULT)
+               return false;
+
+       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, is_dir,
-                                      param->fp_obd_index, param->fp_max_depth,
-                                      param->fp_verbose, param->fp_raw);
-                break;
-        case LOV_USER_MAGIC_V3: {
-                char pool_name[LOV_MAXPOOLNAME + 1];
-                struct lov_user_ost_data_v1 *objects;
+                                      path, param->fp_obd_index,
+                                      param->fp_max_depth, param->fp_verbose,
+                                      flags);
+       } 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));
                objects = lmmv3->lmm_objects;
-               lov_dump_user_lmm_v1v3(&param->fp_lmd->lmd_lmm,
-                                      pool_name[0] == '\0' ? NULL : pool_name,
-                                      objects, path, is_dir,
-                                      param->fp_obd_index, param->fp_max_depth,
-                                      param->fp_verbose, param->fp_raw);
-                break;
-        }
+               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];
@@ -2689,12 +3123,14 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
 
                lum = (struct lmv_user_md *)param->fp_lmv_md;
                strlcpy(pool_name, lum->lum_pool_name, sizeof(pool_name));
-               lmv_dump_user_lmm(lum,
-                                 pool_name[0] == '\0' ? NULL : pool_name,
-                                 path, param->fp_obd_index,
-                                 param->fp_max_depth, param->fp_verbose);
+               lmv_dump_user_lmm(lum, pool_name, path, param->fp_obd_index,
+                                 param->fp_max_depth, param->fp_verbose,
+                                 flags);
                break;
        }
+       case LOV_USER_MAGIC_COMP_V1:
+               lov_dump_comp_v1(param, path, flags);
+               break;
        default:
                llapi_printf(LLAPI_MSG_NORMAL, "unknown lmm_magic:  %#x "
                             "(expecting one of %#x %#x %#x %#x)\n",
@@ -2707,44 +3143,44 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
 
 int llapi_file_get_stripe(const char *path, struct lov_user_md *lum)
 {
-        const char *fname;
-        char *dname;
-        int fd, rc = 0;
-
-        fname = strrchr(path, '/');
-
-        /* It should be a file (or other non-directory) */
-        if (fname == NULL) {
-                dname = (char *)malloc(2);
-                if (dname == NULL)
-                        return -ENOMEM;
-                strcpy(dname, ".");
-                fname = (char *)path;
-        } else {
-                dname = (char *)malloc(fname - path + 1);
-                if (dname == NULL)
-                        return -ENOMEM;
-                strncpy(dname, path, fname - path);
-                dname[fname - path] = '\0';
-                fname++;
-        }
+       const char *fname;
+       char *dname;
+       int fd, rc = 0;
 
-        fd = open(dname, O_RDONLY);
-        if (fd == -1) {
-                rc = -errno;
-                free(dname);
-                return rc;
-        }
+       fname = strrchr(path, '/');
 
-        strcpy((char *)lum, fname);
-        if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1)
-                rc = -errno;
+       /* It should be a file (or other non-directory) */
+       if (fname == NULL) {
+               dname = (char *)malloc(2);
+               if (dname == NULL)
+                       return -ENOMEM;
+               strcpy(dname, ".");
+               fname = (char *)path;
+       } else {
+               dname = (char *)malloc(fname - path + 1);
+               if (dname == NULL)
+                       return -ENOMEM;
+               strncpy(dname, path, fname - path);
+               dname[fname - path] = '\0';
+               fname++;
+       }
 
-        if (close(fd) == -1 && rc == 0)
-                rc = -errno;
+       fd = open(dname, O_RDONLY | O_NONBLOCK);
+       if (fd == -1) {
+               rc = -errno;
+               free(dname);
+               return rc;
+       }
 
-        free(dname);
-        return rc;
+       strcpy((char *)lum, fname);
+       if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1)
+               rc = -errno;
+
+       if (close(fd) == -1 && rc == 0)
+               rc = -errno;
+
+       free(dname);
+       return rc;
 }
 
 int llapi_file_lookup(int dirfd, const char *name)
@@ -2776,50 +3212,6 @@ int llapi_file_lookup(int dirfd, const char *name)
         return rc;
 }
 
-/* Check if the value matches 1 of the given criteria (e.g. --atime +/-N).
- * @mds indicates if this is MDS timestamps and there are attributes on OSTs.
- *
- * The result is -1 if it does not match, 0 if not yet clear, 1 if matches.
- * The table below gives the answers for the specified parameters (value and
- * sign), 1st column is the answer for the MDS value, the 2nd is for the OST:
- * --------------------------------------
- * 1 | file > limit; sign > 0 | -1 / -1 |
- * 2 | file = limit; sign > 0 | -1 / -1 |
- * 3 | file < limit; sign > 0 |  ? /  1 |
- * 4 | file > limit; sign = 0 | -1 / -1 |
- * 5 | file = limit; sign = 0 |  ? /  1 |  <- (see the Note below)
- * 6 | file < limit; sign = 0 |  ? / -1 |
- * 7 | file > limit; sign < 0 |  1 /  1 |
- * 8 | file = limit; sign < 0 |  ? / -1 |
- * 9 | file < limit; sign < 0 |  ? / -1 |
- * --------------------------------------
- * Note: 5th actually means that the value is within the interval
- * (limit - margin, limit]. */
-static int find_value_cmp(unsigned long long file, unsigned long long limit,
-                          int sign, int negopt, unsigned long long margin,
-                          int mds)
-{
-        int ret = -1;
-
-        if (sign > 0) {
-                /* Drop the fraction of margin (of days). */
-                if (file + margin <= limit)
-                        ret = mds ? 0 : 1;
-        } else if (sign == 0) {
-                if (file <= limit && file + margin > limit)
-                        ret = mds ? 0 : 1;
-                else if (file + margin <= limit)
-                        ret = mds ? 0 : -1;
-        } else if (sign < 0) {
-                if (file > limit)
-                        ret = 1;
-                else if (mds)
-                        ret = 0;
-        }
-
-        return negopt ? ~ret + 1 : ret;
-}
-
 /* Check if the file time matches all the given criteria (e.g. --atime +/-N).
  * Return -1 or 1 if file timestamp does not or does match the given criteria
  * correspondingly. Return 0 if the MDS time is being checked and there are
@@ -2878,9 +3270,11 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
  */
 static int check_obd_match(struct find_param *param)
 {
+       struct lov_user_ost_data_v1 *objects;
+       struct lov_comp_md_v1 *comp_v1 = NULL;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
        lstat_t *st = &param->fp_lmd->lmd_st;
-       struct lov_user_ost_data_v1 *lmm_objects;
-       int i, j;
+       int i, j, k, count = 1;
 
        if (param->fp_obd_uuid && param->fp_obd_index == OBD_NOT_FOUND)
                return 0;
@@ -2890,37 +3284,27 @@ static int check_obd_match(struct find_param *param)
 
        /* Only those files should be accepted, which have a
         * stripe on the specified OST. */
-       if (!param->fp_lmd->lmd_lmm.lmm_stripe_count)
-               return 0;
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+               count = comp_v1->lcm_entry_count;
+       }
 
-       if (param->fp_lmd->lmd_lmm.lmm_magic ==
-           LOV_USER_MAGIC_V3) {
-               struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_lmd->lmd_lmm;
+       for (i = 0; i < count; i++) {
+               if (comp_v1)
+                       v1 = lov_comp_entry(comp_v1, i);
 
-               lmm_objects = lmmv3->lmm_objects;
-       } else if (param->fp_lmd->lmd_lmm.lmm_magic ==  LOV_USER_MAGIC_V1) {
-               lmm_objects = param->fp_lmd->lmd_lmm.lmm_objects;
-       } else {
-               llapi_err_noerrno(LLAPI_MSG_ERROR, "%s:Unknown magic: 0x%08X\n",
-                                 __func__, param->fp_lmd->lmd_lmm.lmm_magic);
-               return -EINVAL;
-       }
+               objects = lov_v1v3_objects(v1);
 
-       for (i = 0; i < param->fp_lmd->lmd_lmm.lmm_stripe_count; i++) {
-               for (j = 0; j < param->fp_num_obds; j++) {
-                       if (param->fp_obd_indexes[j] ==
-                           lmm_objects[i].l_ost_idx) {
-                               if (param->fp_exclude_obd)
-                                       return 0;
-                               return 1;
+               for (j = 0; j < v1->lmm_stripe_count; j++) {
+                       for (k = 0; k < param->fp_num_obds; k++) {
+                               if (param->fp_obd_indexes[k] ==
+                                   objects[j].l_ost_idx)
+                                       return !param->fp_exclude_obd;
                        }
                }
        }
 
-       if (param->fp_exclude_obd)
-                return 1;
-
-       return 0;
+       return param->fp_exclude_obd;
 }
 
 static int check_mdt_match(struct find_param *param)
@@ -2951,9 +3335,10 @@ static int print_failed_tgt(struct find_param *param, char *path, int type)
 {
         struct obd_statfs stat_buf;
         struct obd_uuid uuid_buf;
-        int ret;
+       int ret;
 
-        LASSERT(type == LL_STATFS_LOV || type == LL_STATFS_LMV);
+       if (type != LL_STATFS_LOV && type != LL_STATFS_LMV)
+               return -EINVAL;
 
         memset(&stat_buf, 0, sizeof(struct obd_statfs));
         memset(&uuid_buf, 0, sizeof(struct obd_uuid));
@@ -2970,20 +3355,254 @@ static int print_failed_tgt(struct find_param *param, char *path, int type)
        return ret;
 }
 
+static int find_check_stripe_size(struct find_param *param)
+{
+       struct lov_comp_md_v1 *comp_v1 = NULL;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
+       int ret, i, count = 1;
+
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+               count = comp_v1->lcm_entry_count;
+               ret = param->fp_exclude_stripe_size ? 1 : -1;
+       }
+
+       for (i = 0; i < count; i++) {
+               if (comp_v1)
+                       v1 = lov_comp_entry(comp_v1, i);
+
+               ret = find_value_cmp(v1->lmm_stripe_size, param->fp_stripe_size,
+                                    param->fp_stripe_size_sign,
+                                    param->fp_exclude_stripe_size,
+                                    param->fp_stripe_size_units, 0);
+               /* If any stripe_size matches */
+               if (ret != -1)
+                       break;
+       }
+
+       return ret;
+}
+
+static __u32 find_get_stripe_count(struct find_param *param)
+{
+       struct lov_comp_md_v1 *comp_v1 = NULL;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
+       int i, count = 1;
+       __u32 stripe_count = 0;
+
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+               count = comp_v1->lcm_entry_count;
+       }
+
+       for (i = 0; i < count; i++) {
+               if (comp_v1)
+                       v1 = lov_comp_entry(comp_v1, i);
+               stripe_count += v1->lmm_stripe_count;
+       }
+
+       return stripe_count;
+}
+
+#define LOV_PATTERN_INVALID    0xFFFFFFFF
+
+static int find_check_layout(struct find_param *param)
+{
+       struct lov_comp_md_v1 *comp_v1 = NULL;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
+       int i, count = 1;
+       bool found = false, valid = false;
+
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+               count = comp_v1->lcm_entry_count;
+       }
+
+       for (i = 0; i < count; i++) {
+               if (comp_v1)
+                       v1 = lov_comp_entry(comp_v1, i);
+
+               if (v1->lmm_pattern == LOV_PATTERN_INVALID)
+                       continue;
+
+               valid = true;
+               if (v1->lmm_pattern & param->fp_layout) {
+                       found = true;
+                       break;
+               }
+       }
+
+       if (!valid)
+               return -1;
+
+       if ((found && !param->fp_exclude_layout) ||
+           (!found && param->fp_exclude_layout))
+               return 1;
+
+       return -1;
+}
+
+static int find_check_pool(struct find_param *param)
+{
+       struct lov_comp_md_v1 *comp_v1 = NULL;
+       struct lov_user_md_v1 *v1 = &param->fp_lmd->lmd_lmm;
+       struct lov_user_md_v3 *v3 = (void *)v1;
+       int i, count = 1;
+       bool found = false;
+
+       if (v1->lmm_magic == LOV_USER_MAGIC_COMP_V1) {
+               comp_v1 = (struct lov_comp_md_v1 *)v1;
+               count = comp_v1->lcm_entry_count;
+               /* empty requested pool is taken as no pool search */
+               if (count == 0 && param->fp_poolname[0] == '\0')
+                       found = true;
+       }
+
+       for (i = 0; i < count; i++) {
+               if (comp_v1 != NULL)
+                       v1 = lov_comp_entry(comp_v1, i);
+
+               if (((v1->lmm_magic == LOV_USER_MAGIC_V1) &&
+                    (param->fp_poolname[0] == '\0')) ||
+                   ((v1->lmm_magic == LOV_USER_MAGIC_V3) &&
+                    (strncmp(v3->lmm_pool_name,
+                             param->fp_poolname, LOV_MAXPOOLNAME) == 0)) ||
+                   ((v1->lmm_magic == LOV_USER_MAGIC_V3) &&
+                    (strcmp(param->fp_poolname, "*") == 0))) {
+                       found = true;
+                       break;
+               }
+       }
+
+       if ((found && !param->fp_exclude_pool) ||
+           (!found && param->fp_exclude_pool))
+               return 1;
+
+       return -1;
+}
+
+static int find_check_comp_options(struct find_param *param)
+{
+       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 = 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;
+               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;
+       }
+
+       /* 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(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)
+                       goto out;
+       }
+
+       ret = 1;
+       for (i = 0; i < comp_v1->lcm_entry_count; i++) {
+               entry = &comp_v1->lcm_entries[i];
+
+               if (param->fp_check_comp_flags) {
+                       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))
+                               ret = -1;
+                       else
+                               ret = 1;
+
+                       if (ret == -1)
+                               continue;
+               }
+
+               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 (ret == -1)
+                               continue;
+               }
+
+               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 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_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,
                        void *data, struct dirent64 *de)
 {
-        struct find_param *param = (struct find_param *)data;
+       struct find_param *param = (struct find_param *)data;
        DIR *dir = dirp == NULL ? NULL : *dirp;
-        int decision = 1; /* 1 is accepted; -1 is rejected. */
+       int decision = 1; /* 1 is accepted; -1 is rejected. */
        lstat_t *st = &param->fp_lmd->lmd_st;
-        int lustre_fs = 1;
-        int checked_type = 0;
-        int ret = 0;
-
-        LASSERT(parent != NULL || dir != NULL);
+       int lustre_fs = 1;
+       int checked_type = 0;
+       int ret = 0;
+       __u32 stripe_count = 0;
+       int fd = -2;
 
-       param->fp_lmd->lmd_lmm.lmm_stripe_count = 0;
+       if (parent == NULL && dir == NULL)
+               return -EINVAL;
 
        /* If a regular expression is presented, make the initial decision */
        if (param->fp_pattern != NULL) {
@@ -3015,20 +3634,26 @@ 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_pool || param->fp_check_size ||
-           param->fp_check_stripe_count || param->fp_check_stripe_size ||
-           param->fp_check_layout)
+           param->fp_check_size || find_check_lmm_info(param) ||
+           param->fp_check_mdt_count || param->fp_check_hash_type)
                decision = 0;
 
        if (param->fp_type != 0 && checked_type == 0)
                 decision = 0;
 
        if (decision == 0) {
+               if (param->fp_check_mdt_count || param->fp_check_hash_type) {
+                       param->fp_get_lmv = 1;
+                       ret = cb_get_dirstripe(path, dir, param);
+                       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);
                if (ret == 0 && param->fp_lmd->lmd_lmm.lmm_magic == 0 &&
-                   (param->fp_check_pool || param->fp_check_stripe_count ||
-                    param->fp_check_stripe_size || param->fp_check_layout)) {
+                   find_check_lmm_info(param)) {
                        struct lov_user_md *lmm = &param->fp_lmd->lmd_lmm;
 
                        /* We need to "fake" the "use the default" values
@@ -3047,8 +3672,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
@@ -3059,7 +3682,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;
                                }
@@ -3076,7 +3698,9 @@ 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);
                }
        }
 
@@ -3105,7 +3729,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) {
@@ -3117,33 +3741,41 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
         }
 
        if (param->fp_check_stripe_size) {
-               decision = find_value_cmp(
-                               param->fp_lmd->lmd_lmm.lmm_stripe_size,
-                               param->fp_stripe_size,
-                               param->fp_stripe_size_sign,
-                               param->fp_exclude_stripe_size,
-                               param->fp_stripe_size_units, 0);
+               decision = find_check_stripe_size(param);
                if (decision == -1)
                        goto decided;
        }
 
        if (param->fp_check_stripe_count) {
+               decision = find_value_cmp(stripe_count, param->fp_stripe_count,
+                                         param->fp_stripe_count_sign,
+                                         param->fp_exclude_stripe_count, 1, 0);
+               if (decision == -1)
+                       goto decided;
+       }
+
+       if (param->fp_check_mdt_count) {
                decision = find_value_cmp(
-                               param->fp_lmd->lmd_lmm.lmm_stripe_count,
-                               param->fp_stripe_count,
-                               param->fp_stripe_count_sign,
-                               param->fp_exclude_stripe_count, 1, 0);
+                               param->fp_lmv_md->lum_stripe_count,
+                               param->fp_mdt_count,
+                               param->fp_mdt_count_sign,
+                               param->fp_exclude_mdt_count, 1, 0);
                if (decision == -1)
                        goto decided;
-        }
+       }
 
        if (param->fp_check_layout) {
+               decision = find_check_layout(param);
+               if (decision == -1)
+                       goto decided;
+       }
+
+       if (param->fp_check_hash_type) {
                __u32 found;
 
-               found = (param->fp_lmd->lmd_lmm.lmm_pattern & param->fp_layout);
-               if ((param->fp_lmd->lmd_lmm.lmm_pattern == 0xFFFFFFFF) ||
-                   (found && param->fp_exclude_layout) ||
-                   (!found && !param->fp_exclude_layout)) {
+               found = param->fp_lmv_md->lum_hash_type & param->fp_hash_type;
+               if ((found && param->fp_exclude_hash_type) ||
+                   (!found && !param->fp_exclude_hash_type)) {
                        decision = -1;
                        goto decided;
                }
@@ -3198,33 +3830,47 @@ obd_matches:
                }
        }
 
-       if (param->fp_check_pool) {
-               struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_lmd->lmd_lmm;
+       if (param->fp_check_projid) {
+               int projid = 0;
 
-               /* empty requested pool is taken as no pool search => V1 */
-               if (((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V1) &&
-                    (param->fp_poolname[0] == '\0')) ||
-                   ((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
-                    (strncmp(lmmv3->lmm_pool_name,
-                             param->fp_poolname, LOV_MAXPOOLNAME) == 0)) ||
-                   ((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
-                    (strcmp(param->fp_poolname, "*") == 0))) {
-                       if (param->fp_exclude_pool)
+               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_pool)
+                       if (!param->fp_exclude_projid)
                                goto decided;
                }
        }
 
+       if (param->fp_check_pool) {
+               decision = find_check_pool(param);
+               if (decision == -1)
+                       goto decided;
+       }
+
+       if (param->fp_check_comp_count || param->fp_check_comp_flags ||
+           param->fp_check_comp_start || param->fp_check_comp_end) {
+               decision = find_check_comp_options(param);
+               if (decision == -1)
+                       goto decided;
+       }
+
        /* Check the time on mds. */
        decision = 1;
        if (param->fp_atime || param->fp_mtime || param->fp_ctime) {
                 int for_mds;
 
-               for_mds = lustre_fs ? (S_ISREG(st->st_mode) &&
-                                      param->fp_lmd->lmd_lmm.lmm_stripe_count)
-                       : 0;
+               for_mds = lustre_fs ?
+                       (S_ISREG(st->st_mode) && stripe_count) : 0;
                 decision = find_time_check(st, param, for_mds);
                 if (decision == -1)
                         goto decided;
@@ -3234,9 +3880,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) &&
-           param->fp_lmd->lmd_lmm.lmm_stripe_count)
-                decision = 0;
+       if (param->fp_check_size && S_ISREG(st->st_mode) && stripe_count)
+               decision = 0;
 
        if (param->fp_check_size && S_ISDIR(st->st_mode))
                decision = 0;
@@ -3265,19 +3910,19 @@ 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)
                decision = find_value_cmp(st->st_size, param->fp_size,
@@ -3285,43 +3930,51 @@ obd_matches:
                                          param->fp_exclude_size,
                                          param->fp_size_units, 0);
 
-        if (decision != -1) {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
+       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");
-        }
+                       llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
+               else
+                       llapi_printf(LLAPI_MSG_NORMAL, "\n");
+       }
 
 decided:
-        /* Do not get down anymore? */
-       if (param->fp_depth == param->fp_max_depth)
-               return 1;
-
+       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_mv_init(char *path, DIR *parent, DIR **dirp,
-                     void *param_data, struct dirent64 *de)
+static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
+                              void *param_data, struct dirent64 *de)
 {
        struct find_param       *param = (struct find_param *)param_data;
-       DIR                     *dir = parent;
+       DIR                     *tmp_parent = parent;
        char                    raw[OBD_MAX_IOCTL_BUFFER] = {'\0'};
        char                    *rawbuf = raw;
        struct obd_ioctl_data   data = { 0 };
        int                     fd;
        int                     ret;
+       char                    *path_copy;
        char                    *filename;
+       bool                    retry = false;
+
+       if (parent == NULL && dirp == NULL)
+               return -EINVAL;
 
-       LASSERT(parent != NULL || dirp != NULL);
        if (dirp != NULL)
                closedir(*dirp);
 
        if (parent == NULL) {
-               dir = opendir_parent(path);
-               if (dir == NULL) {
+               tmp_parent = opendir_parent(path);
+               if (tmp_parent == NULL) {
                        *dirp = NULL;
                        ret = -errno;
                        llapi_error(LLAPI_MSG_ERROR, ret,
@@ -3330,9 +3983,10 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp,
                }
        }
 
-       fd = dirfd(dir);
+       fd = dirfd(tmp_parent);
 
-       filename = basename(path);
+       path_copy = strdup(path);
+       filename = basename(path_copy);
        data.ioc_inlbuf1 = (char *)filename;
        data.ioc_inllen1 = strlen(filename) + 1;
        data.ioc_inlbuf2 = (char *)&param->fp_mdt_index;
@@ -3344,10 +3998,22 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp,
                goto out;
        }
 
+migrate:
        ret = ioctl(fd, LL_IOC_MIGRATE, rawbuf);
        if (ret != 0) {
+               if (errno == EBUSY && !retry) {
+                       /* because migrate may not be able to lock all involved
+                        * objects in order, for some of them it try lock, while
+                        * there may be conflicting COS locks and cause migrate
+                        * fail with EBUSY, hope a sync() could cause
+                        * transaction commit and release these COS locks. */
+                       sync();
+                       retry = true;
+                       goto migrate;
+               }
                ret = -errno;
-               fprintf(stderr, "%s migrate failed %d\n", path, ret);
+               fprintf(stderr, "%s migrate failed: %s (%d)\n",
+                       path, strerror(-ret), ret);
                goto out;
        } else if (param->fp_verbose & VERBOSE_DETAIL) {
                fprintf(stdout, "migrate %s to MDT%d\n",
@@ -3362,23 +4028,38 @@ out:
                 * on the client side, and re-open to get the
                 * new directory handle */
                *dirp = opendir(path);
-               if (dirp == NULL) {
+               if (*dirp == NULL) {
                        ret = -errno;
                        llapi_error(LLAPI_MSG_ERROR, ret,
                                    "%s: Failed to open '%s'", __func__, path);
-                       return ret;
                }
        }
 
        if (parent == NULL)
-               closedir(dir);
+               closedir(tmp_parent);
+
+       free(path_copy);
 
        return ret;
 }
 
+int llapi_migrate_mdt(char *path, struct find_param *param)
+{
+       return param_callback(path, cb_migrate_mdt_init, cb_common_fini, param);
+}
+
 int llapi_mv(char *path, struct find_param *param)
 {
-       return param_callback(path, cb_mv_init, cb_common_fini, param);
+#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 9, 59, 0)
+       static bool printed;
+
+       if (!printed) {
+               llapi_error(LLAPI_MSG_ERROR, -ESTALE,
+                           "llapi_mv() is deprecated, use llapi_migrate_mdt()\n");
+               printed = true;
+       }
+#endif
+       return llapi_migrate_mdt(path, param);
 }
 
 int llapi_find(char *path, struct find_param *param)
@@ -3406,7 +4087,8 @@ static int cb_get_mdt_index(char *path, DIR *parent, DIR **dirp, void *data,
        int ret;
        int mdtidx;
 
-       LASSERT(parent != NULL || d != NULL);
+       if (parent == NULL && d == NULL)
+               return -EINVAL;
 
        if (d != NULL) {
                ret = llapi_file_fget_mdtidx(dirfd(d), &mdtidx);
@@ -3468,14 +4150,15 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
        DIR *d = dirp == NULL ? NULL : *dirp;
         int ret = 0;
 
-        LASSERT(parent != NULL || d != NULL);
+       if (parent == NULL && d == NULL)
+               return -EINVAL;
 
        if (param->fp_obd_uuid) {
                param->fp_quiet = 1;
-                ret = setup_obd_uuid(d ? d : parent, path, param);
-                if (ret)
-                        return ret;
-        }
+               ret = setup_obd_uuid(d ? dirfd(d) : dirfd(parent), path, param);
+               if (ret)
+                       return ret;
+       }
 
        if (d) {
                if (param->fp_get_lmv || param->fp_get_default_lmv) {
@@ -3566,7 +4249,7 @@ err_out:
 
 dump:
        if (!(param->fp_verbose & VERBOSE_MDTINDEX))
-                llapi_lov_dump_user_lmm(param, path, d ? 1 : 0);
+               llapi_lov_dump_user_lmm(param, path, d ? LDF_IS_DIR : 0);
 
 out:
        /* Do not get down anymore? */
@@ -3585,11 +4268,9 @@ int llapi_getstripe(char *path, struct find_param *param)
                               cb_common_fini, param);
 }
 
-int llapi_obd_statfs(char *path, __u32 type, __u32 index,
-                     struct obd_statfs *stat_buf,
-                     struct obd_uuid *uuid_buf)
+int llapi_obd_fstatfs(int fd, __u32 type, __u32 index,
+                     struct obd_statfs *stat_buf, struct obd_uuid *uuid_buf)
 {
-        int fd;
         char raw[OBD_MAX_IOCTL_BUFFER] = {'\0'};
         char *rawbuf = raw;
         struct obd_ioctl_data data = { 0 };
@@ -3611,517 +4292,181 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index,
                 return rc;
         }
 
-        fd = open(path, O_RDONLY);
-        if (errno == EISDIR)
-                fd = open(path, O_DIRECTORY | O_RDONLY);
+       rc = ioctl(fd, IOC_OBD_STATFS, (void *)rawbuf);
+
+       return rc < 0 ? -errno : 0;
+}
+
+int llapi_obd_statfs(char *path, __u32 type, __u32 index,
+                    struct obd_statfs *stat_buf, struct obd_uuid *uuid_buf)
+{
+       int fd;
+       int rc;
 
+       fd = open(path, O_RDONLY);
        if (fd < 0) {
-               rc = errno ? -errno : -EBADF;
+               rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: %s: opening '%s'",
                            __func__, path);
                /* If we can't even open a file on the filesystem (e.g. with
                 * -ESHUTDOWN), force caller to exit or it will loop forever. */
                return -ENODEV;
        }
-       rc = ioctl(fd, IOC_OBD_STATFS, (void *)rawbuf);
-       if (rc)
-               rc = errno ? -errno : -EINVAL;
-
-       close(fd);
-       return rc;
-}
-
-#define MAX_STRING_SIZE 128
-
-int llapi_ping(char *obd_type, char *obd_name)
-{
-        char path[MAX_STRING_SIZE];
-        char buf[1];
-        int rc, fd;
-
-        snprintf(path, MAX_STRING_SIZE, "/proc/fs/lustre/%s/%s/ping",
-                 obd_type, obd_name);
-
-        fd = open(path, O_WRONLY);
-        if (fd < 0) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
-                return rc;
-        }
-
-       /* The purpose is to send a byte as a ping, whatever this byte is. */
-       /* coverity[uninit_use_in_call] */
-        rc = write(fd, buf, 1);
-        if (rc < 0)
-                rc = -errno;
-        close(fd);
-
-        if (rc == 1)
-                return 0;
-        return rc;
-}
-
-int llapi_target_iterate(int type_num, char **obd_type,
-                         void *args, llapi_cb_t cb)
-{
-        char buf[MAX_STRING_SIZE];
-        FILE *fp = fopen(DEVICES_LIST, "r");
-        int i, rc = 0;
-
-        if (fp == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
-                return rc;
-        }
-
-        while (fgets(buf, sizeof(buf), fp) != NULL) {
-                char *obd_type_name = NULL;
-                char *obd_name = NULL;
-                char *obd_uuid = NULL;
-                char *bufp = buf;
-                struct obd_statfs osfs_buffer;
-
-                while(bufp[0] == ' ')
-                        ++bufp;
-
-                for(i = 0; i < 3; i++) {
-                        obd_type_name = strsep(&bufp, " ");
-                }
-                obd_name = strsep(&bufp, " ");
-                obd_uuid = strsep(&bufp, " ");
-
-                memset(&osfs_buffer, 0, sizeof (osfs_buffer));
-
-                for (i = 0; i < type_num; i++) {
-                        if (strcmp(obd_type_name, obd_type[i]) != 0)
-                                continue;
-
-                        cb(obd_type_name, obd_name, obd_uuid, args);
-                }
-        }
-        fclose(fp);
-        return 0;
-}
-
-static void do_target_check(char *obd_type_name, char *obd_name,
-                            char *obd_uuid, void *args)
-{
-        int rc;
-
-        rc = llapi_ping(obd_type_name, obd_name);
-        if (rc == ENOTCONN) {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s inactive.\n", obd_name);
-        } else if (rc) {
-                llapi_error(LLAPI_MSG_ERROR, rc, "error: check '%s'", obd_name);
-        } else {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s active.\n", obd_name);
-        }
-}
 
-int llapi_target_check(int type_num, char **obd_type, char *dir)
-{
-        return llapi_target_iterate(type_num, obd_type, NULL, do_target_check);
-}
-
-#undef MAX_STRING_SIZE
-
-/* Is this a lustre fs? */
-int llapi_is_lustre_mnttype(const char *type)
-{
-        return (strcmp(type, "lustre") == 0 || strcmp(type,"lustre_lite") == 0);
-}
-
-/* Is this a lustre client fs? */
-int llapi_is_lustre_mnt(struct mntent *mnt)
-{
-        return (llapi_is_lustre_mnttype(mnt->mnt_type) &&
-                strstr(mnt->mnt_fsname, ":/") != NULL);
-}
-
-int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
-{
-        DIR *root;
-        int rc;
-
-        root = opendir(mnt);
-        if (!root) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
-                return rc;
-        }
-
-       rc = ioctl(dirfd(root), OBD_IOC_QUOTACTL, qctl);
-        if (rc < 0)
-                rc = -errno;
-
-        closedir(root);
-        return rc;
-}
-
-static int cb_quotachown(char *path, DIR *parent, DIR **dirp, void *data,
-                        struct dirent64 *de)
-{
-        struct find_param *param = (struct find_param *)data;
-       DIR *d = dirp == NULL ? NULL : *dirp;
-        lstat_t *st;
-        int rc;
-
-        LASSERT(parent != NULL || d != NULL);
-
-       rc = get_lmd_info(path, parent, d, param->fp_lmd, param->fp_lum_size);
-        if (rc) {
-                if (rc == -ENODATA) {
-                       if (!param->fp_obd_uuid && !param->fp_quiet)
-                                llapi_error(LLAPI_MSG_ERROR, -ENODATA,
-                                          "%s has no stripe info", path);
-                        rc = 0;
-                } else if (rc == -ENOENT) {
-                        rc = 0;
-                }
-                return rc;
-        }
-
-       st = &param->fp_lmd->lmd_st;
-
-        /* libc chown() will do extra check, and if the real owner is
-         * the same as the ones to set, it won't fall into kernel, so
-         * invoke syscall directly. */
-        rc = syscall(SYS_chown, path, -1, -1);
-        if (rc)
-                llapi_error(LLAPI_MSG_ERROR, errno,
-                            "error: chown %s", path);
-
-        rc = chmod(path, st->st_mode);
-        if (rc) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "error: chmod %s (%hu)",
-                            path, st->st_mode);
-        }
-
-        return rc;
-}
-
-int llapi_quotachown(char *path, int flag)
-{
-        struct find_param param;
-
-        memset(&param, 0, sizeof(param));
-       param.fp_recursive = 1;
-       param.fp_verbose = 0;
-       param.fp_quiet = 1;
-
-        return param_callback(path, cb_quotachown, NULL, &param);
-}
-
-#include <pwd.h>
-#include <grp.h>
-#include <mntent.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <ctype.h>
-
-static int rmtacl_notify(int ops)
-{
-        FILE *fp;
-        struct mntent *mnt;
-       int found = 0, fd = 0, rc = 0;
-
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "error setmntent(%s)", MOUNTED);
-                return rc;
-        }
-
-        while (1) {
-                mnt = getmntent(fp);
-                if (!mnt)
-                        break;
-
-               if (!llapi_is_lustre_mnt(mnt))
-                        continue;
-
-                fd = open(mnt->mnt_dir, O_RDONLY | O_DIRECTORY);
-                if (fd < 0) {
-                        rc = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                   "Can't open '%s'", mnt->mnt_dir);
-                       goto out;
-                }
-
-                rc = ioctl(fd, LL_IOC_RMTACL, ops);
-               close(fd);
-                if (rc < 0) {
-                        rc = -errno;
-                       llapi_error(LLAPI_MSG_ERROR, rc,
-                                   "ioctl RMTACL on '%s' err %d",
-                                   mnt->mnt_dir, rc);
-                       goto out;
-                }
-
-                found++;
-        }
-
-out:
-        endmntent(fp);
-       return ((rc != 0) ? rc : found);
-}
-
-static char *next_token(char *p, int div)
-{
-        if (p == NULL)
-                return NULL;
-
-        if (div)
-                while (*p && *p != ':' && !isspace(*p))
-                        p++;
-        else
-                while (*p == ':' || isspace(*p))
-                        p++;
-
-        return *p ? p : NULL;
-}
+       rc = llapi_obd_fstatfs(fd, type, index, stat_buf, uuid_buf);
 
-static int rmtacl_name2id(char *name, int is_user)
-{
-        if (is_user) {
-                struct passwd *pw;
-
-                pw = getpwnam(name);
-                if (pw == NULL)
-                        return INVALID_ID;
-                else
-                        return (int)(pw->pw_uid);
-        } else {
-                struct group *gr;
-
-                gr = getgrnam(name);
-                if (gr == NULL)
-                        return INVALID_ID;
-                else
-                        return (int)(gr->gr_gid);
-        }
-}
-
-static int isodigit(int c)
-{
-        return (c >= '0' && c <= '7') ? 1 : 0;
-}
-
-/*
- * Whether the name is just digits string (uid/gid) already or not.
- * Return value:
- * 1: str is id
- * 0: str is not id
- */
-static int str_is_id(char *str)
-{
-        if (str == NULL)
-                return 0;
-
-        if (*str == '0') {
-                str++;
-                if (*str == 'x' || *str == 'X') { /* for Hex. */
-                        if (!isxdigit(*(++str)))
-                                return 0;
-
-                        while (isxdigit(*(++str)));
-                } else if (isodigit(*str)) { /* for Oct. */
-                        while (isodigit(*(++str)));
-                }
-        } else if (isdigit(*str)) { /* for Dec. */
-                while (isdigit(*(++str)));
-        }
-
-        return (*str == 0) ? 1 : 0;
-}
-
-typedef struct {
-        char *name;
-        int   length;
-        int   is_user;
-        int   next_token;
-} rmtacl_name_t;
-
-#define RMTACL_OPTNAME(name) name, sizeof(name) - 1
-
-static rmtacl_name_t rmtacl_namelist[] = {
-        { RMTACL_OPTNAME("user:"),            1,      0 },
-        { RMTACL_OPTNAME("group:"),           0,      0 },
-        { RMTACL_OPTNAME("default:user:"),    1,      0 },
-        { RMTACL_OPTNAME("default:group:"),   0,      0 },
-        /* for --tabular option */
-        { RMTACL_OPTNAME("user"),             1,      1 },
-        { RMTACL_OPTNAME("group"),            0,      1 },
-        { 0 }
-};
-
-static int rgetfacl_output(char *str)
-{
-        char *start = NULL, *end = NULL;
-        int is_user = 0, n, id;
-        char c;
-        rmtacl_name_t *rn;
-
-        if (str == NULL)
-                return -1;
-
-        for (rn = rmtacl_namelist; rn->name; rn++) {
-                if(strncmp(str, rn->name, rn->length) == 0) {
-                        if (!rn->next_token)
-                                start = str + rn->length;
-                        else
-                                start = next_token(str + rn->length, 0);
-                        is_user = rn->is_user;
-                        break;
-                }
-        }
-
-        end = next_token(start, 1);
-        if (end == NULL || start == end) {
-                n = printf("%s", str);
-                return n;
-        }
+       close(fd);
 
-        c = *end;
-        *end = 0;
-        id = rmtacl_name2id(start, is_user);
-        if (id == INVALID_ID) {
-                if (str_is_id(start)) {
-                        *end = c;
-                        n = printf("%s", str);
-                } else
-                        return -1;
-        } else if ((id == NOBODY_UID && is_user) ||
-                   (id == NOBODY_GID && !is_user)) {
-                *end = c;
-                n = printf("%s", str);
-        } else {
-                *end = c;
-                *start = 0;
-                n = printf("%s%d%s", str, id, end);
-        }
-        return n;
+       return rc;
 }
 
-static int child_status(int status)
+#define MAX_STRING_SIZE 128
+
+int llapi_ping(char *obd_type, char *obd_name)
 {
-        return WIFEXITED(status) ? WEXITSTATUS(status) : -1;
+       glob_t path;
+       char buf[1];
+       int rc, fd;
+
+       rc = cfs_get_param_paths(&path, "%s/%s/ping",
+                               obd_type, obd_name);
+       if (rc != 0)
+               return -errno;
+
+       fd = open(path.gl_pathv[0], O_WRONLY);
+       if (fd < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s",
+                           path.gl_pathv[0]);
+               goto failed;
+       }
+
+       /* The purpose is to send a byte as a ping, whatever this byte is. */
+       /* coverity[uninit_use_in_call] */
+       rc = write(fd, buf, 1);
+       if (rc < 0)
+               rc = -errno;
+       close(fd);
+
+       if (rc == 1)
+               rc = 0;
+failed:
+       cfs_free_param_data(&path);
+       return rc;
 }
 
-static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
+int llapi_target_iterate(int type_num, char **obd_type,
+                         void *args, llapi_cb_t cb)
 {
-        pid_t pid = 0;
-        int fd[2], status, rc;
-        FILE *fp;
-        char buf[PIPE_BUF];
+       char buf[MAX_STRING_SIZE];
+       int i, rc = 0;
+       glob_t param;
+       FILE *fp;
 
-        if (output_func) {
-                if (pipe(fd) < 0) {
-                        rc = -errno;
-                       llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe");
-                        return rc;
-                }
+       rc = cfs_get_param_paths(&param, "devices");
+       if (rc != 0)
+               return -ENOENT;
 
-                pid = fork();
-                if (pid < 0) {
-                        rc = -errno;
-                       llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork");
-                        close(fd[0]);
-                        close(fd[1]);
-                        return rc;
-                } else if (!pid) {
-                        /* child process redirects its output. */
-                        close(fd[0]);
-                        close(1);
-                        if (dup2(fd[1], 1) < 0) {
-                                rc = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, rc,
-                                           "Can't dup2 %d", fd[1]);
-                                close(fd[1]);
-                                return rc;
-                        }
-                } else {
-                        close(fd[1]);
-                }
-        }
+       fp = fopen(param.gl_pathv[0], "r");
+       if (fp == NULL) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'",
+                           param.gl_pathv[0]);
+               goto free_path;
+       }
 
-        if (!pid) {
-                status = rmtacl_notify(ops);
-                if (status < 0)
-                        return -errno;
+        while (fgets(buf, sizeof(buf), fp) != NULL) {
+                char *obd_type_name = NULL;
+                char *obd_name = NULL;
+                char *obd_uuid = NULL;
+                char *bufp = buf;
+                struct obd_statfs osfs_buffer;
 
-                exit(execvp(argv[0], argv));
-        }
+                while(bufp[0] == ' ')
+                        ++bufp;
 
-        /* the following is parent process */
-        fp = fdopen(fd[0], "r");
-        if (fp == NULL) {
-                rc = -errno;
-               llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed", fd[0]);
-                kill(pid, SIGKILL);
-                close(fd[0]);
-                return rc;
-        }
+                for(i = 0; i < 3; i++) {
+                        obd_type_name = strsep(&bufp, " ");
+                }
+                obd_name = strsep(&bufp, " ");
+                obd_uuid = strsep(&bufp, " ");
 
-        while (fgets(buf, PIPE_BUF, fp) != NULL) {
-                if (output_func(buf) < 0)
-                        fprintf(stderr, "WARNING: unexpected error!\n[%s]\n",
-                                buf);
-        }
-        fclose(fp);
-        close(fd[0]);
+                memset(&osfs_buffer, 0, sizeof (osfs_buffer));
 
-        if (waitpid(pid, &status, 0) < 0) {
-                rc = -errno;
-               llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed", pid);
-                return rc;
-        }
+                for (i = 0; i < type_num; i++) {
+                        if (strcmp(obd_type_name, obd_type[i]) != 0)
+                                continue;
 
-        return child_status(status);
+                        cb(obd_type_name, obd_name, obd_uuid, args);
+                }
+       }
+       fclose(fp);
+free_path:
+       cfs_free_param_data(&param);
+       return 0;
 }
 
-int llapi_lsetfacl(int argc, char *argv[])
+static void do_target_check(char *obd_type_name, char *obd_name,
+                            char *obd_uuid, void *args)
 {
-        return do_rmtacl(argc, argv, RMT_LSETFACL, NULL);
+        int rc;
+
+        rc = llapi_ping(obd_type_name, obd_name);
+        if (rc == ENOTCONN) {
+                llapi_printf(LLAPI_MSG_NORMAL, "%s inactive.\n", obd_name);
+        } else if (rc) {
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: check '%s'", obd_name);
+        } else {
+                llapi_printf(LLAPI_MSG_NORMAL, "%s active.\n", obd_name);
+        }
 }
 
-int llapi_lgetfacl(int argc, char *argv[])
+int llapi_target_check(int type_num, char **obd_type, char *dir)
 {
-        return do_rmtacl(argc, argv, RMT_LGETFACL, NULL);
+        return llapi_target_iterate(type_num, obd_type, NULL, do_target_check);
 }
 
-int llapi_rsetfacl(int argc, char *argv[])
+#undef MAX_STRING_SIZE
+
+/* Is this a lustre fs? */
+int llapi_is_lustre_mnttype(const char *type)
 {
-        return do_rmtacl(argc, argv, RMT_RSETFACL, NULL);
+        return (strcmp(type, "lustre") == 0 || strcmp(type,"lustre_lite") == 0);
 }
 
-int llapi_rgetfacl(int argc, char *argv[])
+/* Is this a lustre client fs? */
+int llapi_is_lustre_mnt(struct mntent *mnt)
 {
-        return do_rmtacl(argc, argv, RMT_RGETFACL, rgetfacl_output);
+        return (llapi_is_lustre_mnttype(mnt->mnt_type) &&
+                strstr(mnt->mnt_fsname, ":/") != NULL);
 }
 
-int llapi_cp(int argc, char *argv[])
+int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
 {
-        int rc;
-
-        rc = rmtacl_notify(RMT_RSETFACL);
-        if (rc < 0)
-                return rc;
+       char fsname[PATH_MAX + 1];
+       int root;
+       int rc;
 
-        exit(execvp(argv[0], argv));
-}
+       rc = llapi_search_fsname(mnt, fsname);
+       if (rc) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "'%s' isn't on Lustre filesystem", mnt);
+               return rc;
+       }
 
-int llapi_ls(int argc, char *argv[])
-{
-        int rc;
+       root = open(mnt, O_RDONLY | O_DIRECTORY);
+       if (root < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+               return rc;
+       }
 
-        rc = rmtacl_notify(RMT_LGETFACL);
-        if (rc < 0)
-                return rc;
+       rc = ioctl(root, OBD_IOC_QUOTACTL, qctl);
+       if (rc < 0)
+               rc = -errno;
 
-        exit(execvp(argv[0], argv));
+       close(root);
+       return rc;
 }
 
 /* Print mdtname 'name' into 'buf' using 'format'.  Add -MDT0000 if needed.
@@ -4161,297 +4506,89 @@ 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;
-        }
-
-        if (mdtidxp)
-                *mdtidxp = index;
-
-        rc = ioctl(fd, opc, data);
-        if (rc == -1)
-                rc = -errno;
-        else
-                rc = 0;
-        if (rc && want_error)
-                llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d err %d", opc, rc);
-
-        close(fd);
-        return rc;
-}
-
-/****** Changelog API ********/
-
-static int changelog_ioctl(const char *mdtname, int opc, int id,
-                           long long recno, int flags)
-{
-        struct ioc_changelog data;
-        int *idx;
-
-        data.icc_id = id;
-        data.icc_recno = recno;
-        data.icc_flags = flags;
-        idx = (int *)(&data.icc_mdtindex);
-
-        return root_ioctl(mdtname, opc, &data, idx, WANT_ERROR);
-}
-
-#define CHANGELOG_PRIV_MAGIC 0xCA8E1080
-struct changelog_private {
-       int                             magic;
-       enum changelog_send_flag        flags;
-       struct lustre_kernelcomm        kuc;
-};
-
-/** Start reading from a changelog
- * @param priv Opaque private control structure
- * @param flags Start flags (e.g. CHANGELOG_FLAG_BLOCK)
- * @param device Report changes recorded on this MDT
- * @param startrec Report changes beginning with this record number
- * (just call llapi_changelog_fini when done; don't need an endrec)
- */
-int llapi_changelog_start(void **priv, enum changelog_send_flag flags,
-                         const char *device, long long startrec)
-{
-       struct changelog_private        *cp;
-       static bool                      warned;
-       int                              rc;
-
-       /* Set up the receiver control struct */
-       cp = calloc(1, sizeof(*cp));
-       if (cp == NULL)
-               return -ENOMEM;
-
-       cp->magic = CHANGELOG_PRIV_MAGIC;
-       cp->flags = flags;
-
-       /* Set up the receiver */
-       rc = libcfs_ukuc_start(&cp->kuc, 0 /* no group registration */, 0);
-       if (rc < 0)
-               goto out_free;
-
-       *priv = cp;
-
-       /* CHANGELOG_FLAG_JOBID will eventually become mandatory. Display a
-        * warning if it's missing. */
-       if (!(flags & CHANGELOG_FLAG_JOBID) && !warned) {
-               llapi_err_noerrno(LLAPI_MSG_WARN, "warning: %s() called "
-                                 "w/o CHANGELOG_FLAG_JOBID", __func__);
-               warned = true;
+       /* 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);
        }
-
-       /* Tell the kernel to start sending */
-       rc = changelog_ioctl(device, OBD_IOC_CHANGELOG_SEND, cp->kuc.lk_wfd,
-                            startrec, flags);
-       /* Only the kernel reference keeps the write side open */
-       close(cp->kuc.lk_wfd);
-       cp->kuc.lk_wfd = LK_NOFD;
        if (rc < 0) {
-               /* frees and clears priv */
-               llapi_changelog_fini(priv);
+               if (want_error)
+                       llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                         "Can't open %s: %d\n", mdtname, rc);
                return rc;
        }
 
-       return 0;
+       if (mdtidxp)
+               *mdtidxp = index;
 
-out_free:
-       free(cp);
+       rc = ioctl(fd, opc, data);
+       if (rc == -1)
+               rc = -errno;
+       else
+               rc = 0;
+       close(fd);
        return rc;
 }
 
-/** Finish reading from a changelog */
-int llapi_changelog_fini(void **priv)
+int llapi_fid2path(const char *device, const char *fidstr, char *buf,
+                  int buflen, long long *recno, int *linkno)
 {
-        struct changelog_private *cp = (struct changelog_private *)*priv;
-
-        if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
-                return -EINVAL;
-
-        libcfs_ukuc_stop(&cp->kuc);
-        free(cp);
-        *priv = NULL;
-        return 0;
-}
+       const char *fidstr_orig = fidstr;
+       struct lu_fid fid;
+       struct getinfo_fid2path *gf;
+       int rc;
 
-/**
- * Convert all records to a same format according to the caller's wishes.
- * Default is CLF_VERSION | CLF_RENAME.
- * Add CLF_JOBID if explicitely requested.
- *
- * \param rec  The record to remap. It is expected to be big enough to
- *             properly handle the final format.
- * \return 1 if anything changed. 0 otherwise.
- */
-/** Read the next changelog entry
- * @param priv Opaque private control structure
- * @param rech Changelog record handle; record will be allocated here
- * @return 0 valid message received; rec is set
- *         <0 error code
- *         1 EOF
- */
-#define DEFAULT_RECORD_FMT     (CLF_VERSION | CLF_RENAME)
-int llapi_changelog_recv(void *priv, struct changelog_rec **rech)
-{
-       struct changelog_private        *cp = (struct changelog_private *)priv;
-       struct kuc_hdr                  *kuch;
-       enum changelog_rec_flags         rec_fmt = DEFAULT_RECORD_FMT;
-       int                              rc = 0;
+       while (*fidstr == '[')
+               fidstr++;
 
-       if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
-               return -EINVAL;
-       if (rech == NULL)
+       sscanf(fidstr, SFID, RFID(&fid));
+       if (!fid_is_sane(&fid)) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "bad FID format '%s', should be [seq:oid:ver]"
+                                 " (e.g. "DFID")\n", fidstr_orig,
+                                 (unsigned long long)FID_SEQ_NORMAL, 2, 0);
                return -EINVAL;
-       kuch = malloc(KUC_CHANGELOG_MSG_MAXSIZE);
-       if (kuch == NULL)
+       }
+
+       gf = malloc(sizeof(*gf) + buflen);
+       if (gf == NULL)
                return -ENOMEM;
 
-       if (cp->flags & CHANGELOG_FLAG_JOBID)
-               rec_fmt |= CLF_JOBID;
+       gf->gf_fid = fid;
+       gf->gf_recno = *recno;
+       gf->gf_linkno = *linkno;
+       gf->gf_pathlen = buflen;
 
-repeat:
-       rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch,
-                                KUC_CHANGELOG_MSG_MAXSIZE,
-                                KUC_TRANSPORT_CHANGELOG);
-       if (rc < 0)
+       /* Take path or fsname */
+       rc = root_ioctl(device, OBD_IOC_FID2PATH, gf, NULL, 0);
+       if (rc)
                goto out_free;
 
-        if ((kuch->kuc_transport != KUC_TRANSPORT_CHANGELOG) ||
-            ((kuch->kuc_msgtype != CL_RECORD) &&
-             (kuch->kuc_msgtype != CL_EOF))) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "Unknown changelog message type %d:%d\n",
-                                  kuch->kuc_transport, kuch->kuc_msgtype);
-                rc = -EPROTO;
-                goto out_free;
-        }
-
-        if (kuch->kuc_msgtype == CL_EOF) {
-                if (cp->flags & CHANGELOG_FLAG_FOLLOW) {
-                        /* Ignore EOFs */
-                        goto repeat;
-                } else {
-                        rc = 1;
-                        goto out_free;
-                }
-        }
-
-       /* Our message is a changelog_rec.  Use pointer math to skip
-        * kuch_hdr and point directly to the message payload. */
-       *rech = (struct changelog_rec *)(kuch + 1);
-       changelog_remap_rec(*rech, rec_fmt);
-
-        return 0;
+       memcpy(buf, gf->gf_u.gf_path, gf->gf_pathlen);
+       if (buf[0] == '\0') { /* ROOT path */
+               buf[0] = '/';
+               buf[1] = '\0';
+       }
+       *recno = gf->gf_recno;
+       *linkno = gf->gf_linkno;
 
 out_free:
-        *rech = NULL;
-        free(kuch);
-        return rc;
-}
-
-/** Release the changelog record when done with it. */
-int llapi_changelog_free(struct changelog_rec **rech)
-{
-        if (*rech) {
-                /* We allocated memory starting at the kuc_hdr, but passed
-                 * the consumer a pointer to the payload.
-                 * Use pointer math to get back to the header.
-                 */
-                struct kuc_hdr *kuch = (struct kuc_hdr *)*rech - 1;
-                free(kuch);
-        }
-        *rech = NULL;
-        return 0;
-}
-
-int llapi_changelog_clear(const char *mdtname, const char *idstr,
-                          long long endrec)
-{
-       long id;
-
-        if (endrec < 0) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "can't purge negative records\n");
-                return -EINVAL;
-        }
-
-        id = strtol(idstr + strlen(CHANGELOG_USER_PREFIX), NULL, 10);
-        if ((id == 0) || (strncmp(idstr, CHANGELOG_USER_PREFIX,
-                                  strlen(CHANGELOG_USER_PREFIX)) != 0)) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "expecting id of the form '"
-                                  CHANGELOG_USER_PREFIX
-                                  "<num>'; got '%s'\n", idstr);
-                return -EINVAL;
-        }
-
-        return changelog_ioctl(mdtname, OBD_IOC_CHANGELOG_CLEAR, id, endrec, 0);
-}
-
-int llapi_fid2path(const char *device, const char *fidstr, char *buf,
-                   int buflen, long long *recno, int *linkno)
-{
-        struct lu_fid fid;
-        struct getinfo_fid2path *gf;
-        int rc;
-
-        while (*fidstr == '[')
-                fidstr++;
-
-        sscanf(fidstr, SFID, RFID(&fid));
-        if (!fid_is_sane(&fid)) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "bad FID format [%s], should be "DFID"\n",
-                                  fidstr, (__u64)1, 2, 0);
-                return -EINVAL;
-        }
-
-        gf = malloc(sizeof(*gf) + buflen);
-        if (gf == NULL)
-                return -ENOMEM;
-        gf->gf_fid = fid;
-        gf->gf_recno = *recno;
-        gf->gf_linkno = *linkno;
-        gf->gf_pathlen = buflen;
-
-        /* Take path or fsname */
-        rc = root_ioctl(device, OBD_IOC_FID2PATH, gf, NULL, 0);
-        if (rc) {
-                if (rc != -ENOENT)
-                        llapi_error(LLAPI_MSG_ERROR, rc, "ioctl err %d", rc);
-        } else {
-               memcpy(buf, gf->gf_path, gf->gf_pathlen);
-               if (buf[0] == '\0') { /* ROOT path */
-                       buf[0] = '/';
-                       buf[1] = '\0';
-               }
-               *recno = gf->gf_recno;
-               *linkno = gf->gf_linkno;
-        }
-
-        free(gf);
-        return rc;
+       free(gf);
+       return rc;
 }
 
 static int fid_from_lma(const char *path, const int fd, lustre_fid *fid)
@@ -4564,52 +4701,24 @@ int llapi_path2parent(const char *path, unsigned int linkno,
 
 int llapi_get_connect_flags(const char *mnt, __u64 *flags)
 {
-        DIR *root;
-        int rc;
-
-        root = opendir(mnt);
-        if (!root) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
-                return rc;
-        }
-
-        rc = ioctl(dirfd(root), LL_IOC_GET_CONNECT_FLAGS, flags);
-        if (rc < 0) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "ioctl on %s for getting connect flags failed", mnt);
-        }
-        closedir(root);
-        return rc;
-}
-
-int llapi_get_version(char *buffer, int buffer_size,
-                      char **version)
-{
-        int rc;
-        int fd;
-        struct obd_ioctl_data *data = (struct obd_ioctl_data *)buffer;
-
-        fd = open(OBD_DEV_PATH, O_RDONLY);
-        if (fd == -1)
-                return -errno;
+       int root;
+       int rc;
 
-        memset(buffer, 0, buffer_size);
-        data->ioc_version = OBD_IOCTL_VERSION;
-        data->ioc_inllen1 = buffer_size - cfs_size_round(sizeof(*data));
-        data->ioc_inlbuf1 = buffer + cfs_size_round(sizeof(*data));
-        data->ioc_len = obd_ioctl_packlen(data);
+       root = open(mnt, O_RDONLY | O_DIRECTORY);
+       if (root < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+               return rc;
+       }
 
-        rc = ioctl(fd, OBD_GET_VERSION, buffer);
-        if (rc == -1) {
-                rc = -errno;
-                close(fd);
-                return rc;
-        }
-        close(fd);
-        *version = data->ioc_bulk;
-        return 0;
+       rc = ioctl(root, LL_IOC_GET_CONNECT_FLAGS, flags);
+       if (rc < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                       "ioctl on %s for getting connect flags failed", mnt);
+       }
+       close(root);
+       return rc;
 }
 
 /**
@@ -4669,24 +4778,30 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
 {
        char    file_path[PATH_MAX];
        char    filename[PATH_MAX];
+       int     saved_errno = errno;
        int     fd;
        int     rnumber;
        int     rc;
 
-       rnumber = random();
-       if (idx == -1)
-               snprintf(filename, sizeof(filename),
-                        LUSTRE_VOLATILE_HDR"::%.4X", rnumber);
-       else
-               snprintf(filename, sizeof(filename),
-                        LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber);
+       do {
+               rnumber = random();
+               if (idx == -1)
+                       snprintf(filename, sizeof(filename),
+                                LUSTRE_VOLATILE_HDR"::%.4X", rnumber);
+               else
+                       snprintf(filename, sizeof(filename),
+                                LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber);
 
-       rc = snprintf(file_path, sizeof(file_path),
-                     "%s/%s", directory, filename);
-       if (rc >= sizeof(file_path))
-               return -E2BIG;
+               rc = snprintf(file_path, sizeof(file_path),
+                             "%s/%s", directory, filename);
+               if (rc >= sizeof(file_path))
+                       return -E2BIG;
+
+               fd = open(file_path,
+                         O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | open_flags,
+                         S_IRUSR | S_IWUSR);
+       } while (fd < 0 && errno == EEXIST);
 
-       fd = open(file_path, O_RDWR | O_CREAT | open_flags, S_IRUSR | S_IWUSR);
        if (fd < 0) {
                llapi_error(LLAPI_MSG_ERROR, errno,
                            "Cannot create volatile file '%s' in '%s'",
@@ -4694,10 +4809,17 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
                            directory);
                return -errno;
        }
-       /* unlink file in case this wasn't a Lustre filesystem, and the
-        * magic volatile filename wasn't handled as intended.  The effect
-        * is the same. */
-       unlink(file_path);
+
+       /* Unlink file in case this wasn't a Lustre filesystem and the
+        * magic volatile filename wasn't handled as intended. The
+        * effect is the same. If volatile open was supported then we
+        * expect unlink() to return -ENOENT. */
+       (void)unlink(file_path);
+
+       /* Since we are returning successfully we restore errno (and
+        * mask out possible EEXIST from open() and ENOENT from
+        * unlink(). */
+       errno = saved_errno;
 
        return fd;
 }