Whamcloud - gitweb
LU-1889 build: fix false 'uninitialized scalar variable' errs
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index e0d8e1d..8d8143e 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -58,6 +58,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
+#include <sys/xattr.h>
 #include <fnmatch.h>
 #include <glob.h>
 #ifdef HAVE_LINUX_UNISTD_H
 #else
 #include <unistd.h>
 #endif
+#include <poll.h>
 
-#include <libcfs/libcfsutil.h>  /* l_ioctl */
 #include <liblustre.h>
 #include <lnet/lnetctl.h>
 #include <obd.h>
-#include <lustre_lib.h>
 #include <obd_lov.h>
-#include <lustre/liblustreapi.h>
+#include <lustre/lustreapi.h>
 
 static unsigned llapi_dir_filetype_table[] = {
         [DT_UNKNOWN]= 0,
@@ -128,10 +128,13 @@ void llapi_msg_set_level(int level)
                 llapi_msg_level = level;
 }
 
-void llapi_err(int level, char *fmt, ...)
+/* llapi_error will preserve errno */
+void llapi_error(int level, int _rc, char *fmt, ...)
 {
         va_list args;
-        int tmp_errno = abs(errno);
+        int tmp_errno = errno;
+        /* to protect using errno as _rc argument */
+        int rc = abs(_rc);
 
         if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
                 return;
@@ -143,15 +146,15 @@ void llapi_err(int level, char *fmt, ...)
         if (level & LLAPI_MSG_NO_ERRNO)
                 fprintf(stderr, "\n");
         else
-                fprintf(stderr, ": %s (%d)\n", strerror(tmp_errno), tmp_errno);
+                fprintf(stderr, ": %s (%d)\n", strerror(rc), rc);
+        errno = tmp_errno;
 }
 
-#define llapi_err_noerrno(level, fmt, a...)                             \
-        llapi_err((level) | LLAPI_MSG_NO_ERRNO, fmt, ## a)
-
+/* llapi_printf will preserve errno */
 void llapi_printf(int level, char *fmt, ...)
 {
         va_list args;
+        int tmp_errno = errno;
 
         if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
                 return;
@@ -159,118 +162,400 @@ void llapi_printf(int level, char *fmt, ...)
         va_start(args, fmt);
         vfprintf(stdout, fmt, args);
         va_end(args);
+        errno = tmp_errno;
 }
 
 /**
- * size_units is unchanged if no specifier used
+ * size_units is to be initialized (or zeroed) by caller.
  */
 int parse_size(char *optarg, unsigned long long *size,
                unsigned long long *size_units, int bytes_spec)
 {
         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' &&
+                if ((*end == 'b') && *(end + 1) == '\0' &&
                     (*size & (~0ULL << (64 - 9))) == 0 &&
                     !bytes_spec) {
-                        *size <<= 9;
                         *size_units = 1 << 9;
-                } else if ((*end == 'b') && *(end+1) == '\0' &&
+                } 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 <<= 10;
+                           *(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 <<= 20;
+                           *(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 <<= 30;
+                           *(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 <<= 40;
+                           *(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 <<= 50;
+                           *(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 <<= 60;
+                           *(end + 1) == '\0' &&
+                           (*size & (~0ULL << (64 - 60))) == 0) {
                         *size_units = 1ULL << 60;
                 } else {
                         return -1;
                 }
         }
-
+        *size *= *size_units;
         return 0;
 }
 
-int llapi_stripe_limit_check(unsigned long stripe_size, int stripe_offset,
-                             int stripe_count, int stripe_pattern)
+/* XXX: llapi_xxx() functions return negative values upon failure */
+
+int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
+                               int stripe_count, int stripe_pattern)
+{
+       int page_size, rc;
+
+       /* 64 KB is the largest common page size I'm aware of (on ia64), but
+        * check the local page size just in case. */
+       page_size = LOV_MIN_STRIPE_SIZE;
+       if (getpagesize() > page_size) {
+               page_size = getpagesize();
+               llapi_err_noerrno(LLAPI_MSG_WARN,
+                               "warning: your page size (%u) is "
+                               "larger than expected (%u)", page_size,
+                               LOV_MIN_STRIPE_SIZE);
+       }
+       if (stripe_size < 0 || (stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe_size %lu, "
+                               "must be an even multiple of %d bytes",
+                               stripe_size, page_size);
+               return rc;
+       }
+       if (stripe_offset < -1 || stripe_offset > MAX_OBD_DEVICES) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe offset %d",
+                               stripe_offset);
+               return rc;
+       }
+       if (stripe_count < -1 || stripe_count > LOV_MAX_STRIPE_COUNT) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe count %d",
+                               stripe_count);
+               return rc;
+       }
+       if (stripe_size >= (1ULL << 32)) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                               "warning: stripe size 4G or larger "
+                               "is not currently supported and would wrap");
+               return rc;
+       }
+       return 0;
+}
+
+/* return the first file matching this pattern */
+static int first_match(char *pattern, char *buffer)
 {
-        int page_size;
+        glob_t glob_info;
+
+        if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
+                return -ENOENT;
 
-        /* 64 KB is the largest common page size I'm aware of (on ia64), but
-         * check the local page size just in case. */
-        page_size = LOV_MIN_STRIPE_SIZE;
-        if (getpagesize() > page_size) {
-                page_size = getpagesize();
-                llapi_err_noerrno(LLAPI_MSG_WARN,
-                                  "warning: your page size (%u) is "
-                                  "larger than expected (%u)", page_size,
-                                  LOV_MIN_STRIPE_SIZE);
+        if (glob_info.gl_pathc < 1) {
+                globfree(&glob_info);
+                return -ENOENT;
         }
-        if (stripe_size < 0 || (stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) {
-                llapi_err(LLAPI_MSG_ERROR, "error: bad stripe_size %lu, "
-                          "must be an even multiple of %d bytes",
-                          stripe_size, page_size);
+
+        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;
-        }
-        if (stripe_offset < -1 || stripe_offset > MAX_OBD_DEVICES) {
-                errno = -EINVAL;
-                llapi_err(LLAPI_MSG_ERROR, "error: bad stripe offset %d",
-                          stripe_offset);
+
+        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;
+}
+
+/**
+  * 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.
+  */
+static 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)
+                return rc;
+
+        fp = fopen(file, "r");
+        if (fp != NULL) {
+                while (fgets(buf, result_size, fp) != NULL)
+                        strcpy(result, buf);
+                fclose(fp);
+        } else {
+                rc = -errno;
         }
-        if (stripe_count < -1 || stripe_count > LOV_MAX_STRIPE_COUNT) {
-                errno = -EINVAL;
-                llapi_err(LLAPI_MSG_ERROR, "error: bad stripe count %d",
-                          stripe_count);
-                return -EINVAL;
+        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 + 1], dev[PATH_MAX + 1] = "*", fs[PATH_MAX + 1];
+        FILE *fp = fopen(DEVICES_LIST, "r");
+        int rc = 0;
+
+        if (!fsname && file_path) {
+                rc = llapi_search_fsname(file_path, fs);
+                if (rc) {
+                        llapi_error(LLAPI_MSG_ERROR, rc,
+                                    "'%s' is not on a Lustre filesystem",
+                                    file_path);
+                       if (fp != NULL)
+                               fclose(fp);
+                        return rc;
+                }
+        } else if (fsname) {
+                strcpy(fs, fsname);
         }
-        if (stripe_count > 0 && (__u64)stripe_size * stripe_count > 0xffffffff){
-                errno = -EINVAL;
-                llapi_err(LLAPI_MSG_ERROR, "error: stripe_size %lu * "
-                          "stripe_count %u exceeds 4GB", stripe_size,
-                          stripe_count);
-                return -EINVAL;
+
+        if (fp == NULL) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
+                return rc;
         }
-        return 0;
+
+        while (fgets(devices, sizeof(devices), fp) != NULL) {
+                char *bufp = devices, *tmp;
+
+                while (bufp[0] == ' ')
+                        ++bufp;
+
+                tmp = strstr(bufp, obd_type);
+                if (tmp) {
+                        tmp += strlen(obd_type) + 1;
+                        if (strcmp(tmp, fs))
+                                continue;
+                        strcpy(dev, tmp);
+                        tmp = strchr(dev, ' ');
+                        *tmp = '\0';
+                        break;
+                }
+        }
+
+        if (dev[0] == '*' && strlen(fs))
+                snprintf(dev, PATH_MAX, "%s-*", fs);
+        snprintf(devices, PATH_MAX, "%s/%s/%s", obd_type, dev, param_name);
+        fclose(fp);
+        return get_param(devices, value, val_len);
+}
+
+static int get_mds_md_size(char *path)
+{
+        int lumlen = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3);
+        char buf[16];
+
+        /* Now get the maxea from llite proc */
+        if (!get_param_obdvar(NULL, path, "llite", "max_easize",
+                              buf, sizeof(buf)))
+                lumlen = atoi(buf);
+        return lumlen;
 }
 
-static int poolpath(char *fsname, char *pathname, char *pool_pathname);
+/*
+ * if pool is NULL, search ostname in target_obd
+ * if pool is not NULL:
+ *  if pool not found returns errno < 0
+ *  if ostname is NULL, returns 1 if pool is not empty and 0 if pool empty
+ *  if ostname is not NULL, returns 1 if OST is in pool and 0 if not
+ */
+int llapi_search_ost(char *fsname, char *poolname, char *ostname)
+{
+        FILE *fd;
+        char buffer[PATH_MAX + 1];
+        int len = 0, rc;
+
+        if (ostname != NULL)
+                len = strlen(ostname);
+
+        if (poolname == NULL)
+                rc = find_target_obdpath(fsname, buffer);
+        else
+                rc = find_poolpath(fsname, poolname, buffer);
+        if (rc)
+                return rc;
+
+        fd = fopen(buffer, "r");
+        if (fd == NULL)
+                return -errno;
+
+        while (fgets(buffer, sizeof(buffer), fd) != NULL) {
+                if (poolname == NULL) {
+                        char *ptr;
+                        /* Search for an ostname in the list of OSTs
+                         Line format is IDX: fsname-OSTxxxx_UUID STATUS */
+                        ptr = strchr(buffer, ' ');
+                        if ((ptr != NULL) &&
+                            (strncmp(ptr + 1, ostname, len) == 0)) {
+                                fclose(fd);
+                                return 1;
+                        }
+                } else {
+                        /* Search for an ostname in a pool,
+                         (or an existing non-empty pool if no ostname) */
+                        if ((ostname == NULL) ||
+                            (strncmp(buffer, ostname, len) == 0)) {
+                                fclose(fd);
+                                return 1;
+                        }
+                }
+        }
+        fclose(fd);
+        return 0;
+}
 
 int llapi_file_open_pool(const char *name, int flags, int mode,
-                         unsigned long stripe_size, int stripe_offset,
+                         unsigned long long stripe_size, int stripe_offset,
                          int stripe_count, int stripe_pattern, char *pool_name)
 {
         struct lov_user_md_v3 lum = { 0 };
         int fd, rc = 0;
         int isdir = 0;
-        char fsname[MAX_OBD_NAME + 1], *ptr;
+
+        /* Make sure we have a good pool */
+        if (pool_name != NULL) {
+                char fsname[MAX_OBD_NAME + 1], *ptr;
+
+                rc = llapi_search_fsname(name, fsname);
+                if (rc) {
+                        llapi_error(LLAPI_MSG_ERROR, rc,
+                                    "'%s' is not on a Lustre filesystem",
+                                    name);
+                        return rc;
+                }
+
+                /* in case user gives the full pool name <fsname>.<poolname>,
+                 * strip the fsname */
+                ptr = strchr(pool_name, '.');
+                if (ptr != NULL) {
+                        *ptr = '\0';
+                        if (strcmp(pool_name, fsname) != 0) {
+                                *ptr = '.';
+                                llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "Pool '%s' is not on filesystem '%s'",
+                                          pool_name, fsname);
+                                return -EINVAL;
+                        }
+                        pool_name = ptr + 1;
+                }
+
+                /* Make sure the pool exists and is non-empty */
+                rc = llapi_search_ost(fsname, pool_name, NULL);
+                if (rc < 1) {
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "pool '%s.%s' %s", fsname, pool_name,
+                                          rc == 0 ? "has no OSTs" : "does not exist");
+                        return -EINVAL;
+                }
+        }
 
         fd = open(name, flags | O_LOV_DELAY_CREATE, mode);
         if (fd < 0 && errno == EISDIR) {
@@ -280,15 +565,14 @@ int llapi_file_open_pool(const char *name, int flags, int mode,
 
         if (fd < 0) {
                 rc = -errno;
-                llapi_err(LLAPI_MSG_ERROR, "unable to open '%s'", name);
+                llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name);
                 return rc;
         }
 
-        if ((rc = llapi_stripe_limit_check(stripe_size, stripe_offset,
-                                           stripe_count, stripe_pattern)) != 0){
-                errno = rc;
+        rc = llapi_stripe_limit_check(stripe_size, stripe_offset, stripe_count,
+                                      stripe_pattern);
+        if (rc != 0)
                 goto out;
-        }
 
         /*  Initialize IOCTL striping pattern structure */
         lum.lmm_magic = LOV_USER_MAGIC_V3;
@@ -296,19 +580,7 @@ int llapi_file_open_pool(const char *name, int flags, int mode,
         lum.lmm_stripe_size = stripe_size;
         lum.lmm_stripe_count = stripe_count;
         lum.lmm_stripe_offset = stripe_offset;
-
-        /* in case user give the full pool name <fsname>.<poolname>, skip
-         * the fsname */
         if (pool_name != NULL) {
-                ptr = strchr(pool_name, '.');
-                if (ptr != NULL) {
-                        strncpy(fsname, pool_name, ptr - pool_name);
-                        fsname[ptr - pool_name] = '\0';
-                        /* if fsname matches a filesystem skip it
-                         * if not keep the poolname as is */
-                        if (poolpath(fsname, NULL, NULL) == 0)
-                                pool_name = ptr + 1;
-                }
                 strncpy(lum.lmm_pool_name, pool_name, LOV_MAXPOOLNAME);
         } else {
                 /* If no pool is specified at all, use V1 request */
@@ -335,7 +607,7 @@ out:
 }
 
 int llapi_file_open(const char *name, int flags, int mode,
-                    unsigned long stripe_size, int stripe_offset,
+                    unsigned long long stripe_size, int stripe_offset,
                     int stripe_count, int stripe_pattern)
 {
         return llapi_file_open_pool(name, flags, mode, stripe_size,
@@ -343,7 +615,7 @@ int llapi_file_open(const char *name, int flags, int mode,
                                     stripe_pattern, NULL);
 }
 
-int llapi_file_create(const char *name, unsigned long stripe_size,
+int llapi_file_create(const char *name, unsigned long long stripe_size,
                       int stripe_offset, int stripe_count, int stripe_pattern)
 {
         int fd;
@@ -358,7 +630,7 @@ int llapi_file_create(const char *name, unsigned long stripe_size,
         return 0;
 }
 
-int llapi_file_create_pool(const char *name, unsigned long stripe_size,
+int llapi_file_create_pool(const char *name, unsigned long long stripe_size,
                            int stripe_offset, int stripe_count,
                            int stripe_pattern, char *pool_name)
 {
@@ -374,65 +646,192 @@ int llapi_file_create_pool(const char *name, unsigned long stripe_size,
         return 0;
 }
 
+/*
+ * Find the fsname, the full path, and/or an open fd.
+ * Either the fsname or path must not be NULL
+ */
+#define WANT_PATH   0x1
+#define WANT_FSNAME 0x2
+#define WANT_FD     0x4
+#define WANT_INDEX  0x8
+#define WANT_ERROR  0x10
+static int get_root_path(int want, char *fsname, int *outfd, char *path,
+                         int index)
+{
+        struct mntent mnt;
+        char buf[PATH_MAX], mntdir[PATH_MAX];
+        char *ptr;
+        FILE *fp;
+        int idx = 0, len = 0, mntlen, fd;
+        int rc = -ENODEV;
 
-static int print_pool_members(char *fs, char *pool_dir, char *pool_file)
-{
-        char path[PATH_MAX + 1];
-        char buf[1024];
-        FILE *fd;
+        /* 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;
+        }
+        while (1) {
+                if (getmntent_r(fp, &mnt, buf, sizeof(buf)) == NULL)
+                        break;
 
-        llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fs, pool_file);
-        sprintf(path, "%s/%s", pool_dir, pool_file);
-        if ((fd = fopen(path, "r")) == NULL) {
-                llapi_err(LLAPI_MSG_ERROR, "Cannot open %s\n", path);
-                return -EINVAL;
+                if (!llapi_is_lustre_mnt(&mnt))
+                        continue;
+
+                if ((want & WANT_INDEX) && (idx++ != index))
+                        continue;
+
+                mntlen = strlen(mnt.mnt_dir);
+                ptr = strrchr(mnt.mnt_fsname, '/');
+                if (!ptr && !len) {
+                        rc = -EINVAL;
+                        break;
+                }
+                ptr++;
+
+                /* Check the fsname for a match, if given */
+                if (!(want & WANT_FSNAME) && fsname != NULL &&
+                    (strlen(fsname) > 0) && (strcmp(ptr, fsname) != 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;
+                }
         }
-        while (fgets(buf, sizeof(buf), fd) != NULL)
-               llapi_printf(LLAPI_MSG_NORMAL, buf);
+        endmntent(fp);
 
-        fclose(fd);
-        return 0;
+        /* 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);
+
+                        } 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;
 }
 
 /*
- * search lustre fsname from pathname
+ * search lustre mounts
  *
+ * Calling this function will return to the user the mount point, mntdir, and
+ * the file system name, fsname, if the user passed a buffer to this routine.
+ *
+ * The user inputs are pathname and index. If the pathname is supplied then
+ * the value of the index will be ignored. The pathname will return data if
+ * the pathname is located on a lustre mount. Index is used to pick which
+ * mount point you want in the case of multiple mounted lustre file systems.
+ * See function lfs_osts in lfs.c for a example of the index use.
  */
-static int search_fsname(char *pathname, char *fsname)
+int llapi_search_mounts(const char *pathname, int index, char *mntdir,
+                        char *fsname)
 {
-        char *ptr;
-        FILE *fp;
-        struct mntent *mnt = NULL;
+        int want = WANT_PATH, idx = -1;
 
-        /* get the mount point */
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                 llapi_err(LLAPI_MSG_ERROR,
-                           "setmntent(%s) failed: %s:", MOUNTED,
-                           strerror (errno));
-                 return -EIO;
-        }
-        mnt = getmntent(fp);
-        while ((feof(fp) == 0) && ferror(fp) == 0) {
-                if (llapi_is_lustre_mnt(mnt)) {
-                        /* search by pathname */
-                        if (strncmp(mnt->mnt_dir, pathname,
-                                    max(strlen(pathname),
-                                        strlen(mnt->mnt_dir))) == 0) {
-                                ptr = strchr(mnt->mnt_fsname, '/');
-                                if (ptr == NULL)
-                                        return -EINVAL;
-                                ptr++;
-                                strcpy(fsname, ptr);
-                                return 0;
+        if (!pathname || pathname[0] == '\0') {
+                want |= WANT_INDEX;
+                idx = index;
+        } else
+                strcpy(mntdir, pathname);
+
+        if (fsname)
+                want |= WANT_FSNAME;
+        return get_root_path(want, fsname, NULL, mntdir, idx);
+}
+
+/* Given a path, find the corresponding Lustre fsname */
+int llapi_search_fsname(const char *pathname, char *fsname)
+{
+        char *path;
+        int rc;
+
+        path = realpath(pathname, NULL);
+        if (path == NULL) {
+                char buf[PATH_MAX + 1], *ptr;
+
+                buf[0] = 0;
+                if (pathname[0] != '/') {
+                        /* Need an absolute path, but realpath() only works for
+                         * pathnames that actually exist.  We go through the
+                         * extra hurdle of dirname(getcwd() + pathname) in
+                         * case the relative pathname contains ".." in it. */
+                        if (getcwd(buf, sizeof(buf) - 1) == NULL)
+                                return -errno;
+                        strcat(buf, "/");
+                }
+                strncat(buf, pathname, sizeof(buf) - strlen(buf));
+                path = realpath(buf, NULL);
+                if (path == NULL) {
+                        ptr = strrchr(buf, '/');
+                        if (ptr == NULL)
+                                return -ENOENT;
+                        *ptr = '\0';
+                        path = realpath(buf, NULL);
+                        if (path == NULL) {
+                                rc = -errno;
+                                llapi_error(LLAPI_MSG_ERROR, rc,
+                                            "pathname '%s' cannot expand",
+                                            pathname);
+                                return rc;
                         }
                 }
-                mnt = getmntent(fp);
         }
-        endmntent(fp);
-        return -ENOENT;
+        rc = get_root_path(WANT_FSNAME | WANT_ERROR, fsname, NULL, path, -1);
+        free(path);
+        return rc;
+}
+
+int llapi_getname(const char *path, char *buf, size_t size)
+{
+        struct obd_uuid uuid_buf;
+        char *uuid = uuid_buf.uuid;
+        int rc, nr;
+
+        memset(&uuid_buf, 0, sizeof(uuid_buf));
+        rc = llapi_file_get_lov_uuid(path, &uuid_buf);
+        if (rc)
+                return rc;
+
+        /* We want to turn lustre-clilov-ffff88002738bc00 into
+         * lustre-ffff88002738bc00. */
+
+        nr = snprintf(buf, size, "%.*s-%s",
+                      (int) (strlen(uuid) - 24), uuid,
+                      uuid + strlen(uuid) - 16);
+
+        if (nr >= size)
+                rc = -ENAMETOOLONG;
+
+        return rc;
 }
 
+
 /*
  * find the pool directory path under /proc
  * (can be also used to test if a fsname is known)
@@ -440,44 +839,134 @@ static int search_fsname(char *pathname, char *fsname)
 static int poolpath(char *fsname, char *pathname, char *pool_pathname)
 {
         int rc = 0;
-        glob_t glob_info;
         char pattern[PATH_MAX + 1];
         char buffer[PATH_MAX];
 
         if (fsname == NULL) {
-                rc = search_fsname(pathname, buffer);
+                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 = glob(pattern, GLOB_BRACE, NULL, &glob_info);
+        snprintf(pattern, PATH_MAX, "/proc/fs/lustre/lov/%s-*/pools", fsname);
+        rc = first_match(pattern, buffer);
         if (rc)
-                return -ENOENT;
-
-        if (glob_info.gl_pathc == 0) {
-                globfree(&glob_info);
-                return -ENOENT;
-        }
+                return rc;
 
         /* in fsname test mode, pool_pathname is NULL */
         if (pool_pathname != NULL)
-                strcpy(pool_pathname, glob_info.gl_pathv[0]);
+                strcpy(pool_pathname, buffer);
 
         return 0;
 }
 
-int llapi_poollist(char *name)
+/**
+ * Get the list of pool members.
+ * \param poolname    string of format \<fsname\>.\<poolname\>
+ * \param members     caller-allocated array of char*
+ * \param list_size   size of the members array
+ * \param buffer      caller-allocated buffer for storing OST names
+ * \param buffer_size size of the buffer
+ *
+ * \return number of members retrieved for this pool
+ * \retval -error failure
+ */
+int llapi_get_poolmembers(const char *poolname, char **members,
+                          int list_size, char *buffer, int buffer_size)
 {
-        char *poolname;
-        char *fsname;
-        char rname[PATH_MAX + 1], pathname[PATH_MAX + 1];
+        char fsname[PATH_MAX + 1];
+        char *pool, *tmp;
+        char pathname[PATH_MAX + 1];
+        char path[PATH_MAX + 1];
+        char buf[1024];
+        FILE *fd;
+        int rc = 0;
+        int nb_entries = 0;
+        int used = 0;
+
+        /* name is FSNAME.POOLNAME */
+        if (strlen(poolname) > PATH_MAX)
+                return -EOVERFLOW;
+        strcpy(fsname, poolname);
+        pool = strchr(fsname, '.');
+        if (pool == NULL)
+                return -EINVAL;
+
+        *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;
+        }
+
+        llapi_printf(LLAPI_MSG_NORMAL, "Pool: %s.%s\n", fsname, pool);
+        sprintf(path, "%s/%s", pathname, pool);
+        fd = fopen(path, "r");
+        if (fd == NULL) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open %s", path);
+                return rc;
+        }
+
+        rc = 0;
+        while (fgets(buf, sizeof(buf), fd) != NULL) {
+                if (nb_entries >= list_size) {
+                        rc = -EOVERFLOW;
+                        break;
+                }
+                /* remove '\n' */
+                tmp = strchr(buf, '\n');
+                if (tmp != NULL)
+                        *tmp='\0';
+                if (used + strlen(buf) + 1 > buffer_size) {
+                        rc = -EOVERFLOW;
+                        break;
+                }
+
+                strcpy(buffer + used, buf);
+                members[nb_entries] = buffer + used;
+                used += strlen(buf) + 1;
+                nb_entries++;
+                rc = nb_entries;
+        }
+
+        fclose(fd);
+        return rc;
+}
+
+/**
+ * Get the list of pools in a filesystem.
+ * \param name        filesystem name or path
+ * \param poollist    caller-allocated array of char*
+ * \param list_size   size of the poollist array
+ * \param buffer      caller-allocated buffer for storing pool names
+ * \param buffer_size size of the buffer
+ *
+ * \return number of pools retrieved for this filesystem
+ * \retval -error failure
+ */
+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 *ptr;
+        DIR *dir;
+        struct dirent pool;
+        struct dirent *cookie = NULL;
         int rc = 0;
+        unsigned int nb_entries = 0;
+        unsigned int used = 0;
+        unsigned int i;
+
+        /* initilize output array */
+        for (i = 0; i < list_size; i++)
+                poollist[i] = NULL;
 
         /* is name a pathname ? */
         ptr = strchr(name, '/');
@@ -485,89 +974,159 @@ int llapi_poollist(char *name)
                 /* only absolute pathname is supported */
                 if (*name != '/')
                         return -EINVAL;
+
                 if (!realpath(name, rname)) {
                         rc = -errno;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "llapi_poollist: invalid path '%s'",
-                                  name);
+                        llapi_error(LLAPI_MSG_ERROR, rc, "invalid path '%s'",
+                                    name);
                         return rc;
                 }
 
                 rc = poolpath(NULL, rname, pathname);
                 if (rc != 0) {
-                        errno = -rc;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "llapi_poollist: '%s' is not"
-                                  " a Lustre filesystem",
-                                  name);
+                        llapi_error(LLAPI_MSG_ERROR, rc, "'%s' is not"
+                                    " a Lustre filesystem", name);
                         return rc;
                 }
-                fsname = rname;
-                poolname = NULL;
+                strcpy(fsname, rname);
         } else {
-                /* name is FSNAME[.POOLNAME] */
-                fsname = name;
-                poolname = strchr(name, '.');
-                if (poolname != NULL) {
-                        *poolname = '\0';
-                        poolname++;
-                }
+                /* name is FSNAME */
+                strcpy(fsname, name);
                 rc = poolpath(fsname, NULL, pathname);
-                if (rc != 0) {
-                        errno = -rc;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "llapi_poollist: Lustre filesystem '%s'"
-                                  " not found", name);
-                        return rc;
-                }
         }
         if (rc != 0) {
-                errno = -rc;
-                llapi_err(LLAPI_MSG_ERROR,
-                          "llapi_poollist: Lustre filesystem '%s' not found",
-                          name);
+                llapi_error(LLAPI_MSG_ERROR, rc,
+                            "Lustre filesystem '%s' not found", name);
                 return rc;
         }
 
-        if (poolname != NULL) {
-                rc = print_pool_members(fsname, pathname, poolname);
-                poolname--;
-                *poolname = '.';
-        } else {
-                DIR *dir;
-                struct dirent *pool;
-
-                llapi_printf(LLAPI_MSG_NORMAL, "Pools from %s:\n", fsname);
-                if ((dir = opendir(pathname)) == NULL) {
-                        return -EINVAL;
-                }
-                while ((pool = readdir(dir)) != NULL) {
-                        if (!((pool->d_name[0] == '.') &&
-                              (pool->d_name[1] == '\0')) &&
-                            !((pool->d_name[0] == '.') &&
-                              (pool->d_name[1] == '.') &&
-                              (pool->d_name[2] == '\0')))
-                        llapi_printf(LLAPI_MSG_NORMAL, " %s.%s\n",
-                                     fsname, pool->d_name);
-                }
-                closedir(dir);
+        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;
         }
-        return rc;
-}
 
-typedef int (semantic_func_t)(char *path, DIR *parent, DIR *d,
-                              void *data, cfs_dirent_t *de);
+        while(1) {
+                rc = readdir_r(dir, &pool, &cookie);
+
+                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;
+                }
+
+                /* ignore . and .. */
+                if (!strcmp(pool.d_name, ".") || !strcmp(pool.d_name, ".."))
+                        continue;
+
+                /* check output bounds */
+               if (nb_entries >= list_size) {
+                       rc = -EOVERFLOW;
+                       goto out;
+               }
+
+                /* +2 for '.' and final '\0' */
+               if (used + strlen(pool.d_name) + strlen(fsname) + 2
+                   > buffer_size) {
+                       rc = -EOVERFLOW;
+                       goto out;
+               }
+
+                sprintf(buffer + used, "%s.%s", fsname, pool.d_name);
+                poollist[nb_entries] = buffer + used;
+                used += strlen(pool.d_name) + strlen(fsname) + 2;
+                nb_entries++;
+        }
+
+out:
+        closedir(dir);
+       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];
+
+        if (name[0] != '/') {
+                fsname = strdup(name);
+                poolname = strchr(fsname, '.');
+                if (poolname)
+                        *poolname = '\0';
+        } else {
+                path = (char *) name;
+        }
+
+        rc = get_param_obdvar(fsname, path, "lov", "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
+         * allocated space. */
+retry_get_pools:
+        bufsize = sizeof(struct obd_uuid) * obdcount;
+        buffer = realloc(tmp, bufsize + sizeof(*list) * obdcount);
+        if (buffer == NULL) {
+                rc = -ENOMEM;
+                goto err;
+        }
+        list = (char **) (buffer + bufsize);
+
+        if (!poolname) {
+                /* name is a path or fsname */
+                nb = llapi_get_poollist(name, list, obdcount,
+                                        buffer, bufsize);
+        } else {
+                /* name is a pool name (<fsname>.<poolname>) */
+                nb = llapi_get_poolmembers(name, list, obdcount,
+                                           buffer, bufsize);
+        }
+
+        if (nb == -EOVERFLOW) {
+                obdcount *= 2;
+                tmp = buffer;
+                goto retry_get_pools;
+        }
+
+        for (i = 0; i < nb; i++)
+                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", list[i]);
+        rc = (nb < 0 ? nb : 0);
+err:
+        if (buffer)
+                free(buffer);
+        if (fsname)
+                free(fsname);
+        return rc;
+}
+
+typedef int (semantic_func_t)(char *path, DIR *parent, DIR *d,
+                              void *data, cfs_dirent_t *de);
 
-#define MAX_LOV_UUID_COUNT      max(LOV_MAX_STRIPE_COUNT, 1000)
 #define OBD_NOT_FOUND           (-1)
 
-static int common_param_init(struct find_param *param)
+static int common_param_init(struct find_param *param, char *path)
 {
-        param->lumlen = lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC_V3);
-        if ((param->lmd = malloc(sizeof(lstat_t) + param->lumlen)) == NULL) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: allocation of %d bytes for ioctl",
-                          sizeof(lstat_t) + param->lumlen);
+        param->lumlen = get_mds_md_size(path);
+        param->lmd = malloc(sizeof(lstat_t) + param->lumlen);
+        if (param->lmd == NULL) {
+                llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
+                            "error: allocation of %d bytes for ioctl",
+                            sizeof(lstat_t) + param->lumlen);
                 return -ENOMEM;
         }
 
@@ -586,12 +1145,244 @@ static void find_param_fini(struct find_param *param)
                 free(param->lmd);
 }
 
+static int cb_common_fini(char *path, DIR *parent, DIR *d, void *data,
+                          cfs_dirent_t *de)
+{
+        struct find_param *param = (struct find_param *)data;
+        param->depth--;
+        return 0;
+}
+
+/* set errno upon failure */
+static DIR *opendir_parent(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;
+}
+
+static int get_lmd_info(char *path, DIR *parent, DIR *dir,
+                 struct lov_user_mds_data *lmd, int lumlen)
+{
+        lstat_t *st = &lmd->lmd_st;
+        int ret = 0;
+
+        if (parent == NULL && dir == NULL)
+                return -EINVAL;
+
+        if (dir) {
+                ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO, (void *)lmd);
+        } else if (parent) {
+                char *fname = strrchr(path, '/');
+
+                fname = (fname == NULL ? path : fname + 1);
+                /* retrieve needed file info */
+                strncpy((char *)lmd, fname, lumlen);
+                ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
+        } else {
+                return ret;
+        }
+
+        if (ret) {
+                if (errno == ENOTTY) {
+                        /* ioctl is not supported, it is not a lustre fs.
+                         * Do the regular lstat(2) instead. */
+                        ret = lstat_f(path, st);
+                        if (ret) {
+                                ret = -errno;
+                                llapi_error(LLAPI_MSG_ERROR, ret,
+                                            "error: %s: lstat failed for %s",
+                                            __func__, path);
+                        }
+                } else if (errno == ENOENT) {
+                        ret = -errno;
+                        llapi_error(LLAPI_MSG_WARN, ret,
+                                    "warning: %s: %s does not exist",
+                                    __func__, path);
+                } else if (errno != EISDIR) {
+                        ret = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                    "%s ioctl failed for %s.",
+                                    dir ? "LL_IOC_MDC_GETINFO" :
+                                    "IOC_MDC_GETFILEINFO", path);
+                } else {
+                        ret = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                   "error: %s: IOC_MDC_GETFILEINFO failed for %s",
+                                   __func__, path);
+                }
+        }
+        return ret;
+}
+
+int llapi_mds_getfileinfo(char *path, DIR *parent,
+                          struct lov_user_mds_data *lmd)
+{
+        int lumlen = get_mds_md_size(path);
+
+        return get_lmd_info(path, parent, NULL, lmd, lumlen);
+}
+
+static int llapi_semantic_traverse(char *path, int size, DIR *parent,
+                                   semantic_func_t sem_init,
+                                   semantic_func_t sem_fini, void *data,
+                                   cfs_dirent_t *de)
+{
+        cfs_dirent_t *dent;
+        int len, ret;
+        DIR *d, *p = NULL;
+
+        ret = 0;
+        len = strlen(path);
+
+        d = opendir(path);
+        if (!d && errno != ENOTDIR) {
+                ret = -errno;
+                llapi_error(LLAPI_MSG_ERROR, ret, "%s: Failed to open '%s'",
+                            __func__, path);
+                return ret;
+        } else if (!d && !parent) {
+                /* ENOTDIR. Open the parent dir. */
+                p = opendir_parent(path);
+                if (!p)
+                        GOTO(out, ret = -errno);
+        }
+
+        if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de)))
+                goto err;
+
+        if (!d)
+                GOTO(out, ret = 0);
+
+        while ((dent = readdir64(d)) != NULL) {
+                ((struct find_param *)data)->have_fileinfo = 0;
+
+                if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
+                        continue;
+
+                /* Don't traverse .lustre directory */
+                if (!(strcmp(dent->d_name, dot_lustre_name)))
+                        continue;
+
+                path[len] = 0;
+                if ((len + dent->d_reclen + 2) > size) {
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "error: %s: string buffer is too small",
+                                          __func__);
+                        break;
+                }
+                strcat(path, "/");
+                strcat(path, dent->d_name);
+
+                if (dent->d_type == DT_UNKNOWN) {
+                        lstat_t *st = &((struct find_param *)data)->lmd->lmd_st;
+
+                        ret = llapi_mds_getfileinfo(path, d,
+                                             ((struct find_param *)data)->lmd);
+                        if (ret == 0) {
+                                ((struct find_param *)data)->have_fileinfo = 1;
+                                dent->d_type =
+                                        llapi_filetype_dir_table[st->st_mode &
+                                                                 S_IFMT];
+                        }
+                        if (ret == -ENOENT)
+                                continue;
+                }
+
+                switch (dent->d_type) {
+                case DT_UNKNOWN:
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "error: %s: '%s' is UNKNOWN type %d",
+                                          __func__, dent->d_name, dent->d_type);
+                        break;
+                case DT_DIR:
+                        ret = llapi_semantic_traverse(path, size, d, sem_init,
+                                                      sem_fini, data, dent);
+                        if (ret < 0)
+                                goto out;
+                        break;
+                default:
+                        ret = 0;
+                        if (sem_init) {
+                                ret = sem_init(path, d, NULL, data, dent);
+                                if (ret < 0)
+                                        goto out;
+                        }
+                        if (sem_fini && ret == 0)
+                                sem_fini(path, d, NULL, data, dent);
+                }
+        }
+
+out:
+        path[len] = 0;
+
+        if (sem_fini)
+                sem_fini(path, parent, d, data, de);
+err:
+        if (d)
+                closedir(d);
+        if (p)
+                closedir(p);
+        return ret;
+}
+
+static int param_callback(char *path, semantic_func_t sem_init,
+                          semantic_func_t sem_fini, struct find_param *param)
+{
+        int ret, len = strlen(path);
+        char *buf;
+
+        if (len > PATH_MAX) {
+                ret = -EINVAL;
+                llapi_error(LLAPI_MSG_ERROR, ret,
+                            "Path name '%s' is too long", path);
+                return ret;
+        }
+
+        buf = (char *)malloc(PATH_MAX + 1);
+        if (!buf)
+                return -ENOMEM;
+
+        strncpy(buf, path, PATH_MAX + 1);
+        ret = common_param_init(param, buf);
+        if (ret)
+                goto out;
+        param->depth = 0;
+
+        ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, sem_init,
+                                      sem_fini, param, NULL);
+out:
+        find_param_fini(param);
+        free(buf);
+        return ret < 0 ? ret : 0;
+}
+
 int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_name)
 {
         int rc = ioctl(fd, OBD_IOC_GETNAME, lov_name);
         if (rc) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "error: can't get lov name.");
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lov name.");
+        }
+        return rc;
+}
+
+int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name)
+{
+        int rc = ioctl(fd, OBD_IOC_GETMDNAME, lov_name);
+        if (rc) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lmv name.");
         }
         return rc;
 }
@@ -602,43 +1393,53 @@ int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
 
         fd = open(path, O_RDONLY);
         if (fd < 0) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "error opening %s", path);
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error opening %s", path);
                 return rc;
         }
 
         rc = llapi_file_fget_lov_uuid(fd, lov_uuid);
 
         close(fd);
-
         return rc;
 }
 
+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
  * there are more OSTs then allocated to uuidp, then an error is returned with
  * the ost_count set to number of available obd uuids.
  */
-int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
+static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
+                                  int *ost_count, enum tgt_type type)
 {
-        struct obd_uuid lov_name;
+        struct obd_uuid name;
         char buf[1024];
         FILE *fp;
         int rc = 0, index = 0;
 
         /* Get the lov name */
-        rc = llapi_file_fget_lov_uuid(fd, &lov_name);
-        if (rc)
-                return rc;
+        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;
+        }
 
         /* Now get the ost uuids from /proc */
-        snprintf(buf, sizeof(buf), "/proc/fs/lustre/lov/%s/target_obd",
-                 lov_name.uuid);
+        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_err(LLAPI_MSG_ERROR, "error: opening '%s'", buf);
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf);
                 return rc;
         }
 
@@ -652,13 +1453,18 @@ int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
 
         fclose(fp);
 
-        if (uuidp && (index >= *ost_count))
-                return -EOVERFLOW;
+        if (uuidp && (index > *ost_count))
+                rc = -EOVERFLOW;
 
         *ost_count = index;
         return rc;
 }
 
+int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
+{
+        return llapi_get_target_uuids(fd, uuidp, ost_count, LOV_TYPE);
+}
+
 int llapi_get_obd_count(char *mnt, int *count, int is_mdt)
 {
         DIR *root;
@@ -666,34 +1472,65 @@ int llapi_get_obd_count(char *mnt, int *count, int is_mdt)
 
         root = opendir(mnt);
         if (!root) {
-                llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt);
-                return -1;
+                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;
 
         closedir(root);
         return rc;
 }
 
+/* Check if user specified value matches a real uuid.  Ignore _UUID,
+ * -osc-4ba41334, other trailing gunk in comparison.
+ * @param real_uuid ends in "_UUID"
+ * @param search_uuid may or may not end in "_UUID"
+ */
+int llapi_uuid_match(char *real_uuid, char *search_uuid)
+{
+        int cmplen = strlen(real_uuid);
+        int searchlen = strlen(search_uuid);
+
+        if (cmplen > 5 && strcmp(real_uuid + cmplen - 5, "_UUID") == 0)
+                cmplen -= 5;
+        if (searchlen > 5 && strcmp(search_uuid + searchlen - 5, "_UUID") == 0)
+                searchlen -= 5;
+
+        /* The UUIDs may legitimately be different lengths, if
+         * the system was upgraded from an older version. */
+        if (cmplen != searchlen)
+                return 0;
+
+        return (strncmp(search_uuid, real_uuid, cmplen) == 0);
+}
+
 /* Here, param->obduuid points to a single obduuid, the index of which is
  * returned in param->obdindex */
 static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
 {
-        struct obd_uuid lov_uuid;
+        struct obd_uuid obd_uuid;
         char uuid[sizeof(struct obd_uuid)];
         char buf[1024];
         FILE *fp;
         int rc = 0, index;
 
-        /* Get the lov name */
-        rc = llapi_file_fget_lov_uuid(dirfd(dir), &lov_uuid);
+        if (param->got_uuids)
+                return rc;
+
+        /* Get the lov/lmv name */
+        if (param->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 (errno != ENOTTY) {
-                        rc = errno;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: can't get lov name: %s", dname);
+                if (rc != -ENOTTY) {
+                        llapi_error(LLAPI_MSG_ERROR, rc,
+                                    "error: can't get lov name: %s", dname);
                 } else {
                         rc = 0;
                 }
@@ -703,25 +1540,25 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
         param->got_uuids = 1;
 
         /* Now get the ost uuids from /proc */
-        snprintf(buf, sizeof(buf), "/proc/fs/lustre/lov/%s/target_obd",
-                 lov_uuid.uuid);
+        snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd",
+                 param->get_lmv ? "lmv" : "lov", obd_uuid.uuid);
         fp = fopen(buf, "r");
         if (fp == NULL) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "error: opening '%s'", buf);
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening '%s'", buf);
                 return rc;
         }
 
         if (!param->obduuid && !param->quiet && !param->obds_printed)
-                llapi_printf(LLAPI_MSG_NORMAL, "OBDS:\n");
+                llapi_printf(LLAPI_MSG_NORMAL, "%s:\n",
+                             param->get_lmv ? "MDTS" : "OBDS:");
 
         while (fgets(buf, sizeof(buf), fp) != NULL) {
                 if (sscanf(buf, "%d: %s", &index, uuid) < 2)
                         break;
 
                 if (param->obduuid) {
-                        if (strncmp(param->obduuid->uuid, uuid,
-                                    sizeof(uuid)) == 0) {
+                        if (llapi_uuid_match(uuid, param->obduuid->uuid)) {
                                 param->obdindex = index;
                                 break;
                         }
@@ -734,12 +1571,11 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
 
         fclose(fp);
 
-        if (!param->quiet && param->obduuid &&
-            (param->obdindex == OBD_NOT_FOUND)) {
+        if (param->obduuid && (param->obdindex == OBD_NOT_FOUND)) {
                 llapi_err_noerrno(LLAPI_MSG_ERROR,
                                   "error: %s: unknown obduuid: %s",
-                                  __FUNCTION__, param->obduuid->uuid);
-                //rc = EINVAL;
+                                  __func__, param->obduuid->uuid);
+                rc = -EINVAL;
         }
 
         return (rc);
@@ -748,207 +1584,442 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
 /* In this case, param->obduuid will be an array of obduuids and
  * obd index for all these obduuids will be returned in
  * param->obdindexes */
-static int setup_obd_indexes(DIR *dir, struct find_param *param)
+static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
+                         int num_obds, int **obdindexes, int *obdindex,
+                         enum tgt_type type)
 {
+        int ret, obdcount, obd_valid = 0, obdnum, i;
         struct obd_uuid *uuids = NULL;
-        int obdcount = INIT_ALLOC_NUM_OSTS;
-        int ret, obd_valid = 0, obdnum, i;
+        char buf[16];
+        int *indexes;
+
+        ret = get_param_obdvar(NULL, path, type == LOV_TYPE ? "lov" : "lmv",
+                               "numobd", buf, sizeof(buf));
+        if (ret)
+                return ret;
 
-        uuids = (struct obd_uuid *)malloc(INIT_ALLOC_NUM_OSTS *
+        obdcount = atoi(buf);
+        uuids = (struct obd_uuid *)malloc(obdcount *
                                           sizeof(struct obd_uuid));
         if (uuids == NULL)
                 return -ENOMEM;
 
 retry_get_uuids:
-        ret = llapi_lov_get_uuids(dirfd(dir), uuids,
-                                  &obdcount);
+        ret = llapi_get_target_uuids(dirfd(dir), uuids, &obdcount, type);
         if (ret) {
                 struct obd_uuid *uuids_temp;
 
                 if (ret == -EOVERFLOW) {
                         uuids_temp = realloc(uuids, obdcount *
                                              sizeof(struct obd_uuid));
-                        if (uuids_temp != NULL)
+                       if (uuids_temp != NULL) {
+                               uuids = uuids_temp;
                                 goto retry_get_uuids;
+                       }
                         else
                                 ret = -ENOMEM;
                 }
 
-                llapi_err(LLAPI_MSG_ERROR, "get ost uuid failed");
-                return ret;
+                llapi_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed");
+                goto out_free;
         }
 
-        param->obdindexes = malloc(param->num_obds * sizeof(param->obdindex));
-        if (param->obdindexes == NULL)
-                return -ENOMEM;
+        indexes = malloc(num_obds * sizeof(*obdindex));
+        if (indexes == NULL) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
 
-        for (obdnum = 0; obdnum < param->num_obds; obdnum++) {
-                for (i = 0; i <= obdcount; i++) {
-                        if (strcmp((char *)&param->obduuid[obdnum].uuid,
-                                   (char *)&uuids[i]) == 0) {
-                                param->obdindexes[obdnum] = i;
-                                obd_valid++;
-                                break;
+        for (obdnum = 0; obdnum < num_obds; obdnum++) {
+                char *end = NULL;
+
+                /* The user may have specified a simple index */
+                i = strtol(obduuids[obdnum].uuid, &end, 0);
+                if (end && *end == '\0' && i < obdcount) {
+                        indexes[obdnum] = i;
+                        obd_valid++;
+                } else {
+                        for (i = 0; i < obdcount; i++) {
+                                if (llapi_uuid_match(uuids[i].uuid,
+                                                     obduuids[obdnum].uuid)) {
+                                        indexes[obdnum] = i;
+                                        obd_valid++;
+                                        break;
+                                }
                         }
                 }
-                if (i == obdcount)
-                        param->obdindexes[obdnum] = OBD_NOT_FOUND;
+                if (i >= obdcount) {
+                        indexes[obdnum] = OBD_NOT_FOUND;
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "error: %s: unknown obduuid: %s",
+                                          __func__, obduuids[obdnum].uuid);
+                        ret = -EINVAL;
+                }
         }
 
         if (obd_valid == 0)
-                param->obdindex = OBD_NOT_FOUND;
+                *obdindex = OBD_NOT_FOUND;
         else
-                param->obdindex = obd_valid;
+                *obdindex = obd_valid;
+
+        *obdindexes = indexes;
+out_free:
+        if (uuids)
+                free(uuids);
+
+        return ret;
+}
+
+static int setup_target_indexes(DIR *dir, char *path, struct find_param *param)
+{
+        int ret = 0;
 
+        if (param->mdtuuid) {
+                ret = setup_indexes(dir, path, param->mdtuuid, param->num_mdts,
+                              &param->mdtindexes, &param->mdtindex, LMV_TYPE);
+                if (ret)
+                        return ret;
+        }
+        if (param->obduuid) {
+                ret = setup_indexes(dir, path, param->obduuid, param->num_obds,
+                              &param->obdindexes, &param->obdindex, LOV_TYPE);
+                if (ret)
+                        return ret;
+        }
         param->got_uuids = 1;
+        return ret;
+}
+
+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;
+
+        strncpy(clilovpath, buffer, sizeof(buffer));
 
         return 0;
 }
 
-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 quiet, int header, int body)
+/*
+ * 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)
 {
-        int i, obdstripe = 0;
 
-        if (obdindex != OBD_NOT_FOUND) {
-                for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
-                        if (obdindex == objects[i].l_ost_idx) {
-                                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
-                                obdstripe = 1;
-                                break;
-                        }
-                }
-        } else if (!quiet) {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
-                obdstripe = 1;
+        FILE *f;
+        char line[PATH_MAX + 1];
+        int rc = 0;
+
+        f = fopen(fpath, "r");
+        if (f == NULL) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "Cannot open '%s'", fpath);
+                return rc;
         }
 
-        /* if it's a directory */
-        if (is_dir) {
-                if (obdstripe == 1) {
-                        if (lum->lmm_object_gr == LOV_OBJECT_GROUP_DEFAULT) {
-                                llapi_printf(LLAPI_MSG_NORMAL, "(Default) ");
-                                lum->lmm_object_gr = LOV_OBJECT_GROUP_CLEAR;
-                        }
-                        llapi_printf(LLAPI_MSG_NORMAL,
-                                     "stripe_count: %d stripe_size: %u "
-                                     "stripe_offset: %d%s%s\n",
-                                     lum->lmm_stripe_count == (__u16)-1 ? -1 :
-                                        lum->lmm_stripe_count,
-                                     lum->lmm_stripe_size,
-                                     lum->lmm_stripe_offset == (__u16)-1 ? -1 :
-                                        lum->lmm_stripe_offset,
-                                     pool_name != NULL ? " pool: " : "",
-                                     pool_name != NULL ? pool_name : "");
-                }
-                return;
+        if (fgets(line, sizeof(line), f) != NULL) {
+                *attr = atoi(line);
+        } else {
+                llapi_error(LLAPI_MSG_ERROR, errno, "Cannot read from '%s'", fpath);
+                rc = 1;
         }
 
-        if (header && (obdstripe == 1)) {
+        fclose(f);
+        return rc;
+}
+
+/*
+ * Tries to determine the default stripe attributes for a given filesystem. The
+ * filesystem to check should be specified by fsname, or will be determined
+ * 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;
+
+        if (scount) {
+                snprintf(fpath, PATH_MAX, "%s/stripecount", dpath);
+                rc = sattr_read_attr(fpath, scount);
+                if (rc != 0)
+                        return rc;
+        }
+
+        if (ssize) {
+                snprintf(fpath, PATH_MAX, "%s/stripesize", dpath);
+                rc = sattr_read_attr(fpath, ssize);
+                if (rc != 0)
+                        return rc;
+        }
+
+        if (soffset) {
+                snprintf(fpath, PATH_MAX, "%s/stripeoffset", dpath);
+                rc = sattr_read_attr(fpath, soffset);
+                if (rc != 0)
+                        return rc;
+        }
+
+        return 0;
+}
+
+/*
+ * Tries to gather the default stripe attributes for a given filesystem. If
+ * the attributes can be determined, they are cached for easy retreival the
+ * 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)
+{
+        static struct {
+                char fsname[PATH_MAX + 1];
+                unsigned int stripecount;
+                unsigned int stripesize;
+                unsigned int stripeoffset;
+        } cache = {
+                .fsname = {'\0'}
+        };
+
+        int rc;
+        char fsname_buf[PATH_MAX + 1];
+        unsigned int tmp[3];
+
+        if (fsname == NULL) {
+                rc = llapi_search_fsname(pathname, fsname_buf);
+                if (rc)
+                        return rc;
+        } else {
+                strncpy(fsname_buf, fsname, PATH_MAX);
+        }
+
+        if (strncmp(fsname_buf, cache.fsname, PATH_MAX) != 0) {
+                /*
+                 * Ensure all 3 sattrs (count, size, and offset) are
+                 * successfully retrieved and stored in tmp before writing to
+                 * cache.
+                 */
+                rc = sattr_get_defaults(fsname_buf, NULL, &tmp[0], &tmp[1],
+                                        &tmp[2]);
+                if (rc != 0)
+                        return rc;
+
+                cache.stripecount = tmp[0];
+                cache.stripesize = tmp[1];
+                cache.stripeoffset = tmp[2];
+                strncpy(cache.fsname, fsname_buf, PATH_MAX);
+        }
+
+        if (scount)
+                *scount = cache.stripecount;
+        if (ssize)
+                *ssize = cache.stripesize;
+        if (soffset)
+                *soffset = cache.stripeoffset;
+
+        return 0;
+}
+
+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_";
+        char nl = is_dir ? ' ' : '\n';
+        int rc;
+
+        if (is_dir && lum->lmm_object_seq == FID_SEQ_LOV_DEFAULT) {
+                lum->lmm_object_seq = FID_SEQ_OST_MDT0;
+                if (verbose & VERBOSE_DETAIL)
+                        llapi_printf(LLAPI_MSG_NORMAL, "(Default) ");
+        }
+
+        if (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_object_gr:      "LPX64"\n",
-                             lum->lmm_object_gr);
+                llapi_printf(LLAPI_MSG_NORMAL, "lmm_seq:            "LPX64"\n",
+                             lum->lmm_object_seq);
                 llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id:      "LPX64"\n",
                              lum->lmm_object_id);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_count:   %u\n",
-                             (int)lum->lmm_stripe_count);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_size:    %u\n",
-                             lum->lmm_stripe_size);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_pattern: %x\n",
-                             lum->lmm_pattern);
-                if (pool_name != NULL)
-                        llapi_printf(LLAPI_MSG_NORMAL,
-                             "lmm_pool_name:      %s\n", pool_name);
         }
 
-        if (body) {
-                if ((!quiet) && (obdstripe == 1))
-                        llapi_printf(LLAPI_MSG_NORMAL,
-                                     "\tobdidx\t\t objid\t\tobjid\t\t group\n");
+        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, "%d%c",
+                                                     scount, nl);
+                                else
+                                        llapi_error(LLAPI_MSG_ERROR, rc,
+                                                    "Cannot determine default"
+                                                    " stripe count.");
+                        } else {
+                                llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+                                             lum->lmm_stripe_count ==
+                                             (typeof(lum->lmm_stripe_count))(-1)
+                                             ? -1 : lum->lmm_stripe_count, nl);
+                        }
+                } else {
+                        llapi_printf(LLAPI_MSG_NORMAL, "%hd%c",
+                                     (__s16)lum->lmm_stripe_count, nl);
+                }
+        }
 
-                for (i = 0; i < lum->lmm_stripe_count; i++) {
-                        int idx = objects[i].l_ost_idx;
-                        long long oid = objects[i].l_object_id;
-                        long long gr = objects[i].l_object_gr;
-                        if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx))
-                                llapi_printf(LLAPI_MSG_NORMAL,
-                                           "\t%6u\t%14llu\t%#13llx\t%14llu%s\n",
-                                           idx, oid, oid, gr,
-                                           obdindex == idx ? " *" : "");
+        if (verbose & VERBOSE_SIZE) {
+                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)
+                                llapi_printf(LLAPI_MSG_NORMAL, "%u%c", ssize,
+                                             nl);
+                        else
+                                llapi_error(LLAPI_MSG_ERROR, rc,
+                                            "Cannot determine default"
+                                            " stripe size.");
+                } else {
+                        llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
+                                     lum->lmm_stripe_size, nl);
                 }
-                llapi_printf(LLAPI_MSG_NORMAL, "\n");
         }
+
+        if ((verbose & VERBOSE_DETAIL) && !is_dir) {
+                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_pattern: %x%c",
+                             lum->lmm_pattern, nl);
+        }
+
+        if ((verbose & VERBOSE_GENERATION) && !is_dir) {
+                if (verbose & ~VERBOSE_GENERATION)
+                        llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen:     ",
+                                     prefix);
+                llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
+                             (int)lum->u.lum_layout_gen, nl);
+        }
+
+        if (verbose & VERBOSE_OFFSET) {
+                if (verbose & ~VERBOSE_OFFSET)
+                        llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset:  ",
+                                     prefix);
+                if (is_dir)
+                        llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+                                     lum->lmm_stripe_offset ==
+                                     (typeof(lum->lmm_stripe_offset))(-1) ? -1 :
+                                     lum->lmm_stripe_offset, nl);
+                else
+                        llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
+                                     objects[0].l_ost_idx, nl);
+        }
+
+        if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) {
+                if (verbose & ~VERBOSE_POOL)
+                        llapi_printf(LLAPI_MSG_NORMAL, "%spool:           ",
+                                     prefix);
+                llapi_printf(LLAPI_MSG_NORMAL, "%s%c", pool_name, nl);
+        }
+
+        if (is_dir && (verbose != VERBOSE_OBJID))
+                llapi_printf(LLAPI_MSG_NORMAL, "\n");
 }
 
-void lov_dump_user_lmm_join(struct lov_user_md_v1 *lum, char *path,
-                            int is_dir, int obdindex, int quiet,
-                            int header, int body)
+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)
 {
-        struct lov_user_md_join *lumj = (struct lov_user_md_join *)lum;
-        int i, obdstripe = 0;
+        int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
 
-        if (obdindex != OBD_NOT_FOUND) {
-                for (i = 0; i < lumj->lmm_stripe_count; i++) {
-                        if (obdindex == lumj->lmm_objects[i].l_ost_idx) {
-                                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
+        if (!obdstripe) {
+                for (i = 0; !is_dir && i < lum->lmm_stripe_count; i++) {
+                        if (obdindex == objects[i].l_ost_idx) {
                                 obdstripe = 1;
                                 break;
                         }
                 }
-        } else if (!quiet) {
-                llapi_printf(LLAPI_MSG_NORMAL, "%s\n", path);
-                obdstripe = 1;
         }
 
-        if (header && obdstripe == 1) {
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_magic:          0x%08X\n",
-                             lumj->lmm_magic);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_gr:      "LPX64"\n",
-                             lumj->lmm_object_gr);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_object_id:      "LPX64"\n",
-                             lumj->lmm_object_id);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_count:   %u\n",
-                             (int)lumj->lmm_stripe_count);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_size:    %u\n",
-                             lumj->lmm_stripe_size);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_stripe_pattern: %x\n",
-                             lumj->lmm_pattern);
-                llapi_printf(LLAPI_MSG_NORMAL, "lmm_extent_count:   %x\n",
-                             lumj->lmm_extent_count);
-        }
-
-        if (body) {
-                unsigned long long start = -1, end = 0;
-                if (!quiet && obdstripe == 1)
+        if (obdstripe == 1)
+                lov_dump_user_lmm_header(lum, path, objects, is_dir, header,
+                                         depth, raw, pool_name);
+
+        if (!is_dir && (header & VERBOSE_OBJID)) {
+                if (obdstripe == 1)
                         llapi_printf(LLAPI_MSG_NORMAL,
-                                     "joined\tobdidx\t\t objid\t\tobjid\t\t "
-                                     "group\t\tstart\t\tend\n");
-                for (i = 0; i < lumj->lmm_stripe_count; i++) {
-                        int idx = lumj->lmm_objects[i].l_ost_idx;
-                        long long oid = lumj->lmm_objects[i].l_object_id;
-                        long long gr = lumj->lmm_objects[i].l_object_gr;
-                        if (obdindex == OBD_NOT_FOUND || obdindex == idx)
+                                     "\tobdidx\t\t objid\t\tobjid\t\t group\n");
+
+                for (i = 0; i < lum->lmm_stripe_count; i++) {
+                        int idx = objects[i].l_ost_idx;
+                        long long oid = objects[i].l_object_id;
+                        long long gr = objects[i].l_object_seq;
+                        if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx))
                                 llapi_printf(LLAPI_MSG_NORMAL,
-                                             "\t%6u\t%14llu\t%#13llx\t%14llu%s",
-                                             idx, oid, oid, gr,
-                                             obdindex == idx ? " *" : "");
-                        if (start != lumj->lmm_objects[i].l_extent_start ||
-                            end != lumj->lmm_objects[i].l_extent_end) {
-                                start = lumj->lmm_objects[i].l_extent_start;
-                                llapi_printf(LLAPI_MSG_NORMAL,"\t%14llu",start);
-                                end = lumj->lmm_objects[i].l_extent_end;
-                                if (end == (unsigned long long)-1)
-                                        llapi_printf(LLAPI_MSG_NORMAL,
-                                                     "\t\tEOF\n");
-                                else
-                                        llapi_printf(LLAPI_MSG_NORMAL,
-                                                     "\t\t%llu\n", end);
-                        } else {
-                                llapi_printf(LLAPI_MSG_NORMAL, "\t\t\t\t\n");
-                        }
+                                           "\t%6u\t%14llu\t%#13llx\t%14llu%s\n",
+                                           idx, oid, oid, gr,
+                                           obdindex == idx ? " *" : "");
                 }
                 llapi_printf(LLAPI_MSG_NORMAL, "\n");
         }
@@ -962,15 +2033,8 @@ void llapi_lov_dump_user_lmm(struct find_param *param,
                 lov_dump_user_lmm_v1v3(&param->lmd->lmd_lmm, NULL,
                                        param->lmd->lmd_lmm.lmm_objects,
                                        path, is_dir,
-                                       param->obdindex, param->quiet,
-                                       param->verbose,
-                                       (param->verbose || !param->obduuid));
-                break;
-        case LOV_USER_MAGIC_JOIN:
-                lov_dump_user_lmm_join(&param->lmd->lmd_lmm, path, is_dir,
-                                       param->obdindex, param->quiet,
-                                       param->verbose,
-                                       (param->verbose || !param->obduuid));
+                                       param->obdindex, param->maxdepth,
+                                       param->verbose, param->raw);
                 break;
         case LOV_USER_MAGIC_V3: {
                 char pool_name[LOV_MAXPOOLNAME + 1];
@@ -982,17 +2046,15 @@ void llapi_lov_dump_user_lmm(struct find_param *param,
                 objects = lmmv3->lmm_objects;
                 lov_dump_user_lmm_v1v3(&param->lmd->lmd_lmm, pool_name,
                                        objects, path, is_dir,
-                                       param->obdindex, param->quiet,
-                                       param->verbose,
-                                       (param->verbose || !param->obduuid));
+                                       param->obdindex, param->maxdepth,
+                                       param->verbose, param->raw);
                 break;
         }
         default:
                 llapi_printf(LLAPI_MSG_NORMAL, "unknown lmm_magic:  %#x "
                              "(expecting one of %#x %#x %#x)\n",
                              *(__u32 *)&param->lmd->lmd_lmm,
-                             LOV_USER_MAGIC_V1, LOV_USER_MAGIC_JOIN,
-                             LOV_USER_MAGIC_V3);
+                             LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3);
                 return;
         }
 }
@@ -1009,33 +2071,33 @@ int llapi_file_get_stripe(const char *path, struct lov_user_md *lum)
         if (fname == NULL) {
                 dname = (char *)malloc(2);
                 if (dname == NULL)
-                        return ENOMEM;
+                        return -ENOMEM;
                 strcpy(dname, ".");
                 fname = (char *)path;
         } else {
                 dname = (char *)malloc(fname - path + 1);
                 if (dname == NULL)
-                        return ENOMEM;
+                        return -ENOMEM;
                 strncpy(dname, path, fname - path);
                 dname[fname - path] = '\0';
                 fname++;
         }
 
-        if ((fd = open(dname, O_RDONLY)) == -1) {
-                rc = errno;
+        fd = open(dname, O_RDONLY);
+        if (fd == -1) {
+                rc = -errno;
                 free(dname);
                 return rc;
         }
 
         strcpy((char *)lum, fname);
         if (ioctl(fd, IOC_MDC_GETFILESTRIPE, (void *)lum) == -1)
-                rc = errno;
+                rc = -errno;
 
         if (close(fd) == -1 && rc == 0)
-                rc = errno;
+                rc = -errno;
 
         free(dname);
-
         return rc;
 }
 
@@ -1056,171 +2118,16 @@ int llapi_file_lookup(int dirfd, const char *name)
 
         rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d",
-                          name, rc);
+                llapi_error(LLAPI_MSG_ERROR, rc,
+                            "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d",
+                            name, rc);
                 return rc;
         }
 
-        return ioctl(dirfd, IOC_MDC_LOOKUP, buf);
-}
-
-int llapi_mds_getfileinfo(char *path, DIR *parent,
-                          struct lov_user_mds_data *lmd)
-{
-        lstat_t *st = &lmd->lmd_st;
-        char *fname = strrchr(path, '/');
-        int ret = 0;
-
-        if (parent == NULL)
-                return -EINVAL;
-
-        fname = (fname == NULL ? path : fname + 1);
-        /* retrieve needed file info */
-        strncpy((char *)lmd, fname,
-                lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC));
-        ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO, (void *)lmd);
-
-        if (ret) {
-                if (errno == ENOTTY) {
-                        /* ioctl is not supported, it is not a lustre fs.
-                         * Do the regular lstat(2) instead. */
-                        ret = lstat_f(path, st);
-                        if (ret) {
-                                llapi_err(LLAPI_MSG_ERROR,
-                                          "error: %s: lstat failed for %s",
-                                          __FUNCTION__, path);
-                                return ret;
-                        }
-                } else if (errno == ENOENT) {
-                        llapi_err(LLAPI_MSG_WARN,
-                                  "warning: %s: %s does not exist",
-                                  __FUNCTION__, path);
-                        return -ENOENT;
-                } else {
-                        llapi_err(LLAPI_MSG_ERROR,
-                                 "error: %s: IOC_MDC_GETFILEINFO failed for %s",
-                                 __FUNCTION__, path);
-                        return ret;
-                }
-        }
-
-        return 0;
-}
-
-static DIR *opendir_parent(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;
-}
-
-static int llapi_semantic_traverse(char *path, int size, DIR *parent,
-                                   semantic_func_t sem_init,
-                                   semantic_func_t sem_fini, void *data,
-                                   cfs_dirent_t *de)
-{
-        cfs_dirent_t *dent;
-        int len, ret;
-        DIR *d, *p = NULL;
-
-        ret = 0;
-        len = strlen(path);
-
-        d = opendir(path);
-        if (!d && errno != ENOTDIR) {
-                llapi_err(LLAPI_MSG_ERROR, "%s: Failed to open '%s'",
-                          __FUNCTION__, path);
-                return -EINVAL;
-        } else if (!d && !parent) {
-                /* ENOTDIR. Open the parent dir. */
-                p = opendir_parent(path);
-                if (!p)
-                        GOTO(out, ret = -EINVAL);
-        }
-
-        if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de)))
-                goto err;
-
-        if (!d)
-                GOTO(out, ret = 0);
-
-        while ((dent = readdir64(d)) != NULL) {
-                ((struct find_param *)data)->have_fileinfo = 0;
-
-                if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
-                        continue;
-
-                path[len] = 0;
-                if ((len + dent->d_reclen + 2) > size) {
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: %s: string buffer is too small",
-                                  __FUNCTION__);
-                        break;
-                }
-                strcat(path, "/");
-                strcat(path, dent->d_name);
-
-                if (dent->d_type == DT_UNKNOWN) {
-                        lstat_t *st = &((struct find_param *)data)->lmd->lmd_st;
-
-                        ret = llapi_mds_getfileinfo(path, d,
-                                             ((struct find_param *)data)->lmd);
-                        if (ret == 0) {
-                                ((struct find_param *)data)->have_fileinfo = 1;
-                                dent->d_type =
-                                        llapi_filetype_dir_table[st->st_mode &
-                                                                 S_IFMT];
-                        }
-                        if (ret == -ENOENT)
-                                continue;
-                }
-
-                switch (dent->d_type) {
-                case DT_UNKNOWN:
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: %s: '%s' is UNKNOWN type %d",
-                                  __FUNCTION__, dent->d_name, dent->d_type);
-                        break;
-                case DT_DIR:
-                        ret = llapi_semantic_traverse(path, size, d, sem_init,
-                                                      sem_fini, data, dent);
-                        if (ret < 0)
-                                goto out;
-                        break;
-                default:
-                        ret = 0;
-                        if (sem_init) {
-                                ret = sem_init(path, d, NULL, data, dent);
-                                if (ret < 0)
-                                        goto out;
-                        }
-                        if (sem_fini && ret == 0)
-                                sem_fini(path, d, NULL, data, dent);
-                }
-        }
-
-out:
-        path[len] = 0;
-
-        if (sem_fini)
-                sem_fini(path, parent, d, data, de);
-err:
-        if (d)
-                closedir(d);
-        if (p)
-                closedir(p);
-        return ret;
+        rc = ioctl(dirfd, IOC_MDC_LOOKUP, buf);
+        if (rc < 0)
+                rc = -errno;
+        return rc;
 }
 
 /* Check if the value matches 1 of the given criteria (e.g. --atime +/-N).
@@ -1231,7 +2138,7 @@ err:
  * 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 |
+ * 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)
@@ -1242,29 +2149,29 @@ err:
  * --------------------------------------
  * Note: 5th actually means that the value is within the interval
  * (limit - margin, limit]. */
-static int find_value_cmp(unsigned int file, unsigned int limit, int sign,
-                          unsigned long long margin, int mds)
+static int find_value_cmp(unsigned long long file, unsigned long long limit,
+                          int sign, int negopt, unsigned long long margin,
+                          int mds)
 {
-        if (sign > 0) {
-                if (file < limit)
-                        return mds ? 0 : 1;
-        }
+        int ret = -1;
 
-        if (sign == 0) {
-                if (file <= limit && file + margin > limit)
-                        return mds ? 0 : 1;
+        if (sign > 0) {
+                /* Drop the fraction of margin (of days). */
                 if (file + margin <= limit)
-                        return mds ? 0 : -1;
-        }
-
-        if (sign < 0) {
+                        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)
-                        return 1;
-                if (mds)
-                        return 0;
+                        ret = 1;
+                else if (mds)
+                        ret = 0;
         }
 
-        return -1;
+        return negopt ? ~ret + 1 : ret;
 }
 
 /* Check if the file time matches all the given criteria (e.g. --atime +/-N).
@@ -1277,12 +2184,13 @@ static int find_value_cmp(unsigned int file, unsigned int limit, int sign,
 static int find_time_check(lstat_t *st, struct find_param *param, int mds)
 {
         int ret;
-        int rc = 0;
+        int rc = 1;
 
         /* Check if file is accepted. */
         if (param->atime) {
                 ret = find_value_cmp(st->st_atime, param->atime,
-                                     param->asign, 24 * 60 * 60, mds);
+                                     param->asign, param->exclude_atime,
+                                     24 * 60 * 60, mds);
                 if (ret < 0)
                         return ret;
                 rc = ret;
@@ -1290,7 +2198,8 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
 
         if (param->mtime) {
                 ret = find_value_cmp(st->st_mtime, param->mtime,
-                                     param->msign, 24 * 60 * 60, mds);
+                                     param->msign, param->exclude_mtime,
+                                     24 * 60 * 60, mds);
                 if (ret < 0)
                         return ret;
 
@@ -1302,7 +2211,8 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
 
         if (param->ctime) {
                 ret = find_value_cmp(st->st_ctime, param->ctime,
-                                     param->csign, 24 * 60 * 60, mds);
+                                     param->csign, param->exclude_ctime,
+                                     24 * 60 * 60, mds);
                 if (ret < 0)
                         return ret;
 
@@ -1315,6 +2225,104 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
         return rc;
 }
 
+/**
+ * Check whether the stripes matches the indexes user provided
+ *       1   : matched
+ *       0   : Unmatched
+ */
+static int check_obd_match(struct find_param *param)
+{
+        lstat_t *st = &param->lmd->lmd_st;
+        struct lov_user_ost_data_v1 *lmm_objects;
+        int i, j;
+
+        if (param->obduuid && param->obdindex == OBD_NOT_FOUND)
+                return 0;
+
+        if (!S_ISREG(st->st_mode))
+                return 0;
+
+        /* Only those files should be accepted, which have a
+         * stripe on the specified OST. */
+        if (!param->lmd->lmd_lmm.lmm_stripe_count)
+                return 0;
+
+        if (param->lmd->lmd_lmm.lmm_magic ==
+            LOV_USER_MAGIC_V3) {
+                struct lov_user_md_v3 *lmmv3 = (void *)&param->lmd->lmd_lmm;
+
+                lmm_objects = lmmv3->lmm_objects;
+        } else if (param->lmd->lmd_lmm.lmm_magic ==  LOV_USER_MAGIC_V1) {
+                lmm_objects = param->lmd->lmd_lmm.lmm_objects;
+        } else {
+                llapi_err_noerrno(LLAPI_MSG_ERROR, "%s:Unknown magic: 0x%08X\n",
+                                  __func__, param->lmd->lmd_lmm.lmm_magic);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < param->lmd->lmd_lmm.lmm_stripe_count; i++) {
+                for (j = 0; j < param->num_obds; j++) {
+                        if (param->obdindexes[j] ==
+                            lmm_objects[i].l_ost_idx) {
+                                if (param->exclude_obd)
+                                        return 0;
+                                return 1;
+                        }
+                }
+        }
+
+        if (param->exclude_obd)
+                return 1;
+        return 0;
+}
+
+static int check_mdt_match(struct find_param *param)
+{
+        int i;
+
+        if (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND)
+                return 0;
+
+        /* FIXME: For striped dir, we should get stripe information and check */
+        for (i = 0; i < param->num_mdts; i++) {
+                if (param->mdtindexes[i] == param->file_mdtindex)
+                        if (param->exclude_mdt)
+                                return 0;
+                        return 1;
+        }
+
+        if (param->exclude_mdt)
+                return 1;
+        return 0;
+}
+
+/**
+ * Check whether the obd is active or not, if it is
+ * not active, just print the object affected by this
+ * failed target
+ **/
+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;
+
+        LASSERT(type == LL_STATFS_LOV || type == LL_STATFS_LMV);
+
+        memset(&stat_buf, 0, sizeof(struct obd_statfs));
+        memset(&uuid_buf, 0, sizeof(struct obd_uuid));
+        ret = llapi_obd_statfs(path, type,
+                               param->obdindex, &stat_buf,
+                               &uuid_buf);
+        if (ret) {
+                llapi_printf(LLAPI_MSG_NORMAL,
+                             "obd_uuid: %s failed %s ",
+                             param->obduuid->uuid,
+                             strerror(errno));
+        }
+        return ret;
+}
+
 static int cb_find_init(char *path, DIR *parent, DIR *dir,
                         void *data, cfs_dirent_t *de)
 {
@@ -1327,7 +2335,8 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
 
         LASSERT(parent != NULL || dir != NULL);
 
-        param->lmd->lmd_lmm.lmm_stripe_count = 0;
+        if (param->have_fileinfo == 0)
+                param->lmd->lmd_lmm.lmm_stripe_count = 0;
 
         /* If a regular expression is presented, make the initial decision */
         if (param->pattern != NULL) {
@@ -1352,51 +2361,62 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
                 }
         }
 
+        ret = 0;
 
-        /* If a time or OST should be checked, the decision is not taken yet. */
-        if (param->atime || param->ctime || param->mtime || param->obduuid ||
-            param->size)
+        /* Request MDS for the stat info if some of these parameters need
+         * to be compared. */
+        if (param->obduuid    || param->mdtuuid || param->check_uid ||
+            param->check_gid || param->check_pool || param->atime   ||
+            param->ctime     || param->mtime || param->check_size ||
+            param->check_stripecount || param->check_stripesize)
                 decision = 0;
 
-        ret = 0;
-        /* Request MDS for the stat info. */
-        if (param->have_fileinfo == 0) {
-                if (dir) {
-                        /* retrieve needed file info */
-                        ret = ioctl(dirfd(dir), LL_IOC_MDC_GETINFO,
-                                    (void *)param->lmd);
-                } else {
-                        char *fname = strrchr(path, '/');
-                        fname = (fname == NULL ? path : fname + 1);
-
-                        /* retrieve needed file info */
-                        strncpy((char *)param->lmd, fname, param->lumlen);
-                        ret = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO,
-                                   (void *)param->lmd);
-                }
-        }
+        if (param->type && checked_type == 0)
+                decision = 0;
 
-        if (ret) {
-                if (errno == ENOTTY) {
-                        /* ioctl is not supported, it is not a lustre fs.
-                         * Do the regular lstat(2) instead. */
-                        lustre_fs = 0;
-                        ret = lstat_f(path, st);
-                        if (ret) {
-                                llapi_err(LLAPI_MSG_ERROR,
-                                          "error: %s: lstat failed for %s",
-                                          __FUNCTION__, path);
-                                return ret;
+        if (param->have_fileinfo == 0 && decision == 0) {
+                ret = get_lmd_info(path, parent, dir, param->lmd,
+                                   param->lumlen);
+                if (ret == 0) {
+                        if (dir) {
+                                ret = llapi_file_fget_mdtidx(dirfd(dir),
+                                                     &param->file_mdtindex);
+                        } else {
+                                int fd;
+                                lstat_t tmp_st;
+
+                                ret = lstat_f(path, &tmp_st);
+                                if (ret) {
+                                        ret = -errno;
+                                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                                    "error: %s: lstat failed"
+                                                    "for %s", __func__, path);
+                                        return ret;
+                                }
+                                if (S_ISREG(tmp_st.st_mode)) {
+                                        fd = open(path, O_RDONLY);
+                                        if (fd > 0) {
+                                                ret = llapi_file_fget_mdtidx(fd,
+                                                         &param->file_mdtindex);
+                                                close(fd);
+                                        } else {
+                                                ret = fd;
+                                        }
+                                } else {
+                                        /* For special inode, it assumes to
+                                         * reside on the same MDT with the
+                                         * parent */
+                                        fd = dirfd(parent);
+                                        ret = llapi_file_fget_mdtidx(fd,
+                                                        &param->file_mdtindex);
+                                }
                         }
-                } else if (errno == ENOENT) {
-                        llapi_err(LLAPI_MSG_WARN,
-                                  "warning: %s: %s does not exist",
-                                  __FUNCTION__, path);
-                        goto decided;
-                } else {
-                        llapi_err(LLAPI_MSG_ERROR,"error: %s: %s failed for %s",
-                                  __FUNCTION__, dir ? "LL_IOC_MDC_GETINFO" :
-                                  "IOC_MDC_GETFILEINFO", path);
+                }
+                if (ret) {
+                        if (ret == -ENOTTY)
+                                lustre_fs = 0;
+                        if (ret == -ENOENT)
+                                goto decided;
                         return ret;
                 }
         }
@@ -1412,17 +2432,18 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
         }
 
         /* Prepare odb. */
-        if (param->obduuid) {
+        if (param->obduuid || param->mdtuuid) {
                 if (lustre_fs && param->got_uuids &&
                     param->st_dev != st->st_dev) {
                         /* A lustre/lustre mount point is crossed. */
                         param->got_uuids = 0;
                         param->obds_printed = 0;
-                        param->obdindex = OBD_NOT_FOUND;
+                        param->obdindex = param->mdtindex = OBD_NOT_FOUND;
                 }
 
                 if (lustre_fs && !param->got_uuids) {
-                        ret = setup_obd_indexes(dir ? dir : parent, param);
+                        ret = setup_target_indexes(dir ? dir : parent, path,
+                                                   param);
                         if (ret)
                                 return ret;
 
@@ -1430,51 +2451,56 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
                 } else if (!lustre_fs && param->got_uuids) {
                         /* A lustre/non-lustre mount point is crossed. */
                         param->got_uuids = 0;
-                        param->obdindex = OBD_NOT_FOUND;
+                        param->obdindex = param->mdtindex = OBD_NOT_FOUND;
                 }
         }
 
-        /* If an OBD UUID is specified but no one matches, skip this file. */
-        if (param->obduuid && param->obdindex == OBD_NOT_FOUND)
-                goto decided;
-
-        /* If a OST UUID is given, and some OST matches, check it here. */
-        if (param->obdindex != OBD_NOT_FOUND) {
-                if (!S_ISREG(st->st_mode))
+        if (param->check_stripesize) {
+                decision = find_value_cmp(param->lmd->lmd_lmm.lmm_stripe_size,
+                                          param->stripesize,
+                                          param->stripesize_sign,
+                                          param->exclude_stripesize,
+                                          param->stripesize_units, 0);
+                if (decision == -1)
                         goto decided;
+        }
 
-                /* Only those files should be accepted, which have a
-                 * stripe on the specified OST. */
-                if (!param->lmd->lmd_lmm.lmm_stripe_count) {
+        if (param->check_stripecount) {
+                decision = find_value_cmp(param->lmd->lmd_lmm.lmm_stripe_count,
+                                          param->stripecount,
+                                          param->stripecount_sign,
+                                          param->exclude_stripecount, 1, 0);
+                if (decision == -1)
                         goto decided;
-                } else {
-                        int i, j;
-                        struct lov_user_ost_data_v1 *lmm_objects;
+        }
 
-                        if (param->lmd->lmd_lmm.lmm_magic ==
-                            LOV_USER_MAGIC_V3) {
-                                struct lov_user_md_v3 *lmmv3 =
-                                        (void *)&param->lmd->lmd_lmm;
+        /* If an OBD UUID is specified but none matches, skip this file. */
+        if ((param->obduuid && param->obdindex == OBD_NOT_FOUND) ||
+            (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND))
+                goto decided;
 
-                                lmm_objects = lmmv3->lmm_objects;
+        /* If a OST or MDT UUID is given, and some OST matches,
+         * check it here. */
+        if (param->obdindex != OBD_NOT_FOUND ||
+            param->mdtindex != OBD_NOT_FOUND) {
+                if (param->obduuid) {
+                        if (check_obd_match(param)) {
+                                /* If no mdtuuid is given, we are done.
+                                 * Otherwise, fall through to the mdtuuid
+                                 * check below. */
+                                if (!param->mdtuuid)
+                                        goto obd_matches;
                         } else {
-                                lmm_objects = param->lmd->lmd_lmm.lmm_objects;
-                        }
-
-                        for (i = 0;
-                             i < param->lmd->lmd_lmm.lmm_stripe_count; i++) {
-                                for (j = 0; j < param->num_obds; j++) {
-                                        if (param->obdindexes[j] ==
-                                            lmm_objects[i].l_ost_idx)
-                                                goto obd_matches;
-                                }
-                        }
-
-                        if (i == param->lmd->lmd_lmm.lmm_stripe_count)
                                 goto decided;
+                        }
+                }
+                if (param->mdtuuid) {
+                        if (check_mdt_match(param))
+                                goto obd_matches;
+                        goto decided;
                 }
         }
-
+obd_matches:
         if (param->check_uid) {
                 if (st->st_uid == param->uid) {
                         if (param->exclude_uid)
@@ -1515,45 +2541,39 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
         }
 
         /* Check the time on mds. */
-        if (!decision) {
+        decision = 1;
+        if (param->atime || param->ctime || param->mtime) {
                 int for_mds;
 
                 for_mds = lustre_fs ? (S_ISREG(st->st_mode) &&
                                        param->lmd->lmd_lmm.lmm_stripe_count)
                                     : 0;
                 decision = find_time_check(st, param, for_mds);
+                if (decision == -1)
+                        goto decided;
         }
 
-obd_matches:
         /* If file still fits the request, ask ost for updated info.
            The regular stat is almost of the same speed as some new
            'glimpse-size-ioctl'. */
-        if (!decision && S_ISREG(st->st_mode) &&
-            (param->lmd->lmd_lmm.lmm_stripe_count || param->size)) {
-                if (param->obdindex != OBD_NOT_FOUND) {
-                        /* Check whether the obd is active or not, if it is
-                         * not active, just print the object affected by this
-                         * failed ost
-                         * */
-                        struct obd_statfs stat_buf;
-                        struct obd_uuid uuid_buf;
-
-                        memset(&stat_buf, 0, sizeof(struct obd_statfs));
-                        memset(&uuid_buf, 0, sizeof(struct obd_uuid));
-                        ret = llapi_obd_statfs(path, LL_STATFS_LOV,
-                                               param->obdindex, &stat_buf,
-                                               &uuid_buf);
-                        if (ret) {
-                                if (ret == -ENODATA || ret == -ENODEV
-                                    || ret == -EIO)
-                                        errno = EIO;
-                                llapi_printf(LLAPI_MSG_NORMAL,
-                                             "obd_uuid: %s failed %s ",
-                                             param->obduuid->uuid,
-                                             strerror(errno));
-                                goto print_path;
-                        }
-                }
+
+        if (param->check_size && S_ISREG(st->st_mode) &&
+            param->lmd->lmd_lmm.lmm_stripe_count)
+                decision = 0;
+
+        while (!decision) {
+                /* For regular files with the stripe the decision may have not
+                 * been taken yet if *time or size is to be checked. */
+                LASSERT((S_ISREG(st->st_mode) &&
+                        param->lmd->lmd_lmm.lmm_stripe_count) ||
+                        param->mdtindex != OBD_NOT_FOUND);
+
+                if (param->obdindex != OBD_NOT_FOUND)
+                        print_failed_tgt(param, path, LL_STATFS_LOV);
+
+                if (param->mdtindex != OBD_NOT_FOUND)
+                        print_failed_tgt(param, path, LL_STATFS_LMV);
+
                 if (dir) {
                         ret = ioctl(dirfd(dir), IOC_LOV_GETINFO,
                                     (void *)param->lmd);
@@ -1564,14 +2584,15 @@ obd_matches:
 
                 if (ret) {
                         if (errno == ENOENT) {
-                                llapi_err(LLAPI_MSG_ERROR,
-                                          "warning: %s: %s does not exist",
-                                          __FUNCTION__, path);
+                                llapi_error(LLAPI_MSG_ERROR, -ENOENT,
+                                            "warning: %s: %s does not exist",
+                                            __func__, path);
                                 goto decided;
                         } else {
-                                llapi_err(LLAPI_MSG_ERROR,
-                                          "%s: IOC_LOV_GETINFO on %s failed",
-                                          __FUNCTION__, path);
+                                ret = -errno;
+                                llapi_error(LLAPI_MSG_ERROR, ret,
+                                            "%s: IOC_LOV_GETINFO on %s failed",
+                                            __func__, path);
                                 return ret;
                         }
                 }
@@ -1580,14 +2601,15 @@ obd_matches:
                 decision = find_time_check(st, param, 0);
                 if (decision == -1)
                         goto decided;
+
+                break;
         }
 
-        if (param->size)
+        if (param->check_size)
                 decision = find_value_cmp(st->st_size, param->size,
-                                          param->size_sign, param->size_units,
-                                          0);
+                                          param->size_sign, param->exclude_size,
+                                          param->size_units, 0);
 
-print_path:
         if (decision != -1) {
                 llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
                 if (param->zeroend)
@@ -1605,44 +2627,88 @@ decided:
         return 0;
 }
 
-static int cb_common_fini(char *path, DIR *parent, DIR *d, void *data,
-                          cfs_dirent_t *de)
+int llapi_find(char *path, struct find_param *param)
 {
-        struct find_param *param = (struct find_param *)data;
-        param->depth--;
+        return param_callback(path, cb_find_init, cb_common_fini, param);
+}
+
+/*
+ * Get MDT number that the file/directory inode referenced
+ * by the open fd resides on.
+ * Return 0 and mdtidx on success, or -ve errno.
+ */
+int llapi_file_fget_mdtidx(int fd, int *mdtidx)
+{
+        if (ioctl(fd, LL_IOC_GET_MDTIDX, mdtidx) < 0)
+                return -errno;
         return 0;
 }
 
-int llapi_find(char *path, struct find_param *param)
+static int cb_get_mdt_index(char *path, DIR *parent, DIR *d, void *data,
+                            cfs_dirent_t *de)
 {
-        char *buf;
-        int ret, len = strlen(path);
+        struct find_param *param = (struct find_param *)data;
+        int ret = 0;
+        int mdtidx;
 
-        if (len > PATH_MAX) {
-                llapi_err(LLAPI_MSG_ERROR, "%s: Path name '%s' is too long",
-                          __FUNCTION__, path);
-                return -EINVAL;
-        }
+        LASSERT(parent != NULL || d != NULL);
 
-        buf = (char *)malloc(PATH_MAX + 1);
-        if (!buf)
-                return -ENOMEM;
+        if (d) {
+                ret = llapi_file_fget_mdtidx(dirfd(d), &mdtidx);
+        } else if (parent) {
+                int fd;
+
+                fd = open(path, O_RDONLY);
+                if (fd > 0) {
+                        ret = llapi_file_fget_mdtidx(fd, &mdtidx);
+                        close(fd);
+                } else {
+                        ret = -errno;
+                }
+        }
 
-        ret = common_param_init(param);
         if (ret) {
-                free(buf);
+                if (ret == -ENODATA) {
+                        if (!param->obduuid)
+                                llapi_printf(LLAPI_MSG_NORMAL,
+                                             "%s has no stripe info\n", path);
+                        goto out;
+                } else if (ret == -ENOENT) {
+                        llapi_error(LLAPI_MSG_WARN, ret,
+                                    "warning: %s: %s does not exist",
+                                    __func__, path);
+                        goto out;
+                } else if (ret == -ENOTTY) {
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                    "%s: '%s' not on a Lustre fs?",
+                                    __func__, path);
+                } else {
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                    "error: %s: LL_IOC_GET_MDTIDX failed for %s",
+                                    __func__, path);
+                }
                 return ret;
         }
 
-        param->depth = 0;
+       /* The 'LASSERT(parent != NULL || d != NULL);' guarantees
+        * that either 'd' or 'parent' is not null.
+        * So in all cases llapi_file_fget_mdtidx() is called,
+        * thus initializing 'mdtidx'. */
+        if (param->quiet || !(param->verbose & VERBOSE_DETAIL))
+               /* coverity[uninit_use_in_call] */
+                llapi_printf(LLAPI_MSG_NORMAL, "%d\n", mdtidx);
+        else
+               /* coverity[uninit_use_in_call] */
+                llapi_printf(LLAPI_MSG_NORMAL, "%s\nmdt_index:\t%d\n",
+                             path, mdtidx);
 
-        strncpy(buf, path, PATH_MAX + 1);
-        ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, cb_find_init,
-                                      cb_common_fini, param, NULL);
+out:
+        /* Do not get down anymore? */
+        if (param->depth == param->maxdepth)
+                return 1;
 
-        find_param_fini(param);
-        free(buf);
-        return ret < 0 ? ret : 0;
+        param->depth++;
+        return 0;
 }
 
 static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
@@ -1653,8 +2719,8 @@ static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
 
         LASSERT(parent != NULL || d != NULL);
 
-        /* Prepare odb. */
-        if (!param->got_uuids) {
+        if (param->obduuid) {
+                param->quiet = 1;
                 ret = setup_obd_uuid(d ? d : parent, path, param);
                 if (ret)
                         return ret;
@@ -1668,36 +2734,58 @@ static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
                 fname = (fname == NULL ? path : fname + 1);
 
                 strncpy((char *)&param->lmd->lmd_lmm, fname, param->lumlen);
+
                 ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
                             (void *)&param->lmd->lmd_lmm);
         }
 
         if (ret) {
-                if (errno == ENODATA) {
-                        if (!param->obduuid && !param->quiet)
+                if (errno == ENODATA && d != NULL) {
+                        /* We need to "fake" the "use the default" values
+                         * since the lmm struct is zeroed out at this point.
+                         * The magic needs to be set in order to satisfy
+                         * a check later on in the code path.
+                         * The object_seq needs to be set for the "(Default)"
+                         * prefix to be displayed. */
+                        struct lov_user_md *lmm = &param->lmd->lmd_lmm;
+                        lmm->lmm_magic = LOV_MAGIC_V1;
+                        if (!param->raw)
+                                lmm->lmm_object_seq = FID_SEQ_LOV_DEFAULT;
+                        lmm->lmm_stripe_count = 0;
+                        lmm->lmm_stripe_size = 0;
+                        lmm->lmm_stripe_offset = -1;
+                        goto dump;
+
+                } else if (errno == ENODATA && parent != NULL) {
+                        if (!param->obduuid)
                                 llapi_printf(LLAPI_MSG_NORMAL,
                                              "%s has no stripe info\n", path);
                         goto out;
-                } else if (errno == ENOTTY) {
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "%s: '%s' not on a Lustre fs?",
-                                  __FUNCTION__, path);
                 } else if (errno == ENOENT) {
-                        llapi_err(LLAPI_MSG_WARN,
-                                  "warning: %s: %s does not exist",
-                                  __FUNCTION__, path);
+                        llapi_error(LLAPI_MSG_WARN, -ENOENT,
+                                    "warning: %s: %s does not exist",
+                                    __func__, path);
                         goto out;
+                } else if (errno == ENOTTY) {
+                        ret = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                    "%s: '%s' not on a Lustre fs?",
+                                    __func__, path);
                 } else {
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: %s: %s failed for %s",
-                                   __FUNCTION__, d ? "LL_IOC_LOV_GETSTRIPE" :
-                                  "IOC_MDC_GETFILESTRIPE", path);
+                        ret = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, ret,
+                                    "error: %s: %s failed for %s",
+                                     __func__, d ? "LL_IOC_LOV_GETSTRIPE" :
+                                    "IOC_MDC_GETFILESTRIPE", path);
                 }
 
                 return ret;
         }
 
-        llapi_lov_dump_user_lmm(param, path, d ? 1 : 0);
+dump:
+        if (!(param->verbose & VERBOSE_MDTINDEX))
+                llapi_lov_dump_user_lmm(param, path, d ? 1 : 0);
+
 out:
         /* Do not get down anymore? */
         if (param->depth == param->maxdepth)
@@ -1709,34 +2797,9 @@ out:
 
 int llapi_getstripe(char *path, struct find_param *param)
 {
-        char *buf;
-        int ret = 0, len = strlen(path);
-
-        if (len > PATH_MAX) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "%s: Path name '%s' is too long",
-                          __FUNCTION__, path);
-                return -EINVAL;
-        }
-
-        buf = (char *)malloc(PATH_MAX + 1);
-        if (!buf)
-                return -ENOMEM;
-
-        ret = common_param_init(param);
-        if (ret) {
-                free(buf);
-                return ret;
-        }
-
-        param->depth = 0;
-
-        strncpy(buf, path, PATH_MAX + 1);
-        ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, cb_getstripe,
-                                      cb_common_fini, param, NULL);
-        find_param_fini(param);
-        free(buf);
-        return ret < 0 ? ret : 0;
+        return param_callback(path, (param->verbose & VERBOSE_MDTINDEX) ?
+                              cb_get_mdt_index : cb_getstripe,
+                              cb_common_fini, param);
 }
 
 int llapi_obd_statfs(char *path, __u32 type, __u32 index,
@@ -1758,9 +2821,10 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index,
         data.ioc_pbuf2 = (char *)uuid_buf;
         data.ioc_plen2 = sizeof(struct obd_uuid);
 
-        if ((rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw))) != 0) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "llapi_obd_statfs: error packing ioctl data");
+        rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
+        if (rc != 0) {
+                llapi_error(LLAPI_MSG_ERROR, rc,
+                            "llapi_obd_statfs: error packing ioctl data");
                 return rc;
         }
 
@@ -1770,8 +2834,8 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index,
 
         if (fd < 0) {
                 rc = errno ? -errno : -EBADF;
-                llapi_err(LLAPI_MSG_ERROR, "error: %s: opening '%s'",
-                          __FUNCTION__, path);
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: %s: opening '%s'",
+                            __func__, path);
                 return rc;
         }
         rc = ioctl(fd, IOC_OBD_STATFS, (void *)rawbuf);
@@ -1783,7 +2847,6 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index,
 }
 
 #define MAX_STRING_SIZE 128
-#define DEVICES_LIST "/proc/fs/lustre/devices"
 
 int llapi_ping(char *obd_type, char *obd_name)
 {
@@ -1796,12 +2859,16 @@ int llapi_ping(char *obd_type, char *obd_name)
 
         fd = open(path, O_WRONLY);
         if (fd < 0) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "error opening %s", path);
+                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)
@@ -1809,15 +2876,16 @@ int llapi_ping(char *obd_type, char *obd_name)
         return rc;
 }
 
-int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb)
+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_err(LLAPI_MSG_ERROR, "error: opening "DEVICES_LIST);
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
                 return rc;
         }
 
@@ -1826,7 +2894,6 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb)
                 char *obd_name = NULL;
                 char *obd_uuid = NULL;
                 char *bufp = buf;
-                struct obd_ioctl_data datal = { 0, };
                 struct obd_statfs osfs_buffer;
 
                 while(bufp[0] == ' ')
@@ -1840,9 +2907,6 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb)
 
                 memset(&osfs_buffer, 0, sizeof (osfs_buffer));
 
-                datal.ioc_pbuf1 = (char *)&osfs_buffer;
-                datal.ioc_plen1 = sizeof(osfs_buffer);
-
                 for (i = 0; i < type_num; i++) {
                         if (strcmp(obd_type_name, obd_type[i]) != 0)
                                 continue;
@@ -1851,7 +2915,7 @@ int llapi_target_iterate(int type_num, char **obd_type,void *args,llapi_cb_t cb)
                 }
         }
         fclose(fp);
-        return rc;
+        return 0;
 }
 
 static void do_target_check(char *obd_type_name, char *obd_name,
@@ -1863,7 +2927,7 @@ static void do_target_check(char *obd_type_name, char *obd_name,
         if (rc == ENOTCONN) {
                 llapi_printf(LLAPI_MSG_NORMAL, "%s inactive.\n", obd_name);
         } else if (rc) {
-                llapi_err(LLAPI_MSG_ERROR, "error: check '%s'", obd_name);
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: check '%s'", obd_name);
         } else {
                 llapi_printf(LLAPI_MSG_NORMAL, "%s active.\n", obd_name);
         }
@@ -1876,48 +2940,6 @@ int llapi_target_check(int type_num, char **obd_type, char *dir)
 
 #undef MAX_STRING_SIZE
 
-int llapi_catinfo(char *dir, char *keyword, char *node_name)
-{
-        char raw[OBD_MAX_IOCTL_BUFFER];
-        char out[LLOG_CHUNK_SIZE];
-        char *buf = raw;
-        struct obd_ioctl_data data = { 0 };
-        char key[30];
-        DIR *root;
-        int rc;
-
-        sprintf(key, "%s", keyword);
-        memset(raw, 0, sizeof(raw));
-        memset(out, 0, sizeof(out));
-        data.ioc_inlbuf1 = key;
-        data.ioc_inllen1 = strlen(key) + 1;
-        if (node_name) {
-                data.ioc_inlbuf2 = node_name;
-                data.ioc_inllen2 = strlen(node_name) + 1;
-        }
-        data.ioc_pbuf1 = out;
-        data.ioc_plen1 = sizeof(out);
-        rc = obd_ioctl_pack(&data, &buf, sizeof(raw));
-        if (rc)
-                return rc;
-
-        root = opendir(dir);
-        if (root == NULL) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "open %s failed", dir);
-                return rc;
-        }
-
-        rc = ioctl(dirfd(root), OBD_IOC_LLOG_CATINFO, buf);
-        if (rc)
-                llapi_err(LLAPI_MSG_ERROR, "ioctl OBD_IOC_CATINFO failed");
-        else
-                llapi_printf(LLAPI_MSG_NORMAL, "%s", data.ioc_pbuf1);
-
-        closedir(root);
-        return rc;
-}
-
 /* Is this a lustre fs? */
 int llapi_is_lustre_mnttype(const char *type)
 {
@@ -1938,11 +2960,14 @@ int llapi_quotacheck(char *mnt, int check_type)
 
         root = opendir(mnt);
         if (!root) {
-                llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt);
-                return -1;
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+                return rc;
         }
 
         rc = ioctl(dirfd(root), LL_IOC_QUOTACHECK, check_type);
+        if (rc < 0)
+                rc = -errno;
 
         closedir(root);
         return rc;
@@ -1956,8 +2981,9 @@ int llapi_poll_quotacheck(char *mnt, struct if_quotacheck *qchk)
 
         root = opendir(mnt);
         if (!root) {
-                llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt);
-                return -1;
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+                return rc;
         }
 
         while (1) {
@@ -1970,7 +2996,7 @@ int llapi_poll_quotacheck(char *mnt, struct if_quotacheck *qchk)
         }
 
         closedir(root);
-        return rc;
+        return 0;
 }
 
 int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
@@ -1980,11 +3006,14 @@ int llapi_quotactl(char *mnt, struct if_quotactl *qctl)
 
         root = opendir(mnt);
         if (!root) {
-                llapi_err(LLAPI_MSG_ERROR, "open %s failed", mnt);
-                return -1;
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "open %s failed", mnt);
+                return rc;
         }
 
         rc = ioctl(dirfd(root), LL_IOC_QUOTACTL, qctl);
+        if (rc < 0)
+                rc = -errno;
 
         closedir(root);
         return rc;
@@ -1999,36 +3028,15 @@ static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data,
 
         LASSERT(parent != NULL || d != NULL);
 
-        if (d) {
-                rc = ioctl(dirfd(d), LL_IOC_MDC_GETINFO,
-                           (void *)param->lmd);
-        } else if (parent) {
-                char *fname = strrchr(path, '/');
-                fname = (fname == NULL ? path : fname + 1);
-
-                strncpy((char *)param->lmd, fname, param->lumlen);
-                rc = ioctl(dirfd(parent), IOC_MDC_GETFILEINFO,
-                           (void *)param->lmd);
-        } else {
-                return 0;
-        }
-
+        rc = get_lmd_info(path, parent, d, param->lmd, param->lumlen);
         if (rc) {
-                if (errno == ENODATA) {
+                if (rc == -ENODATA) {
                         if (!param->obduuid && !param->quiet)
-                                llapi_err(LLAPI_MSG_ERROR,
+                                llapi_error(LLAPI_MSG_ERROR, -ENODATA,
                                           "%s has no stripe info", path);
                         rc = 0;
-                } else if (errno == ENOENT) {
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "warning: %s: %s does not exist",
-                                  __FUNCTION__, path);
+                } else if (rc == -ENOENT) {
                         rc = 0;
-                } else if (errno != EISDIR) {
-                        rc = errno;
-                        llapi_err(LLAPI_MSG_ERROR, "%s ioctl failed for %s.",
-                                  d ? "LL_IOC_MDC_GETINFO" :
-                                  "IOC_MDC_GETFILEINFO", path);
                 }
                 return rc;
         }
@@ -2040,48 +3048,29 @@ static int cb_quotachown(char *path, DIR *parent, DIR *d, void *data,
          * invoke syscall directly. */
         rc = syscall(SYS_chown, path, -1, -1);
         if (rc)
-                llapi_err(LLAPI_MSG_ERROR,"error: chown %s (%u,%u)", path);
+                llapi_error(LLAPI_MSG_ERROR, errno,
+                            "error: chown %s", path);
 
         rc = chmod(path, st->st_mode);
-        if (rc)
-                llapi_err(LLAPI_MSG_ERROR, "error: chmod %s (%hu)",
-                          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;
-        char *buf;
-        int ret = 0, len = strlen(path);
-
-        if (len > PATH_MAX) {
-                llapi_err(LLAPI_MSG_ERROR, "%s: Path name '%s' is too long",
-                          __FUNCTION__, path);
-                return -EINVAL;
-        }
-
-        buf = (char *)malloc(PATH_MAX + 1);
-        if (!buf)
-                return -ENOMEM;
-
+int llapi_quotachown(char *path, int flag)
+{
+        struct find_param param;
+
         memset(&param, 0, sizeof(param));
         param.recursive = 1;
         param.verbose = 0;
         param.quiet = 1;
 
-        ret = common_param_init(&param);
-        if (ret)
-                goto out;
-
-        strncpy(buf, path, PATH_MAX + 1);
-        ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, cb_quotachown,
-                                      NULL, &param, NULL);
-out:
-        find_param_fini(&param);
-        free(buf);
-        return ret;
+        return param_callback(path, cb_quotachown, NULL, &param);
 }
 
 #include <pwd.h>
@@ -2095,12 +3084,14 @@ static int rmtacl_notify(int ops)
 {
         FILE *fp;
         struct mntent *mnt;
-        int found = 0, fd, rc;
+       int found = 0, fd = 0, rc = 0;
 
         fp = setmntent(MOUNTED, "r");
         if (fp == NULL) {
-                perror("setmntent");
-                return -1;
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc,
+                            "error setmntent(%s)", MOUNTED);
+                return rc;
         }
 
         while (1) {
@@ -2108,25 +3099,32 @@ static int rmtacl_notify(int ops)
                 if (!mnt)
                         break;
 
-                if (!llapi_is_lustre_mnt(mnt))
+               if (!llapi_is_lustre_mnt(mnt))
                         continue;
 
                 fd = open(mnt->mnt_dir, O_RDONLY | O_DIRECTORY);
                 if (fd < 0) {
-                        perror("open");
-                        return -1;
+                        rc = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, rc,
+                                    "Can't open '%s'\n", mnt->mnt_dir);
+                       goto out;
                 }
 
                 rc = ioctl(fd, LL_IOC_RMTACL, ops);
                 if (rc < 0) {
-                        perror("ioctl");
-                return -1;
+                        rc = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d\n", fd);
+                       goto out;
                 }
 
                 found++;
         }
+
+out:
         endmntent(fp);
-        return found;
+       if (fd >= 0)
+               close(fd);
+       return ((rc != 0) ? rc : found);
 }
 
 static char *next_token(char *p, int div)
@@ -2149,14 +3147,16 @@ static int rmtacl_name2id(char *name, int is_user)
         if (is_user) {
                 struct passwd *pw;
 
-                if ((pw = getpwnam(name)) == NULL)
+                pw = getpwnam(name);
+                if (pw == NULL)
                         return INVALID_ID;
                 else
                         return (int)(pw->pw_uid);
         } else {
                 struct group *gr;
 
-                if ((gr = getgrnam(name)) == NULL)
+                gr = getgrnam(name);
+                if (gr == NULL)
                         return INVALID_ID;
                 else
                         return (int)(gr->gr_gid);
@@ -2272,29 +3272,34 @@ static int child_status(int status)
 static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
 {
         pid_t pid = 0;
-        int fd[2], status;
+        int fd[2], status, rc;
         FILE *fp;
         char buf[PIPE_BUF];
 
         if (output_func) {
                 if (pipe(fd) < 0) {
-                        perror("pipe");
-                        return -1;
+                        rc = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe\n");
+                        return rc;
                 }
 
-                if ((pid = fork()) < 0) {
-                        perror("fork");
+                pid = fork();
+                if (pid < 0) {
+                        rc = -errno;
+                        llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork\n");
                         close(fd[0]);
                         close(fd[1]);
-                        return -1;
+                        return rc;
                 } else if (!pid) {
                         /* child process redirects its output. */
                         close(fd[0]);
                         close(1);
                         if (dup2(fd[1], 1) < 0) {
-                                perror("dup2");
+                                rc = -errno;
+                                llapi_error(LLAPI_MSG_ERROR, rc,
+                                            "Can't dup2 %d\n", fd[1]);
                                 close(fd[1]);
-                                return -1;
+                                return rc;
                         }
                 } else {
                         close(fd[1]);
@@ -2304,17 +3309,19 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
         if (!pid) {
                 status = rmtacl_notify(ops);
                 if (status < 0)
-                        return -1;
+                        return -errno;
 
                 exit(execvp(argv[0], argv));
         }
 
         /* the following is parent process */
-        if ((fp = fdopen(fd[0], "r")) == NULL) {
-                perror("fdopen");
+        fp = fdopen(fd[0], "r");
+        if (fp == NULL) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed\n", fd[0]);
                 kill(pid, SIGKILL);
                 close(fd[0]);
-                return -1;
+                return rc;
         }
 
         while (fgets(buf, PIPE_BUF, fp) != NULL) {
@@ -2326,8 +3333,9 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
         close(fd[0]);
 
         if (waitpid(pid, &status, 0) < 0) {
-                perror("waitpid");
-                return -1;
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed\n", pid);
+                return rc;
         }
 
         return child_status(status);
@@ -2359,7 +3367,7 @@ int llapi_cp(int argc, char *argv[])
 
         rc = rmtacl_notify(RMT_RSETFACL);
         if (rc < 0)
-                return -1;
+                return rc;
 
         exit(execvp(argv[0], argv));
 }
@@ -2370,185 +3378,619 @@ int llapi_ls(int argc, char *argv[])
 
         rc = rmtacl_notify(RMT_LGETFACL);
         if (rc < 0)
-                return -1;
+                return rc;
 
         exit(execvp(argv[0], argv));
 }
 
-/* format must have %s%s, buf must be > 16 */
-static int get_mdtname(const char *name, char *format, char *buf)
+/* Print mdtname 'name' into 'buf' using 'format'.  Add -MDT0000 if needed.
+ * format must have %s%s, buf must be > 16
+ * Eg: if name = "lustre-MDT0000", "lustre", or "lustre-MDT0000_UUID"
+ *     then buf = "lustre-MDT0000"
+ */
+static int get_mdtname(char *name, char *format, char *buf)
 {
         char suffix[]="-MDT0000";
         int len = strlen(name);
 
-        if (len > 16) {
-                llapi_err(LLAPI_MSG_ERROR, "bad MDT name |%s|\n", name);
-                return -EINVAL;
+        if ((len > 5) && (strncmp(name + len - 5, "_UUID", 5) == 0)) {
+                name[len - 5] = '\0';
+                len -= 5;
         }
 
-        if ((len > 8) && (strncmp(name + len - 8, "-MDT", 4) == 0))
-                suffix[0] = '\0';
+        if (len > 8) {
+                if ((len <= 16) && strncmp(name + len - 8, "-MDT", 4) == 0) {
+                        suffix[0] = '\0';
+                } else {
+                        /* Not enough room to add suffix */
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "MDT name too long |%s|", name);
+                        return -EINVAL;
+                }
+        }
 
         return sprintf(buf, format, name, suffix);
 }
 
-#define CHANGELOG_FILE "/proc/fs/lustre/mdd/%s%s/changelog"
+/** ioctl on filsystem root, with mdtindex sent as data
+ * \param mdtname path, fsname, or mdtname (lutre-MDT0004)
+ * \param mdtidxp pointer to integer within data to be filled in with the
+ *    mdt index (0 if no mdt is specified).  NULL won't be filled.
+ */
+static int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
+                      int want_error)
+{
+        char fsname[20];
+        char *ptr;
+        int fd, index, rc;
+
+        /* Take path, fsname, or MDTname.  Assume MDT0000 in the former cases.
+         Open root and parse mdt index. */
+        if (mdtname[0] == '/') {
+                index = 0;
+                rc = get_root_path(WANT_FD | want_error, NULL, &fd,
+                                   (char *)mdtname, -1);
+        } else {
+                if (get_mdtname((char *)mdtname, "%s%s", fsname) < 0)
+                        return -EINVAL;
+                ptr = fsname + strlen(fsname) - 8;
+                *ptr = '\0';
+                index = strtol(ptr + 4, NULL, 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 ********/
 
-/* return a file desc to readable changelog */
-int llapi_changelog_open(const char *mdtname, long long startrec)
+static int changelog_ioctl(const char *mdtname, int opc, int id,
+                           long long recno, int flags)
 {
-        char path[256];
-        int rc, fd;
+        struct ioc_changelog data;
+        int *idx;
 
-        if (get_mdtname(mdtname, CHANGELOG_FILE, path) <0)
-                return -EINVAL;
+        data.icc_id = id;
+        data.icc_recno = recno;
+        data.icc_flags = flags;
+        idx = (int *)(&data.icc_mdtindex);
 
-        if ((fd = open(path, O_RDONLY)) < 0) {
-                llapi_err(LLAPI_MSG_ERROR, "error: can't open |%s|\n", path);
-                return -errno;
-        }
+        return root_ioctl(mdtname, opc, &data, idx, WANT_ERROR);
+}
+
+#define CHANGELOG_PRIV_MAGIC 0xCA8E1080
+struct changelog_private {
+        int magic;
+        int flags;
+        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, int flags, const char *device,
+                          long long startrec)
+{
+        struct changelog_private *cp;
+        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;
 
-        rc = lseek(fd, (off_t)startrec, SEEK_SET);
+        /* Set up the receiver */
+        rc = libcfs_ukuc_start(&cp->kuc, 0 /* no group registration */);
+        if (rc < 0)
+                goto out_free;
+
+        *priv = cp;
+
+        /* 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 = 0;
         if (rc < 0) {
-                llapi_err(LLAPI_MSG_ERROR, "can't seek rc=%d\n", rc);
-                return -errno;
+                /* frees and clears priv */
+                llapi_changelog_fini(priv);
+                return rc;
         }
 
-        return fd;
+        return 0;
+
+out_free:
+        free(cp);
+        return rc;
 }
 
-int llapi_changelog_clear(const char *mdtname, long long endrec)
+/** Finish reading from a changelog */
+int llapi_changelog_fini(void **priv)
 {
-        char path[256];
-        char val[20];
-        int fd, len;
+        struct changelog_private *cp = (struct changelog_private *)*priv;
 
-        if (endrec < 0) {
-                llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO,
-                          "can't purge negative records\n");
+        if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
                 return -EINVAL;
-        }
 
-        if (get_mdtname(mdtname, CHANGELOG_FILE, path) <0)
+        libcfs_ukuc_stop(&cp->kuc);
+        free(cp);
+        *priv = NULL;
+        return 0;
+}
+
+/** Convert a changelog_rec to changelog_ext_rec, in this way client can treat
+ *  all records in the format of changelog_ext_rec, this can make record
+ *  analysis simpler.
+ */
+static inline int changelog_extend_rec(struct changelog_ext_rec *ext)
+{
+       if (!CHANGELOG_REC_EXTENDED(ext)) {
+               struct changelog_rec *rec = (struct changelog_rec *)ext;
+
+               memmove(ext->cr_name, rec->cr_name, rec->cr_namelen);
+               fid_zero(&ext->cr_sfid);
+               fid_zero(&ext->cr_spfid);
+               return 1;
+       }
+
+       return 0;
+}
+
+/** 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
+ */
+int llapi_changelog_recv(void *priv, struct changelog_ext_rec **rech)
+{
+        struct changelog_private *cp = (struct changelog_private *)priv;
+        struct kuc_hdr *kuch;
+        int rc = 0;
+
+        if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
                 return -EINVAL;
+        if (rech == NULL)
+                return -EINVAL;
+        kuch = malloc(CR_MAXSIZE + sizeof(*kuch));
+        if (kuch == NULL)
+                return -ENOMEM;
+
+repeat:
+        rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch,
+                                 CR_MAXSIZE + sizeof(*kuch),
+                                 KUC_TRANSPORT_CHANGELOG);
+        if (rc < 0)
+                goto out_free;
 
-        if ((fd = open(path, O_WRONLY)) < 0) {
-                llapi_err(LLAPI_MSG_ERROR, "error: can't open |%s|\n", path);
-                return errno;
+        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;
         }
 
-        snprintf(val, sizeof(val), "%llu", endrec);
-        len = write(fd, val, strlen(val));
-        close(fd);
-        if (len != strlen(val)) {
-                llapi_err(LLAPI_MSG_ERROR, "purge err\n");
-                return errno;
+        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_ext_rec.  Use pointer math to skip
+        * kuch_hdr and point directly to the message payload.
+        */
+       *rech = (struct changelog_ext_rec *)(kuch + 1);
+       changelog_extend_rec(*rech);
+
+        return 0;
+
+out_free:
+        *rech = NULL;
+        free(kuch);
+        return rc;
+}
+
+/** Release the changelog record when done with it. */
+int llapi_changelog_free(struct changelog_ext_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;
 }
 
-static int dev_ioctl(struct obd_ioctl_data *data, int dev, int cmd)
+int llapi_changelog_clear(const char *mdtname, const char *idstr,
+                          long long endrec)
+{
+        int 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;
-        static char rawbuf[8192];
-        static char *buf = rawbuf;
 
-        data->ioc_dev = dev;
-        memset(buf, 0, sizeof(rawbuf));
+        while (*fidstr == '[')
+                fidstr++;
 
-        if ((rc = obd_ioctl_pack(data, &buf, sizeof(rawbuf)))) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: ioctl pack (%d) failed: rc %d", cmd, rc);
-                return rc;
+        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;
         }
 
-        rc = l_ioctl(OBD_DEV_ID, cmd, buf);
-        if (rc < 0) {
-                /* ioctl returns -1 with errno set */
-                rc = -errno;
-                return rc;
+        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);
+                *recno = gf->gf_recno;
+                *linkno = gf->gf_linkno;
         }
 
-        if (obd_ioctl_unpack(data, buf, sizeof(rawbuf))) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: invalid reply\n");
-                return -EPROTO;
+        free(gf);
+        return rc;
+}
+
+static int path2fid_from_lma(const char *path, lustre_fid *fid)
+{
+        char buf[512];
+        struct lustre_mdt_attrs *lma;
+        int rc;
+
+        rc = lgetxattr(path, XATTR_NAME_LMA, buf, sizeof(buf));
+        if (rc < 0)
+                return -errno;
+        lma = (struct lustre_mdt_attrs *)buf;
+        fid_le_to_cpu(fid, &lma->lma_self_fid);
+        return 0;
+}
+
+int llapi_path2fid(const char *path, lustre_fid *fid)
+{
+        int fd, rc;
+
+        memset(fid, 0, sizeof(*fid));
+        fd = open(path, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
+        if (fd < 0) {
+                if (errno == ELOOP || errno == ENXIO)
+                        return path2fid_from_lma(path, fid);
+                return -errno;
         }
+
+        rc = ioctl(fd, LL_IOC_PATH2FID, fid) < 0 ? -errno : 0;
+        if (rc == -EINVAL || rc == -ENOTTY)
+                rc = path2fid_from_lma(path, fid);
+
+        close(fd);
         return rc;
 }
 
-/* should we just grep it from proc? */
-static int dev_name2dev(char *name)
+/****** HSM Copytool API ********/
+#define CT_PRIV_MAGIC 0xC0BE2001
+struct copytool_private {
+        int magic;
+        char *fsname;
+        lustre_kernelcomm kuc;
+        __u32 archives;
+};
+
+#include <libcfs/libcfs.h>
+
+/** Register a copytool
+ * @param[out] priv Opaque private control structure
+ * @param fsname Lustre filesystem
+ * @param flags Open flags, currently unused (e.g. O_NONBLOCK)
+ * @param archive_count
+ * @param archives Which archive numbers this copytool is responsible for
+ */
+int llapi_copytool_start(void **priv, char *fsname, int flags,
+                         int archive_count, int *archives)
 {
-        struct obd_ioctl_data data;
+        struct copytool_private *ct;
         int rc;
 
-        memset(&data, 0, sizeof(data));
-        data.ioc_inllen1 = strlen(name) + 1;
-        data.ioc_inlbuf1 = name;
-        rc = dev_ioctl(&data, -1, OBD_IOC_NAME2DEV);
+        if (archive_count > 0 && archives == NULL) {
+                llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                  "NULL archive numbers");
+                return -EINVAL;
+        }
 
-        if (rc < 0) {
-                llapi_err(LLAPI_MSG_ERROR, "Device %s not found %d\n", name,rc);
-                return rc;
+        ct = calloc(1, sizeof(*ct));
+        if (ct == NULL)
+                return -ENOMEM;
+
+        ct->fsname = malloc(strlen(fsname) + 1);
+        if (ct->fsname == NULL) {
+                rc = -ENOMEM;
+                goto out_err;
+        }
+        strcpy(ct->fsname, fsname);
+        ct->magic = CT_PRIV_MAGIC;
+        ct->archives = 0;
+        for (rc = 0; rc < archive_count; rc++) {
+                if (archives[rc] > sizeof(ct->archives)) {
+                        llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                          "Maximum of %d archives supported",
+                                          sizeof(ct->archives));
+                        goto out_err;
+                }
+                ct->archives |= 1 << archives[rc];
         }
-        return data.ioc_dev;
+        /* special case: if no archives specified, default to archive #0. */
+        if (ct->archives == 0)
+                ct->archives = 1;
+
+        rc = libcfs_ukuc_start(&ct->kuc, KUC_GRP_HSM);
+        if (rc < 0)
+                goto out_err;
+
+        /* Storing archive(s) in lk_data; see mdc_ioc_hsm_ct_start */
+        ct->kuc.lk_data = ct->archives;
+        rc = root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL,
+                        WANT_ERROR);
+        /* Only the kernel reference keeps the write side open */
+        close(ct->kuc.lk_wfd);
+        ct->kuc.lk_wfd = 0;
+        if (rc < 0)
+                goto out_err;
+
+        *priv = ct;
+        return 0;
+
+out_err:
+        if (ct->fsname)
+                free(ct->fsname);
+        free(ct);
+        return rc;
 }
 
-int llapi_fid2path(char *device, char *fidstr, char *buf, int buflen,
-                   __u64 recno, int *linkno)
+/** Deregister a copytool */
+int llapi_copytool_fini(void **priv)
 {
-        struct lu_fid fid;
-        struct obd_ioctl_data data;
-        int dev, rc;
+        struct copytool_private *ct = (struct copytool_private *)*priv;
 
-        while (*fidstr == '[')
-                fidstr++;
+        if (!ct || (ct->magic != CT_PRIV_MAGIC))
+                return -EINVAL;
 
-        sscanf(fidstr, "0x%llx:0x%x:0x%x", &(fid.f_seq), &(fid.f_oid),
-               &(fid.f_ver));
-        if (!fid_is_sane(&fid)) {
-                llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO,
-                          "bad FID format [%s], should be "DFID"\n",
-                          fidstr, (__u64)1, 2, 0);
+        /* Tell the kernel to stop sending us messages */
+        ct->kuc.lk_flags = LK_FLG_STOP;
+        root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL, 0);
+
+        /* Shut down the kernelcomms */
+        libcfs_ukuc_stop(&ct->kuc);
+
+        free(ct->fsname);
+        free(ct);
+        *priv = NULL;
+        return 0;
+}
+
+/** Wait for the next hsm_action_list
+ * @param priv Opaque private control structure
+ * @param halh Action list handle, will be allocated here
+ * @param msgsize Number of bytes in the message, will be set here
+ * @return 0 valid message received; halh and msgsize are set
+ *         <0 error code
+ */
+int llapi_copytool_recv(void *priv, struct hsm_action_list **halh, int *msgsize)
+{
+        struct copytool_private *ct = (struct copytool_private *)priv;
+        struct kuc_hdr *kuch;
+        struct hsm_action_list *hal;
+        int rc = 0;
+
+        if (!ct || (ct->magic != CT_PRIV_MAGIC))
+                return -EINVAL;
+        if (halh == NULL || msgsize == NULL)
                 return -EINVAL;
+
+        kuch = malloc(HAL_MAXSIZE + sizeof(*kuch));
+        if (kuch == NULL)
+                return -ENOMEM;
+
+        rc = libcfs_ukuc_msg_get(&ct->kuc, (char *)kuch,
+                                 HAL_MAXSIZE + sizeof(*kuch),
+                                 KUC_TRANSPORT_HSM);
+        if (rc < 0)
+                goto out_free;
+
+        /* Handle generic messages */
+        if (kuch->kuc_transport == KUC_TRANSPORT_GENERIC &&
+            kuch->kuc_msgtype == KUC_MSG_SHUTDOWN) {
+                rc = -ESHUTDOWN;
+                goto out_free;
+        }
+
+        if (kuch->kuc_transport != KUC_TRANSPORT_HSM ||
+            kuch->kuc_msgtype != HMT_ACTION_LIST) {
+                llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                  "Unknown HSM message type %d:%d\n",
+                                  kuch->kuc_transport, kuch->kuc_msgtype);
+                rc = -EPROTO;
+                goto out_free;
         }
 
-        dev = dev_name2dev(device);
-        if (dev < 0)
-                return dev;
+        /* Our message is a hsm_action_list.  Use pointer math to skip
+         * kuch_hdr and point directly to the message payload.
+         */
+        hal = (struct hsm_action_list *)(kuch + 1);
+
+        /* Check that we have registered for this archive # */
+        if (((1 << hal->hal_archive_num) & ct->archives) == 0) {
+                    llapi_err_noerrno(LLAPI_MSG_INFO,
+                             "Ignoring request for archive #%d (bitmask %#x)\n",
+                             hal->hal_archive_num, ct->archives);
+                rc = 0;
+                goto out_free;
+        }
 
-        memset(&data, 0, sizeof(data));
-        data.ioc_inlbuf1 = (char *)&fid;
-        data.ioc_inllen1 = sizeof(fid);
-        data.ioc_inlbuf2 = (char *)&recno;
-        data.ioc_inllen2 = sizeof(__u64);
-        data.ioc_inlbuf3 = (char *)linkno;
-        data.ioc_inllen3 = sizeof(int);
-        data.ioc_plen1 = buflen;
-        data.ioc_pbuf1 = buf;
-        rc = dev_ioctl(&data, dev, OBD_IOC_FID2PATH);
+        *halh = hal;
+        *msgsize = kuch->kuc_msglen - sizeof(*kuch);
+        return 0;
 
+out_free:
+        *halh = NULL;
+        *msgsize = 0;
+        free(kuch);
         return rc;
 }
 
-int llapi_path2fid(const char *path, unsigned long long *seq,
-                   unsigned long *oid, unsigned long *ver)
+/** Release the action list when done with it. */
+int llapi_copytool_free(struct hsm_action_list **hal)
 {
-        struct lu_fid fid;
-        int fd, rc;
+       /* Reuse the llapi_changelog_free function */
+       return llapi_changelog_free((struct changelog_ext_rec **)hal);
+}
 
-        fd = open(path, O_RDONLY);
-        if (fd < 0)
+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;
 
-        rc = ioctl(fd, LL_IOC_PATH2FID, &fid);
-        *seq = fid_seq(&fid);
-        *oid = fid_oid(&fid);
-        *ver = fid_ver(&fid);
+        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);
 
+        rc = ioctl(fd, OBD_GET_VERSION, buffer);
+        if (rc == -1) {
+                rc = -errno;
+                close(fd);
+                return rc;
+        }
         close(fd);
-        return rc;
+        *version = data->ioc_bulk;
+        return 0;
 }
 
+/**
+ * Get a 64-bit value representing the version of file data pointed by fd.
+ *
+ * Each write or truncate, flushed on OST, will change this value. You can use
+ * this value to verify if file data was modified. This only checks the file
+ * data, not metadata.
+ *
+ * \param  flags  If set to LL_DV_NOFLUSH, the data version will be read
+ *                directly from OST without regard to possible dirty cache on
+ *                client nodes.
+ *
+ * \retval 0 on success.
+ * \retval -errno on error.
+ */
+int llapi_get_data_version(int fd, __u64 *data_version, __u64 flags)
+{
+        int rc;
+        struct ioc_data_version idv;
+
+        idv.idv_flags = flags;
+
+        rc = ioctl(fd, LL_IOC_DATA_VERSION, &idv);
+        if (rc)
+                rc = -errno;
+        else
+                *data_version = idv.idv_version;
+
+        return rc;
+}