Whamcloud - gitweb
LU-1270 utils: properly initialize traverse param
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index e08bef0..4404fae 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.
@@ -28,9 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -74,9 +71,8 @@
 #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,
@@ -177,42 +173,46 @@ int parse_size(char *optarg, unsigned long long *size,
 {
         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_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) {
+                           *(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) {
+                           *(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) {
+                           *(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) {
+                           *(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) {
+                           *(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) {
+                           *(end + 1) == '\0' &&
+                           (*size & (~0ULL << (64 - 60))) == 0) {
                         *size_units = 1ULL << 60;
                 } else {
                         return -1;
@@ -225,46 +225,65 @@ int parse_size(char *optarg, unsigned long long *size,
 /* 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 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, rc;
+        glob_t glob_info;
 
-        /* 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 larger than 4G "
-                            "is not currently supported and would wrap");
-                return rc;
+        if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
+                return -ENOENT;
+
+        if (glob_info.gl_pathc < 1) {
+                globfree(&glob_info);
+                return -ENOENT;
         }
+
+        strcpy(buffer, glob_info.gl_pathv[0]);
+
+        globfree(&glob_info);
         return 0;
 }
 
@@ -310,6 +329,137 @@ static int find_poolpath(char *fsname, char *poolname, char *poolpath)
         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;
+        }
+        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 (fp == NULL) {
+                rc = -errno;
+                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
+                return rc;
+        }
+
+        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;
+}
+
 /*
  * if pool is NULL, search ostname in target_obd
  * if pool is not NULL:
@@ -657,25 +807,31 @@ int llapi_search_fsname(const char *pathname, char *fsname)
         return rc;
 }
 
-/* return the first file matching this pattern */
-static int first_match(char *pattern, char *buffer)
+int llapi_getname(const char *path, char *buf, size_t size)
 {
-        glob_t glob_info;
+        struct obd_uuid uuid_buf;
+        char *uuid = uuid_buf.uuid;
+        int rc, nr;
 
-        if (glob(pattern, GLOB_BRACE, NULL, &glob_info))
-                return -ENOENT;
+        memset(&uuid_buf, 0, sizeof(uuid_buf));
+        rc = llapi_file_get_lov_uuid(path, &uuid_buf);
+        if (rc)
+                return rc;
 
-        if (glob_info.gl_pathc < 1) {
-                globfree(&glob_info);
-                return -ENOENT;
-        }
+        /* We want to turn lustre-clilov-ffff88002738bc00 into
+         * lustre-ffff88002738bc00. */
 
-        strcpy(buffer, glob_info.gl_pathv[0]);
+        nr = snprintf(buf, size, "%.*s-%s",
+                      (int) (strlen(uuid) - 24), uuid,
+                      uuid + strlen(uuid) - 16);
 
-        globfree(&glob_info);
-        return 0;
+        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)
@@ -861,7 +1017,7 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                         rc = -errno;
                         llapi_error(LLAPI_MSG_ERROR, rc,
                                     "Error reading pool list for '%s'", name);
-                        return rc;
+                       goto out;
                 } else if ((rc == 0) && (cookie == NULL)) {
                         /* end of directory */
                         break;
@@ -872,13 +1028,17 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                         continue;
 
                 /* check output bounds */
-                if (nb_entries >= list_size)
-                        return -EOVERFLOW;
+               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)
-                        return -EOVERFLOW;
+               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;
@@ -886,8 +1046,9 @@ int llapi_get_poollist(const char *name, char **poollist, int list_size,
                 nb_entries++;
         }
 
+out:
         closedir(dir);
-        return nb_entries;
+       return ((rc != 0) ? rc : nb_entries);
 }
 
 /* wrapper for lfs.c and obd.c */
@@ -895,42 +1056,72 @@ int llapi_poollist(const char *name)
 {
         /* list of pool names (assume that pool count is smaller
            than OST count) */
-        char *list[FIND_MAX_OSTS];
-        char *buffer;
-        /* fsname-OST0000_UUID < 32 char, 1 per OST */
-        int bufsize = FIND_MAX_OSTS * 32;
-        int i, nb;
-
-        buffer = malloc(bufsize);
-        if (buffer == NULL)
-                return -ENOMEM;
+        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 ((name[0] == '/') || (strchr(name, '.') == NULL))
+        if (!poolname) {
                 /* name is a path or fsname */
-                nb = llapi_get_poollist(name, list, FIND_MAX_OSTS, buffer,
-                                        bufsize);
-        else
+                nb = llapi_get_poollist(name, list, obdcount,
+                                        buffer, bufsize);
+        } else {
                 /* name is a pool name (<fsname>.<poolname>) */
-                nb = llapi_get_poolmembers(name, list, FIND_MAX_OSTS, buffer,
-                                           bufsize);
+                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]);
-
-        free(buffer);
-        return (nb < 0 ? nb : 0);
+        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);
+        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,
@@ -939,10 +1130,11 @@ static int common_param_init(struct find_param *param)
                 return -ENOMEM;
         }
 
-        param->got_uuids = 0;
-        param->obdindexes = NULL;
-        param->obdindex = OBD_NOT_FOUND;
-        return 0;
+       param->got_uuids = 0;
+       param->obdindexes = NULL;
+       param->obdindex = OBD_NOT_FOUND;
+       param->mdtindex = OBD_NOT_FOUND;
+       return 0;
 }
 
 static void find_param_fini(struct find_param *param)
@@ -980,21 +1172,27 @@ static DIR *opendir_parent(char *path)
         return parent;
 }
 
-int llapi_mds_getfileinfo(char *path, DIR *parent,
-                          struct lov_user_mds_data *lmd)
+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;
-        char *fname = strrchr(path, '/');
         int ret = 0;
 
-        if (parent == NULL)
+        if (parent == NULL && dir == 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 (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) {
@@ -1006,24 +1204,34 @@ int llapi_mds_getfileinfo(char *path, DIR *parent,
                                 llapi_error(LLAPI_MSG_ERROR, ret,
                                             "error: %s: lstat failed for %s",
                                             __func__, path);
-                                return ret;
                         }
                 } else if (errno == ENOENT) {
                         ret = -errno;
                         llapi_error(LLAPI_MSG_WARN, ret,
                                     "warning: %s: %s does not exist",
                                     __func__, path);
-                        return ret;
+                } 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;
                 }
         }
+        return ret;
+}
 
-        return 0;
+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,
@@ -1146,12 +1354,12 @@ static int param_callback(char *path, semantic_func_t sem_init,
         if (!buf)
                 return -ENOMEM;
 
-        ret = common_param_init(param);
+        strncpy(buf, path, PATH_MAX + 1);
+        ret = common_param_init(param, buf);
         if (ret)
                 goto out;
         param->depth = 0;
 
-        strncpy(buf, path, PATH_MAX + 1);
         ret = llapi_semantic_traverse(buf, PATH_MAX + 1, NULL, sem_init,
                                       sem_fini, param, NULL);
 out:
@@ -1170,6 +1378,16 @@ int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *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;
+}
+
 int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
 {
         int fd, rc;
@@ -1187,27 +1405,38 @@ int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid)
         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;
@@ -1225,11 +1454,16 @@ 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 0;
+        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)
@@ -1280,7 +1514,7 @@ int llapi_uuid_match(char *real_uuid, char *search_uuid)
  * 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;
@@ -1289,8 +1523,11 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
         if (param->got_uuids)
                 return rc;
 
-        /* Get the lov name */
-        rc = llapi_file_fget_lov_uuid(dirfd(dir), &lov_uuid);
+        /* 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 (rc != -ENOTTY) {
                         llapi_error(LLAPI_MSG_ERROR, rc,
@@ -1304,8 +1541,8 @@ 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;
@@ -1314,7 +1551,8 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
         }
 
         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)
@@ -1347,66 +1585,109 @@ 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_error(LLAPI_MSG_ERROR, ret, "get ost uuid failed");
-                return ret;
+                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 (llapi_uuid_match(uuids[i].uuid,
-                                             param->obduuid[obdnum].uuid)) {
-                                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;
+                        indexes[obdnum] = OBD_NOT_FOUND;
                         llapi_err_noerrno(LLAPI_MSG_ERROR,
                                           "error: %s: unknown obduuid: %s",
-                                          __func__,
-                                          param->obduuid[obdnum].uuid);
+                                          __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;
 
-        param->got_uuids = 1;
+        *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;
 }
 
@@ -1629,7 +1910,7 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                                                               &scount, NULL,
                                                               NULL);
                                 if (rc == 0)
-                                        llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
+                                        llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
                                                      scount, nl);
                                 else
                                         llapi_error(LLAPI_MSG_ERROR, rc,
@@ -1673,6 +1954,14 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
                              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:  ",
@@ -1700,8 +1989,8 @@ static void lov_dump_user_lmm_header(struct lov_user_md *lum, char *path,
 
 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)
+                            char *path, int is_dir, int obdindex,
+                            int depth, int header, int raw)
 {
         int i, obdstripe = (obdindex != OBD_NOT_FOUND) ? 0 : 1;
 
@@ -1901,7 +2190,7 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
         /* Check if file is accepted. */
         if (param->atime) {
                 ret = find_value_cmp(st->st_atime, param->atime,
-                                     param->asign, param->exclude_atime, 
+                                     param->asign, param->exclude_atime,
                                      24 * 60 * 60, mds);
                 if (ret < 0)
                         return ret;
@@ -1910,7 +2199,7 @@ 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, param->exclude_mtime, 
+                                     param->msign, param->exclude_mtime,
                                      24 * 60 * 60, mds);
                 if (ret < 0)
                         return ret;
@@ -1937,6 +2226,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)
 {
@@ -1975,58 +2362,62 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
                 }
         }
 
-
         ret = 0;
 
         /* Request MDS for the stat info if some of these parameters need
          * to be compared. */
-        if (param->obduuid    || param->check_uid || param->check_gid ||
-            param->check_pool || param->atime     || param->ctime     ||
-            param->mtime      || param->check_size)
+        if (param->obduuid    || param->mdtuuid || param->check_uid ||
+            param->check_gid || param->check_pool || param->atime   ||
+            param->ctime     || param->mtime || param->check_size ||
+            param->check_stripecount || param->check_stripesize)
                 decision = 0;
+
         if (param->type && checked_type == 0)
                 decision = 0;
 
         if (param->have_fileinfo == 0 && decision == 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 (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) {
-                                ret = -errno;
-                                llapi_error(LLAPI_MSG_ERROR, ret,
-                                            "error: %s: lstat failed for %s",
-                                            __func__, path);
-                                return ret;
+                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_error(LLAPI_MSG_WARN, -ENOENT,
-                                  "warning: %s: %s does not exist",
-                                  __func__, path);
-                        goto decided;
-                } else {
-                        ret = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, ret,
-                                    "error: %s: %s failed for %s",
-                                    __func__, dir ? "LL_IOC_MDC_GETINFO" :
-                                  "IOC_MDC_GETFILEINFO", path);
+                }
+                if (ret) {
+                        if (ret == -ENOTTY)
+                                lustre_fs = 0;
+                        if (ret == -ENOENT)
+                                goto decided;
                         return ret;
                 }
         }
@@ -2042,17 +2433,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;
 
@@ -2060,59 +2452,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) {
-                                                if (param->exclude_obd)
-                                                        goto decided;
-                                                break;
-                                        }
-                                }
-                                /* If an OBD matches, just break */
-                                if (j != param->num_obds)
-                                        break;
-                        }
-
-                        if (i == param->lmd->lmd_lmm.lmm_stripe_count) {
-                                if (!param->exclude_obd)
-                                        goto decided;
+                                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)
@@ -2176,30 +2565,16 @@ static int cb_find_init(char *path, DIR *parent, DIR *dir,
         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);
-
-                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) {
-                                llapi_printf(LLAPI_MSG_NORMAL,
-                                             "obd_uuid: %s failed %s ",
-                                             param->obduuid->uuid,
-                                             strerror(errno));
-                                break;
-                        }
-                }
+                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);
@@ -2265,7 +2640,7 @@ int llapi_find(char *path, struct find_param *param)
  */
 int llapi_file_fget_mdtidx(int fd, int *mdtidx)
 {
-        if (ioctl(fd, LL_IOC_GET_MDTIDX, &mdtidx) < 0)
+        if (ioctl(fd, LL_IOC_GET_MDTIDX, mdtidx) < 0)
                 return -errno;
         return 0;
 }
@@ -2316,10 +2691,16 @@ static int cb_get_mdt_index(char *path, DIR *parent, DIR *d, void *data,
                 return ret;
         }
 
-        if (param->quiet)
+       /* 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
-                llapi_printf(LLAPI_MSG_NORMAL, "%s MDT index: %d\n",
+               /* coverity[uninit_use_in_call] */
+                llapi_printf(LLAPI_MSG_NORMAL, "%s\nmdt_index:\t%d\n",
                              path, mdtidx);
 
 out:
@@ -2403,7 +2784,7 @@ static int cb_getstripe(char *path, DIR *parent, DIR *d, void *data,
         }
 
 dump:
-        if (!param->get_mdt_index)
+        if (!(param->verbose & VERBOSE_MDTINDEX))
                 llapi_lov_dump_user_lmm(param, path, d ? 1 : 0);
 
 out:
@@ -2417,7 +2798,7 @@ out:
 
 int llapi_getstripe(char *path, struct find_param *param)
 {
-        return param_callback(path, param->get_mdt_index ?
+        return param_callback(path, (param->verbose & VERBOSE_MDTINDEX) ?
                               cb_get_mdt_index : cb_getstripe,
                               cb_common_fini, param);
 }
@@ -2467,7 +2848,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)
 {
@@ -2485,6 +2865,8 @@ int llapi_ping(char *obd_type, char *obd_name)
                 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;
@@ -2513,7 +2895,6 @@ int llapi_target_iterate(int type_num, char **obd_type,
                 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] == ' ')
@@ -2527,9 +2908,6 @@ int llapi_target_iterate(int type_num, char **obd_type,
 
                 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;
@@ -2563,51 +2941,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_error(LLAPI_MSG_ERROR, rc, "open %s failed", dir);
-                return rc;
-        }
-
-        rc = ioctl(dirfd(root), OBD_IOC_LLOG_CATINFO, buf);
-        if (rc) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "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)
 {
@@ -2696,36 +3029,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_error(LLAPI_MSG_ERROR, -ENODATA,
                                           "%s has no stripe info", path);
                         rc = 0;
-                } else if (errno == ENOENT) {
-                        llapi_error(LLAPI_MSG_ERROR, -ENOENT,
-                                  "warning: %s: %s does not exist",
-                                  __func__, path);
+                } else if (rc == -ENOENT) {
                         rc = 0;
-                } else if (errno != EISDIR) {
-                        rc = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, rc, "%s ioctl failed for %s.",
-                                    d ? "LL_IOC_MDC_GETINFO" :
-                                    "IOC_MDC_GETFILEINFO", path);
                 }
                 return rc;
         }
@@ -2773,7 +3085,7 @@ 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) {
@@ -2788,7 +3100,7 @@ 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);
@@ -2796,20 +3108,23 @@ static int rmtacl_notify(int ops)
                         rc = -errno;
                         llapi_error(LLAPI_MSG_ERROR, rc,
                                     "Can't open '%s'\n", mnt->mnt_dir);
-                        return rc;
+                       goto out;
                 }
 
                 rc = ioctl(fd, LL_IOC_RMTACL, ops);
+               close(fd);
                 if (rc < 0) {
                         rc = -errno;
                         llapi_error(LLAPI_MSG_ERROR, rc, "ioctl %d\n", fd);
-                        return rc;
+                       goto out;
                 }
 
                 found++;
         }
+
+out:
         endmntent(fp);
-        return found;
+       return ((rc != 0) ? rc : found);
 }
 
 static char *next_token(char *p, int div)
@@ -3229,6 +3544,24 @@ int llapi_changelog_fini(void **priv)
         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
@@ -3236,7 +3569,7 @@ int llapi_changelog_fini(void **priv)
  *         <0 error code
  *         1 EOF
  */
-int llapi_changelog_recv(void *priv, struct changelog_rec **rech)
+int llapi_changelog_recv(void *priv, struct changelog_ext_rec **rech)
 {
         struct changelog_private *cp = (struct changelog_private *)priv;
         struct kuc_hdr *kuch;
@@ -3277,10 +3610,11 @@ repeat:
                 }
         }
 
-        /* Our message is a changelog_rec.  Use pointer math to skip
-         * kuch_hdr and point directly to the message payload.
-         */
-        *rech = (struct changelog_rec *)(kuch + 1);
+       /* 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;
 
@@ -3291,7 +3625,7 @@ out_free:
 }
 
 /** Release the changelog record when done with it. */
-int llapi_changelog_free(struct changelog_rec **rech)
+int llapi_changelog_free(struct changelog_ext_rec **rech)
 {
         if (*rech) {
                 /* We allocated memory starting at the kuc_hdr, but passed
@@ -3391,13 +3725,13 @@ int llapi_path2fid(const char *path, lustre_fid *fid)
         memset(fid, 0, sizeof(*fid));
         fd = open(path, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
         if (fd < 0) {
-                if (errno == ELOOP) /* symbolic link */
+                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) /* char special device */
+        if (rc == -EINVAL || rc == -ENOTTY)
                 rc = path2fid_from_lma(path, fid);
 
         close(fd);
@@ -3577,8 +3911,8 @@ out_free:
 /** Release the action list when done with it. */
 int llapi_copytool_free(struct hsm_action_list **hal)
 {
-        /* Reuse the llapi_changelog_free function */
-        return llapi_changelog_free((struct changelog_rec **)hal);
+       /* Reuse the llapi_changelog_free function */
+       return llapi_changelog_free((struct changelog_ext_rec **)hal);
 }
 
 int llapi_get_connect_flags(const char *mnt, __u64 *flags)
@@ -3630,3 +3964,33 @@ int llapi_get_version(char *buffer, int buffer_size,
         *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;
+}