Whamcloud - gitweb
LU-6081 user: use random() instead of /dev/urandom
[fs/lustre-release.git] / lustre / utils / liblustreapi.c
index 7581054..e74cf70 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,6 +45,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <mntent.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -56,6 +57,7 @@
 #include <dirent.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
 #include <sys/xattr.h>
@@ -88,6 +90,11 @@ void llapi_msg_set_level(int level)
                 llapi_msg_level = level;
 }
 
+int llapi_msg_get_level(void)
+{
+       return llapi_msg_level;
+}
+
 static void error_callback_default(enum llapi_message_level level, int err,
                                   const char *fmt, va_list ap)
 {
@@ -248,26 +255,26 @@ int llapi_stripe_limit_check(unsigned long long stripe_size, int stripe_offset,
                                "larger than expected (%u)", page_size,
                                LOV_MIN_STRIPE_SIZE);
        }
-       if ((stripe_size & (LOV_MIN_STRIPE_SIZE - 1))) {
+       if (!llapi_stripe_size_is_aligned(stripe_size)) {
                rc = -EINVAL;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe_size %llu, "
                                "must be an even multiple of %d bytes",
                                stripe_size, page_size);
                return rc;
        }
-       if (stripe_offset < -1) {
+       if (!llapi_stripe_offset_is_valid(stripe_offset)) {
                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) {
+       if (!llapi_stripe_count_is_valid(stripe_count)) {
                rc = -EINVAL;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: bad stripe count %d",
                                stripe_count);
                return rc;
        }
-       if (stripe_size >= (1ULL << 32)) {
+       if (llapi_stripe_size_is_too_big(stripe_size)) {
                rc = -EINVAL;
                llapi_error(LLAPI_MSG_ERROR, rc,
                                "warning: stripe size 4G or larger "
@@ -436,7 +443,7 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
        if (fp == NULL) {
                rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: opening "DEVICES_LIST);
-               GOTO(out, rc);
+               goto out;
        }
 
        if (fsname == NULL && file_path != NULL) {
@@ -445,12 +452,14 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
                        llapi_error(LLAPI_MSG_ERROR, rc,
                                    "'%s' is not on a Lustre filesystem",
                                    file_path);
-                       GOTO(out, rc);
+                       goto out;
                }
        } else if (fsname != NULL) {
                rc = strlcpy(fs, fsname, sizeof(fs));
-               if (rc >= sizeof(fs))
-                       GOTO(out, rc = -E2BIG);
+               if (rc >= sizeof(fs)) {
+                       rc = -E2BIG;
+                       goto out;
+               }
        }
 
        while (fgets(devices, sizeof(devices) - 1, fp) != NULL) {
@@ -466,8 +475,11 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
                        if (strcmp(tmp, fs))
                                continue;
                        rc = strlcpy(dev, tmp, sizeof(dev));
-                       if (rc >= sizeof(dev))
-                               GOTO(out, rc = -E2BIG);
+                       if (rc >= sizeof(dev)) {
+                               rc = -E2BIG;
+                               goto out;
+                       }
+
                        tmp = strchr(dev, ' ');
                        if (tmp != NULL)
                                *tmp = '\0';
@@ -477,13 +489,18 @@ static int get_param_obdvar(const char *fsname, const char *file_path,
 
        if (dev[0] == '*' && strlen(fs)) {
                rc = snprintf(dev, sizeof(dev), "%s-*", fs);
-               if (rc >= sizeof(dev))
-                       GOTO(out, rc = -E2BIG);
+               if (rc >= sizeof(dev)) {
+                       rc = -E2BIG;
+                       goto out;
+               }
        }
        rc = snprintf(devices, sizeof(devices), "%s/%s/%s", obd_type, dev,
                      param_name);
-       if (rc >= sizeof(devices))
-               GOTO(out, rc = -E2BIG);
+       if (rc >= sizeof(devices)) {
+               rc = -E2BIG;
+               goto out;
+       }
+
        fclose(fp);
        return get_param(devices, value, val_len);
 out:
@@ -644,49 +661,114 @@ int llapi_search_ost(char *fsname, char *poolname, char *ostname)
         return 0;
 }
 
-int llapi_file_open_pool(const char *name, int flags, int mode,
-                        unsigned long long stripe_size, int stripe_offset,
-                        int stripe_count, int stripe_pattern, char *pool_name)
+/**
+ * Open a Lustre file.
+ *
+ * \param name     the name of the file to be opened
+ * \param flags    access mode, see flags in open(2)
+ * \param mode     permission of the file if it is created, see mode in open(2)
+ * \param param    stripe pattern of the newly created file
+ *
+ * \retval         file descriptor of opened file
+ * \retval         negative errno on failure
+ */
+int llapi_file_open_param(const char *name, int flags, mode_t mode,
+                         const struct llapi_stripe_param *param)
 {
-       struct lov_user_md_v3 lum = { 0 };
-       int fd, rc = 0;
+       char fsname[MAX_OBD_NAME + 1] = { 0 };
+       char *pool_name = param->lsp_pool;
+       struct lov_user_md *lum = NULL;
+       size_t lum_size = sizeof(*lum);
+       int fd, rc;
 
-        /* Make sure we have a good pool */
-        if (pool_name != NULL) {
-                char fsname[MAX_OBD_NAME + 1], *ptr;
+       /* Make sure we are on a Lustre file system */
+       rc = llapi_search_fsname(name, fsname);
+       if (rc) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "'%s' is not on a Lustre filesystem",
+                           name);
+               return rc;
+       }
 
-                rc = llapi_search_fsname(name, fsname);
-                if (rc) {
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "'%s' is not on a Lustre filesystem",
-                                    name);
-                        return rc;
-                }
+       /* Check if the stripe pattern is sane. */
+       rc = llapi_stripe_limit_check(param->lsp_stripe_size,
+                                     param->lsp_stripe_offset,
+                                     param->lsp_stripe_count,
+                                     param->lsp_stripe_pattern);
+       if (rc != 0)
+               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 we have a good pool */
+       if (pool_name != NULL) {
+               /* in case user gives the full pool name <fsname>.<poolname>,
+                * strip the fsname */
+               char *ptr = strchr(pool_name, '.');
+               if (ptr != NULL) {
+                       *ptr = '\0';
+                       if (strcmp(pool_name, fsname) != 0) {
+                               *ptr = '.';
+                               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                       "Pool '%s' is not on filesystem '%s'",
+                                       pool_name, fsname);
+                               return -EINVAL;
+                       }
+                       pool_name = ptr + 1;
+               }
 
-                /* Make sure the pool exists and is non-empty */
-                rc = llapi_search_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;
-                }
-        }
+               /* Make sure the pool exists and is non-empty */
+               rc = llapi_search_ost(fsname, pool_name, NULL);
+               if (rc < 1) {
+                       char *err = rc == 0 ? "has no OSTs" : "does not exist";
+
+                       llapi_err_noerrno(LLAPI_MSG_ERROR, "pool '%s.%s' %s",
+                                         fsname, pool_name, err);
+                       return -EINVAL;
+               }
+
+               lum_size = sizeof(struct lov_user_md_v3);
+       }
+
+       /* sanity check of target list */
+       if (param->lsp_is_specific) {
+               char ostname[MAX_OBD_NAME + 1];
+               bool found = false;
+               int i;
+
+               for (i = 0; i < param->lsp_stripe_count; i++) {
+                       snprintf(ostname, sizeof(ostname), "%s-OST%04x_UUID",
+                                fsname, param->lsp_osts[i]);
+                       rc = llapi_search_ost(fsname, pool_name, ostname);
+                       if (rc <= 0) {
+                               if (rc == 0)
+                                       rc = -ENODEV;
+
+                               llapi_error(LLAPI_MSG_ERROR, rc,
+                                           "%s: cannot find OST %s in %s",
+                                           __func__, ostname,
+                                           pool_name != NULL ?
+                                           "pool" : "system");
+                               return rc;
+                       }
+
+                       /* Make sure stripe offset is in OST list. */
+                       if (param->lsp_osts[i] == param->lsp_stripe_offset)
+                               found = true;
+               }
+               if (!found) {
+                       llapi_error(LLAPI_MSG_ERROR, -EINVAL,
+                                   "%s: stripe offset '%d' is not in the "
+                                   "target list",
+                                   __func__, param->lsp_stripe_offset);
+                       return -EINVAL;
+               }
+
+               lum_size = lov_user_md_size(param->lsp_stripe_count,
+                                           LOV_USER_MAGIC_SPECIFIC);
+       }
+
+       lum = calloc(1, lum_size);
+       if (lum == NULL)
+               return -ENOMEM;
 
 retry_open:
        fd = open(name, flags | O_LOV_DELAY_CREATE, mode);
@@ -697,48 +779,74 @@ retry_open:
                }
        }
 
-        if (fd < 0) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name);
-                return rc;
-        }
+       if (fd < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name);
+               free(lum);
+               return 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_V1;
+       lum->lmm_pattern = param->lsp_stripe_pattern;
+       lum->lmm_stripe_size = param->lsp_stripe_size;
+       lum->lmm_stripe_count = param->lsp_stripe_count;
+       lum->lmm_stripe_offset = param->lsp_stripe_offset;
+       if (pool_name != NULL) {
+               struct lov_user_md_v3 *lumv3 = (void *)lum;
 
-        /*  Initialize IOCTL striping pattern structure */
-        lum.lmm_magic = LOV_USER_MAGIC_V3;
-        lum.lmm_pattern = stripe_pattern;
-        lum.lmm_stripe_size = stripe_size;
-        lum.lmm_stripe_count = stripe_count;
-        lum.lmm_stripe_offset = stripe_offset;
-        if (pool_name != NULL) {
-               strlcpy(lum.lmm_pool_name, pool_name,
-                       sizeof(lum.lmm_pool_name));
-        } else {
-                /* If no pool is specified at all, use V1 request */
-                lum.lmm_magic = LOV_USER_MAGIC_V1;
-        }
+               lumv3->lmm_magic = LOV_USER_MAGIC_V3;
+               strncpy(lumv3->lmm_pool_name, pool_name, LOV_MAXPOOLNAME);
+       }
+       if (param->lsp_is_specific) {
+               struct lov_user_md_v3 *lumv3 = (void *)lum;
+               int i;
+
+               lumv3->lmm_magic = LOV_USER_MAGIC_SPECIFIC;
+               if (pool_name == NULL) {
+                       /* LOV_USER_MAGIC_SPECIFIC uses v3 format plus specified
+                        * OST list, therefore if pool is not specified we have
+                        * to pack a null pool name for placeholder. */
+                       memset(lumv3->lmm_pool_name, 0, LOV_MAXPOOLNAME);
+               }
 
-        if (ioctl(fd, LL_IOC_LOV_SETSTRIPE, &lum)) {
-                char *errmsg = "stripe already set";
-                rc = -errno;
-                if (errno != EEXIST && errno != EALREADY)
-                        errmsg = strerror(errno);
+               for (i = 0; i < param->lsp_stripe_count; i++)
+                       lumv3->lmm_objects[i].l_ost_idx = param->lsp_osts[i];
+       }
 
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "error on ioctl "LPX64" for '%s' (%d): %s",
-                                  (__u64)LL_IOC_LOV_SETSTRIPE, name, fd,errmsg);
-        }
-out:
-        if (rc) {
-                close(fd);
-                fd = rc;
-        }
+       if (ioctl(fd, LL_IOC_LOV_SETSTRIPE, lum) != 0) {
+               char *errmsg = "stripe already set";
 
-        return fd;
+               rc = -errno;
+               if (errno != EEXIST && errno != EALREADY)
+                       errmsg = strerror(errno);
+
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "error on ioctl "LPX64" for '%s' (%d): %s",
+                                 (__u64)LL_IOC_LOV_SETSTRIPE, name, fd,
+                                 errmsg);
+
+               close(fd);
+               fd = rc;
+       }
+
+       free(lum);
+
+       return fd;
+}
+
+int llapi_file_open_pool(const char *name, int flags, int mode,
+                        unsigned long long stripe_size, int stripe_offset,
+                        int stripe_count, int stripe_pattern, char *pool_name)
+{
+       const struct llapi_stripe_param param = {
+               .lsp_stripe_size = stripe_size,
+               .lsp_stripe_count = stripe_count,
+               .lsp_stripe_pattern = stripe_pattern,
+               .lsp_stripe_offset = stripe_offset,
+               .lsp_pool = pool_name
+       };
+       return llapi_file_open_param(name, flags, mode, &param);
 }
 
 int llapi_file_open(const char *name, int flags, int mode,
@@ -851,7 +959,7 @@ int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
        lmu.lum_stripe_count = stripe_count;
        lmu.lum_hash_type = stripe_pattern;
        if (pool_name != NULL) {
-               if (strlen(pool_name) >= LOV_MAXPOOLNAME) {
+               if (strlen(pool_name) > LOV_MAXPOOLNAME) {
                        llapi_err_noerrno(LLAPI_MSG_ERROR,
                                  "error LL_IOC_LMV_SETSTRIPE '%s' : too large"
                                  "pool name: %s", name, pool_name);
@@ -1434,44 +1542,46 @@ typedef int (semantic_func_t)(char *path, DIR *parent, DIR **d,
 
 static int common_param_init(struct find_param *param, char *path)
 {
-       int lumlen = get_mds_md_size(path);
+       int lum_size = get_mds_md_size(path);
 
-       if (lumlen < PATH_MAX + 1)
-               lumlen = PATH_MAX + 1;
+       if (lum_size < PATH_MAX + 1)
+               lum_size = PATH_MAX + 1;
 
-       param->lumlen = lumlen;
-       param->lmd = malloc(sizeof(lstat_t) + param->lumlen);
-       if (param->lmd == NULL) {
+       param->fp_lum_size = lum_size;
+       param->fp_lmd = malloc(sizeof(lstat_t) + param->fp_lum_size);
+       if (param->fp_lmd == NULL) {
                llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
                            "error: allocation of %zu bytes for ioctl",
-                           sizeof(lstat_t) + param->lumlen);
+                           sizeof(lstat_t) + param->fp_lum_size);
                return -ENOMEM;
        }
 
-       param->fp_lmv_count = 256;
-       param->fp_lmv_md = malloc(lmv_user_md_size(256, LMV_MAGIC_V1));
+       param->fp_lmv_stripe_count = 256;
+       param->fp_lmv_md = malloc(lmv_user_md_size(param->fp_lmv_stripe_count,
+                                                  LMV_MAGIC_V1));
        if (param->fp_lmv_md == NULL) {
                llapi_error(LLAPI_MSG_ERROR, -ENOMEM,
                            "error: allocation of %d bytes for ioctl",
-                           lmv_user_md_size(256, LMV_MAGIC_V1));
+                           lmv_user_md_size(param->fp_lmv_stripe_count,
+                                            LMV_MAGIC_V1));
                return -ENOMEM;
        }
 
-       param->got_uuids = 0;
-       param->obdindexes = NULL;
-       param->obdindex = OBD_NOT_FOUND;
-       if (!param->migrate)
-               param->mdtindex = OBD_NOT_FOUND;
+       param->fp_got_uuids = 0;
+       param->fp_obd_indexes = NULL;
+       param->fp_obd_index = OBD_NOT_FOUND;
+       if (!param->fp_migrate)
+               param->fp_mdt_index = OBD_NOT_FOUND;
        return 0;
 }
 
 static void find_param_fini(struct find_param *param)
 {
-       if (param->obdindexes)
-               free(param->obdindexes);
+       if (param->fp_obd_indexes)
+               free(param->fp_obd_indexes);
 
-       if (param->lmd)
-               free(param->lmd);
+       if (param->fp_lmd)
+               free(param->fp_lmd);
 
        if (param->fp_lmv_md)
                free(param->fp_lmv_md);
@@ -1509,8 +1619,8 @@ static int cb_get_dirstripe(char *path, DIR *d, struct find_param *param)
        struct lmv_user_md *lmv = (struct lmv_user_md *)param->fp_lmv_md;
        int ret = 0;
 
-       lmv->lum_stripe_count = param->fp_lmv_count;
-       if (param->get_default_lmv)
+       lmv->lum_stripe_count = param->fp_lmv_stripe_count;
+       if (param->fp_get_default_lmv)
                lmv->lum_magic = LMV_USER_MAGIC;
        else
                lmv->lum_magic = LMV_MAGIC_V1;
@@ -1608,8 +1718,6 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
        while ((dent = readdir64(d)) != NULL) {
                int rc;
 
-               param->have_fileinfo = 0;
-
                 if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
                         continue;
 
@@ -1628,10 +1736,10 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
                 strcat(path, dent->d_name);
 
                 if (dent->d_type == DT_UNKNOWN) {
-                       lstat_t *st = &param->lmd->lmd_st;
+                       lstat_t *st = &param->fp_lmd->lmd_st;
 
-                       rc = get_lmd_info(path, d, NULL, param->lmd,
-                                          param->lumlen);
+                       rc = get_lmd_info(path, d, NULL, param->fp_lmd,
+                                          param->fp_lum_size);
                        if (rc == 0)
                                dent->d_type = IFTODT(st->st_mode);
                        else if (ret == 0)
@@ -1776,10 +1884,11 @@ enum tgt_type {
 static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
                                   int *ost_count, enum tgt_type type)
 {
-        struct obd_uuid name;
-        char buf[1024];
-        FILE *fp;
-        int rc = 0, index = 0;
+       struct obd_uuid name;
+       char buf[1024];
+       char format[32];
+       FILE *fp;
+       int rc = 0, index = 0;
 
         /* Get the lov name */
         if (type == LOV_TYPE) {
@@ -1802,9 +1911,11 @@ static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp,
                 return rc;
         }
 
-        while (fgets(buf, sizeof(buf), fp) != NULL) {
-                if (uuidp && (index < *ost_count)) {
-                        if (sscanf(buf, "%d: %s", &index, uuidp[index].uuid) <2)
+       snprintf(format, sizeof(format),
+                "%%d: %%%zus", sizeof(uuidp[0].uuid) - 1);
+       while (fgets(buf, sizeof(buf), fp) != NULL) {
+               if (uuidp && (index < *ost_count)) {
+                       if (sscanf(buf, format, &index, uuidp[index].uuid) < 2)
                                 break;
                 }
                 index++;
@@ -1868,21 +1979,21 @@ int llapi_uuid_match(char *real_uuid, char *search_uuid)
         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 */
+/* Here, param->fp_obd_uuid points to a single obduuid, the index of which is
+ * returned in param->fp_obd_index */
 static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
 {
-        struct obd_uuid obd_uuid;
-        char uuid[sizeof(struct obd_uuid)];
-        char buf[1024];
-        FILE *fp;
-        int rc = 0, index;
+       struct obd_uuid obd_uuid;
+       char buf[1024];
+       char format[32];
+       FILE *fp;
+       int rc = 0;
 
-        if (param->got_uuids)
+       if (param->fp_got_uuids)
                 return rc;
 
         /* Get the lov/lmv name */
-        if (param->get_lmv)
+       if (param->fp_get_lmv)
                 rc = llapi_file_fget_lmv_uuid(dirfd(dir), &obd_uuid);
         else
                 rc = llapi_file_fget_lov_uuid(dirfd(dir), &obd_uuid);
@@ -1896,11 +2007,11 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
                 return rc;
         }
 
-        param->got_uuids = 1;
+       param->fp_got_uuids = 1;
 
-        /* Now get the ost uuids from /proc */
-        snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd",
-                 param->get_lmv ? "lmv" : "lov", obd_uuid.uuid);
+       /* Now get the ost uuids from /proc */
+       snprintf(buf, sizeof(buf), "/proc/fs/lustre/%s/%s/target_obd",
+                param->fp_get_lmv ? "lmv" : "lov", obd_uuid.uuid);
         fp = fopen(buf, "r");
         if (fp == NULL) {
                 rc = -errno;
@@ -1908,41 +2019,46 @@ static int setup_obd_uuid(DIR *dir, char *dname, struct find_param *param)
                 return rc;
         }
 
-        if (!param->obduuid && !param->quiet && !param->obds_printed)
-                llapi_printf(LLAPI_MSG_NORMAL, "%s:\n",
-                             param->get_lmv ? "MDTS" : "OBDS:");
+       if (!param->fp_obd_uuid && !param->fp_quiet && !param->fp_obds_printed)
+               llapi_printf(LLAPI_MSG_NORMAL, "%s:\n",
+                            param->fp_get_lmv ? "MDTS" : "OBDS:");
 
-        while (fgets(buf, sizeof(buf), fp) != NULL) {
-                if (sscanf(buf, "%d: %s", &index, uuid) < 2)
-                        break;
+       snprintf(format, sizeof(format),
+                "%%d: %%%zus", sizeof(obd_uuid.uuid) - 1);
+       while (fgets(buf, sizeof(buf), fp) != NULL) {
+               int index;
 
-                if (param->obduuid) {
-                        if (llapi_uuid_match(uuid, param->obduuid->uuid)) {
-                                param->obdindex = index;
-                                break;
-                        }
-                } else if (!param->quiet && !param->obds_printed) {
-                        /* Print everything */
-                        llapi_printf(LLAPI_MSG_NORMAL, "%s", buf);
-                }
-        }
-        param->obds_printed = 1;
+               if (sscanf(buf, format, &index, obd_uuid.uuid) < 2)
+                       break;
+
+               if (param->fp_obd_uuid) {
+                       if (llapi_uuid_match(obd_uuid.uuid,
+                                            param->fp_obd_uuid->uuid)) {
+                               param->fp_obd_index = index;
+                               break;
+                       }
+               } else if (!param->fp_quiet && !param->fp_obds_printed) {
+                       /* Print everything */
+                       llapi_printf(LLAPI_MSG_NORMAL, "%s", buf);
+               }
+       }
+       param->fp_obds_printed = 1;
 
         fclose(fp);
 
-        if (param->obduuid && (param->obdindex == OBD_NOT_FOUND)) {
-                llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                  "error: %s: unknown obduuid: %s",
-                                  __func__, param->obduuid->uuid);
-                rc = -EINVAL;
-        }
+       if (param->fp_obd_uuid && (param->fp_obd_index == OBD_NOT_FOUND)) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                 "error: %s: unknown obduuid: %s",
+                                 __func__, param->fp_obd_uuid->uuid);
+               rc = -EINVAL;
+       }
 
         return (rc);
 }
 
-/* In this case, param->obduuid will be an array of obduuids and
+/* In this case, param->fp_obd_uuid will be an array of obduuids and
  * obd index for all these obduuids will be returned in
- * param->obdindexes */
+ * param->fp_obd_indexes */
 static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
                          int num_obds, int **obdindexes, int *obdindex,
                          enum tgt_type type)
@@ -2036,20 +2152,27 @@ 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;
+       if (param->fp_mdt_uuid) {
+               ret = setup_indexes(dir, path, param->fp_mdt_uuid,
+                                   param->fp_num_mdts,
+                                   &param->fp_mdt_indexes,
+                                   &param->fp_mdt_index, LMV_TYPE);
+               if (ret)
+                       return ret;
+       }
+
+       if (param->fp_obd_uuid) {
+               ret = setup_indexes(dir, path, param->fp_obd_uuid,
+                                   param->fp_num_obds,
+                                   &param->fp_obd_indexes,
+                                   &param->fp_obd_index, LOV_TYPE);
+               if (ret)
+                       return ret;
+       }
+
+       param->fp_got_uuids = 1;
+
+       return ret;
 }
 
 int llapi_ostlist(char *path, struct find_param *param)
@@ -2502,30 +2625,30 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
 {
        __u32 magic;
 
-       if (param->get_lmv || param->get_default_lmv)
+       if (param->fp_get_lmv || param->fp_get_default_lmv)
                magic = (__u32)param->fp_lmv_md->lum_magic;
        else
-               magic = *(__u32 *)&param->lmd->lmd_lmm; /* lum->lmm_magic */
+               magic = *(__u32 *)&param->fp_lmd->lmd_lmm; /* lum->lmm_magic */
 
        switch (magic) {
         case LOV_USER_MAGIC_V1:
-                lov_dump_user_lmm_v1v3(&param->lmd->lmd_lmm, NULL,
-                                       param->lmd->lmd_lmm.lmm_objects,
-                                       path, is_dir,
-                                      param->obdindex, param->fp_max_depth,
-                                       param->verbose, param->raw);
+               lov_dump_user_lmm_v1v3(&param->fp_lmd->lmd_lmm, NULL,
+                                      param->fp_lmd->lmd_lmm.lmm_objects,
+                                      path, is_dir,
+                                      param->fp_obd_index, param->fp_max_depth,
+                                      param->fp_verbose, param->fp_raw);
                 break;
         case LOV_USER_MAGIC_V3: {
                 char pool_name[LOV_MAXPOOLNAME + 1];
                 struct lov_user_ost_data_v1 *objects;
-                struct lov_user_md_v3 *lmmv3 = (void *)&param->lmd->lmd_lmm;
+               struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_lmd->lmd_lmm;
 
                strlcpy(pool_name, lmmv3->lmm_pool_name, sizeof(pool_name));
-                objects = lmmv3->lmm_objects;
-                lov_dump_user_lmm_v1v3(&param->lmd->lmd_lmm, pool_name,
-                                       objects, path, is_dir,
-                                      param->obdindex, param->fp_max_depth,
-                                       param->verbose, param->raw);
+               objects = lmmv3->lmm_objects;
+               lov_dump_user_lmm_v1v3(&param->fp_lmd->lmd_lmm, pool_name,
+                                      objects, path, is_dir,
+                                      param->fp_obd_index, param->fp_max_depth,
+                                      param->fp_verbose, param->fp_raw);
                 break;
         }
        case LMV_MAGIC_V1:
@@ -2536,14 +2659,14 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *path, int is_dir)
                lum = (struct lmv_user_md *)param->fp_lmv_md;
                strlcpy(pool_name, lum->lum_pool_name, sizeof(pool_name));
                lmv_dump_user_lmm(lum, pool_name, path,
-                                 param->obdindex, param->fp_max_depth,
-                                 param->verbose);
+                                 param->fp_obd_index, param->fp_max_depth,
+                                 param->fp_verbose);
                break;
        }
        default:
                llapi_printf(LLAPI_MSG_NORMAL, "unknown lmm_magic:  %#x "
                             "(expecting one of %#x %#x %#x %#x)\n",
-                            *(__u32 *)&param->lmd->lmd_lmm,
+                            *(__u32 *)&param->fp_lmd->lmd_lmm,
                             LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3,
                             LMV_USER_MAGIC, LMV_MAGIC_V1);
                return;
@@ -2723,66 +2846,68 @@ static int find_time_check(lstat_t *st, struct find_param *param, int mds)
  */
 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;
+       lstat_t *st = &param->fp_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 (param->fp_obd_uuid && param->fp_obd_index == OBD_NOT_FOUND)
+               return 0;
 
-        if (!S_ISREG(st->st_mode))
-                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;
+       /* Only those files should be accepted, which have a
+        * stripe on the specified OST. */
+       if (!param->fp_lmd->lmd_lmm.lmm_stripe_count)
+               return 0;
 
-        if (param->lmd->lmd_lmm.lmm_magic ==
-            LOV_USER_MAGIC_V3) {
-                struct lov_user_md_v3 *lmmv3 = (void *)&param->lmd->lmd_lmm;
+       if (param->fp_lmd->lmd_lmm.lmm_magic ==
+           LOV_USER_MAGIC_V3) {
+               struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_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;
-        }
+               lmm_objects = lmmv3->lmm_objects;
+       } else if (param->fp_lmd->lmd_lmm.lmm_magic ==  LOV_USER_MAGIC_V1) {
+               lmm_objects = param->fp_lmd->lmd_lmm.lmm_objects;
+       } else {
+               llapi_err_noerrno(LLAPI_MSG_ERROR, "%s:Unknown magic: 0x%08X\n",
+                                 __func__, param->fp_lmd->lmd_lmm.lmm_magic);
+               return -EINVAL;
+       }
 
-        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;
-                        }
-                }
-        }
+       for (i = 0; i < param->fp_lmd->lmd_lmm.lmm_stripe_count; i++) {
+               for (j = 0; j < param->fp_num_obds; j++) {
+                       if (param->fp_obd_indexes[j] ==
+                           lmm_objects[i].l_ost_idx) {
+                               if (param->fp_exclude_obd)
+                                       return 0;
+                               return 1;
+                       }
+               }
+       }
 
-        if (param->exclude_obd)
+       if (param->fp_exclude_obd)
                 return 1;
-        return 0;
+
+       return 0;
 }
 
 static int check_mdt_match(struct find_param *param)
 {
-        int i;
+       int i;
 
-        if (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND)
-                return 0;
+       if (param->fp_mdt_uuid && param->fp_mdt_index == 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)
-                       return !param->exclude_mdt;
+       /* FIXME: For striped dir, we should get stripe information and check */
+       for (i = 0; i < param->fp_num_mdts; i++) {
+               if (param->fp_mdt_indexes[i] == param->fp_file_mdt_index)
+                       return !param->fp_exclude_mdt;
        }
 
-        if (param->exclude_mdt)
-                return 1;
-        return 0;
+       if (param->fp_exclude_mdt)
+               return 1;
+
+       return 0;
 }
 
 /**
@@ -2800,16 +2925,17 @@ static int print_failed_tgt(struct find_param *param, char *path, int type)
 
         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;
+       ret = llapi_obd_statfs(path, type,
+                              param->fp_obd_index, &stat_buf,
+                              &uuid_buf);
+       if (ret) {
+               llapi_printf(LLAPI_MSG_NORMAL,
+                            "obd_uuid: %s failed %s ",
+                            param->fp_obd_uuid->uuid,
+                            strerror(errno));
+       }
+
+       return ret;
 }
 
 static int cb_find_init(char *path, DIR *parent, DIR **dirp,
@@ -2818,25 +2944,24 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
         struct find_param *param = (struct find_param *)data;
        DIR *dir = dirp == NULL ? NULL : *dirp;
         int decision = 1; /* 1 is accepted; -1 is rejected. */
-        lstat_t *st = &param->lmd->lmd_st;
+       lstat_t *st = &param->fp_lmd->lmd_st;
         int lustre_fs = 1;
         int checked_type = 0;
         int ret = 0;
 
         LASSERT(parent != NULL || dir != NULL);
 
-        if (param->have_fileinfo == 0)
-                param->lmd->lmd_lmm.lmm_stripe_count = 0;
+       param->fp_lmd->lmd_lmm.lmm_stripe_count = 0;
 
-        /* If a regular expression is presented, make the initial decision */
-        if (param->pattern != NULL) {
-                char *fname = strrchr(path, '/');
-                fname = (fname == NULL ? path : fname + 1);
-                ret = fnmatch(param->pattern, fname, 0);
-                if ((ret == FNM_NOMATCH && !param->exclude_pattern) ||
-                    (ret == 0 && param->exclude_pattern))
-                        goto decided;
-        }
+       /* If a regular expression is presented, make the initial decision */
+       if (param->fp_pattern != NULL) {
+               char *fname = strrchr(path, '/');
+               fname = (fname == NULL ? path : fname + 1);
+               ret = fnmatch(param->fp_pattern, fname, 0);
+               if ((ret == FNM_NOMATCH && !param->fp_exclude_pattern) ||
+                   (ret == 0 && param->fp_exclude_pattern))
+                       goto decided;
+       }
 
        /* See if we can check the file type from the dirent. */
        if (param->fp_type != 0 && de != NULL && de->d_type != DT_UNKNOWN) {
@@ -2851,28 +2976,28 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                }
        }
 
-        ret = 0;
+       ret = 0;
 
-        /* Request MDS for the stat info if some of these parameters need
-         * to be compared. */
-       if (param->obduuid || param->mdtuuid ||
+       /* Request MDS for the stat info if some of these parameters need
+        * to be compared. */
+       if (param->fp_obd_uuid || param->fp_mdt_uuid ||
            param->fp_check_uid || param->fp_check_gid ||
            param->fp_atime || param->fp_mtime || param->fp_ctime ||
-           param->check_pool || param->check_size ||
-           param->check_stripecount || param->check_stripesize ||
-           param->check_layout)
+           param->fp_check_pool || param->fp_check_size ||
+           param->fp_check_stripe_count || param->fp_check_stripe_size ||
+           param->fp_check_layout)
                decision = 0;
 
        if (param->fp_type != 0 && checked_type == 0)
                 decision = 0;
 
-        if (param->have_fileinfo == 0 && decision == 0) {
-                ret = get_lmd_info(path, parent, dir, param->lmd,
-                                   param->lumlen);
+       if (decision == 0) {
+               ret = get_lmd_info(path, parent, dir, param->fp_lmd,
+                                  param->fp_lum_size);
                 if (ret == 0) {
                         if (dir) {
-                                ret = llapi_file_fget_mdtidx(dirfd(dir),
-                                                     &param->file_mdtindex);
+                               ret = llapi_file_fget_mdtidx(dirfd(dir),
+                                               &param->fp_file_mdt_index);
                         } else {
                                 int fd;
                                 lstat_t tmp_st;
@@ -2889,7 +3014,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                                         fd = open(path, O_RDONLY);
                                         if (fd > 0) {
                                                 ret = llapi_file_fget_mdtidx(fd,
-                                                         &param->file_mdtindex);
+                                                    &param->fp_file_mdt_index);
                                                 close(fd);
                                         } else {
                                                 ret = fd;
@@ -2899,8 +3024,8 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
                                          * reside on the same MDT with the
                                          * parent */
                                         fd = dirfd(parent);
-                                        ret = llapi_file_fget_mdtidx(fd,
-                                                        &param->file_mdtindex);
+                                       ret = llapi_file_fget_mdtidx(fd,
+                                                    &param->fp_file_mdt_index);
                                 }
                         }
                 }
@@ -2924,96 +3049,102 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp,
        }
 
         /* Prepare odb. */
-        if (param->obduuid || param->mdtuuid) {
-                if (lustre_fs && param->got_uuids &&
+       if (param->fp_obd_uuid || param->fp_mdt_uuid) {
+               if (lustre_fs && param->fp_got_uuids &&
                    param->fp_dev != st->st_dev) {
-                        /* A lustre/lustre mount point is crossed. */
-                        param->got_uuids = 0;
-                        param->obds_printed = 0;
-                        param->obdindex = param->mdtindex = OBD_NOT_FOUND;
-                }
+                       /* A lustre/lustre mount point is crossed. */
+                       param->fp_got_uuids = 0;
+                       param->fp_obds_printed = 0;
+                       param->fp_mdt_index = OBD_NOT_FOUND;
+                       param->fp_obd_index = OBD_NOT_FOUND;
+               }
 
-                if (lustre_fs && !param->got_uuids) {
-                        ret = setup_target_indexes(dir ? dir : parent, path,
-                                                   param);
-                        if (ret)
-                                return ret;
+               if (lustre_fs && !param->fp_got_uuids) {
+                       ret = setup_target_indexes(dir ? dir : parent, path,
+                                                  param);
+                       if (ret)
+                               return ret;
 
                        param->fp_dev = st->st_dev;
-                } else if (!lustre_fs && param->got_uuids) {
-                        /* A lustre/non-lustre mount point is crossed. */
-                        param->got_uuids = 0;
-                        param->obdindex = param->mdtindex = OBD_NOT_FOUND;
+               } else if (!lustre_fs && param->fp_got_uuids) {
+                       /* A lustre/non-lustre mount point is crossed. */
+                       param->fp_got_uuids = 0;
+                       param->fp_mdt_index = OBD_NOT_FOUND;
+                       param->fp_obd_index = OBD_NOT_FOUND;
                 }
         }
 
-        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;
-        }
+       if (param->fp_check_stripe_size) {
+               decision = find_value_cmp(
+                               param->fp_lmd->lmd_lmm.lmm_stripe_size,
+                               param->fp_stripe_size,
+                               param->fp_stripe_size_sign,
+                               param->fp_exclude_stripe_size,
+                               param->fp_stripe_size_units, 0);
+               if (decision == -1)
+                       goto decided;
+       }
 
-        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;
+       if (param->fp_check_stripe_count) {
+               decision = find_value_cmp(
+                               param->fp_lmd->lmd_lmm.lmm_stripe_count,
+                               param->fp_stripe_count,
+                               param->fp_stripe_count_sign,
+                               param->fp_exclude_stripe_count, 1, 0);
+               if (decision == -1)
+                       goto decided;
         }
 
-       if (param->check_layout) {
+       if (param->fp_check_layout) {
                __u32 found;
 
-               found = (param->lmd->lmd_lmm.lmm_pattern & param->layout);
-               if ((param->lmd->lmd_lmm.lmm_pattern == 0xFFFFFFFF) ||
-                   (found && param->exclude_layout) ||
-                   (!found && !param->exclude_layout)) {
+               found = (param->fp_lmd->lmd_lmm.lmm_pattern & param->fp_layout);
+               if ((param->fp_lmd->lmd_lmm.lmm_pattern == 0xFFFFFFFF) ||
+                   (found && param->fp_exclude_layout) ||
+                   (!found && !param->fp_exclude_layout)) {
                        decision = -1;
                        goto decided;
                }
        }
 
-        /* If an OBD UUID is specified but none matches, skip this file. */
-        if ((param->obduuid && param->obdindex == OBD_NOT_FOUND) ||
-            (param->mdtuuid && param->mdtindex == OBD_NOT_FOUND))
-                goto decided;
-
-        /* 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 {
-                                goto decided;
-                        }
-                }
-                if (param->mdtuuid) {
-                        if (check_mdt_match(param))
-                                goto obd_matches;
-                        goto decided;
-                }
-        }
+       /* If an OBD UUID is specified but none matches, skip this file. */
+       if ((param->fp_obd_uuid && param->fp_obd_index == OBD_NOT_FOUND) ||
+           (param->fp_mdt_uuid && param->fp_mdt_index == OBD_NOT_FOUND))
+               goto decided;
+
+       /* If a OST or MDT UUID is given, and some OST matches,
+        * check it here. */
+       if (param->fp_obd_index != OBD_NOT_FOUND ||
+           param->fp_mdt_index != OBD_NOT_FOUND) {
+               if (param->fp_obd_uuid) {
+                       if (check_obd_match(param)) {
+                               /* If no mdtuuid is given, we are done.
+                                * Otherwise, fall through to the mdtuuid
+                                * check below. */
+                               if (!param->fp_mdt_uuid)
+                                       goto obd_matches;
+                       } else {
+                               goto decided;
+                       }
+               }
+
+               if (param->fp_mdt_uuid) {
+                       if (check_mdt_match(param))
+                               goto obd_matches;
+                       goto decided;
+               }
+       }
+
 obd_matches:
        if (param->fp_check_uid) {
                if (st->st_uid == param->fp_uid) {
                        if (param->fp_exclude_uid)
                                goto decided;
-       } else {
+               } else {
                        if (!param->fp_exclude_uid)
                                goto decided;
-                }
-        }
+               }
+       }
 
        if (param->fp_check_gid) {
                if (st->st_gid == param->fp_gid) {
@@ -3025,33 +3156,33 @@ obd_matches:
                }
        }
 
-        if (param->check_pool) {
-                struct lov_user_md_v3 *lmmv3 = (void *)&param->lmd->lmd_lmm;
-
-                /* empty requested pool is taken as no pool search => V1 */
-                if (((param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V1) &&
-                     (param->poolname[0] == '\0')) ||
-                    ((param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
-                     (strncmp(lmmv3->lmm_pool_name,
-                              param->poolname, LOV_MAXPOOLNAME) == 0)) ||
-                    ((param->lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
-                     (strcmp(param->poolname, "*") == 0))) {
-                        if (param->exclude_pool)
-                                goto decided;
-                } else {
-                        if (!param->exclude_pool)
-                                goto decided;
-                }
-        }
+       if (param->fp_check_pool) {
+               struct lov_user_md_v3 *lmmv3 = (void *)&param->fp_lmd->lmd_lmm;
+
+               /* empty requested pool is taken as no pool search => V1 */
+               if (((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V1) &&
+                    (param->fp_poolname[0] == '\0')) ||
+                   ((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
+                    (strncmp(lmmv3->lmm_pool_name,
+                             param->fp_poolname, LOV_MAXPOOLNAME) == 0)) ||
+                   ((param->fp_lmd->lmd_lmm.lmm_magic == LOV_USER_MAGIC_V3) &&
+                    (strcmp(param->fp_poolname, "*") == 0))) {
+                       if (param->fp_exclude_pool)
+                               goto decided;
+               } else {
+                       if (!param->fp_exclude_pool)
+                               goto decided;
+               }
+       }
 
        /* Check the time on mds. */
        decision = 1;
        if (param->fp_atime || param->fp_mtime || param->fp_ctime) {
                 int for_mds;
 
-                for_mds = lustre_fs ? (S_ISREG(st->st_mode) &&
-                                       param->lmd->lmd_lmm.lmm_stripe_count)
-                                    : 0;
+               for_mds = lustre_fs ? (S_ISREG(st->st_mode) &&
+                                      param->fp_lmd->lmd_lmm.lmm_stripe_count)
+                       : 0;
                 decision = find_time_check(st, param, for_mds);
                 if (decision == -1)
                         goto decided;
@@ -3061,30 +3192,30 @@ obd_matches:
            The regular stat is almost of the same speed as some new
            'glimpse-size-ioctl'. */
 
-        if (param->check_size && S_ISREG(st->st_mode) &&
-            param->lmd->lmd_lmm.lmm_stripe_count)
+       if (param->fp_check_size && S_ISREG(st->st_mode) &&
+           param->fp_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);
+                       param->fp_lmd->lmd_lmm.lmm_stripe_count) ||
+                       param->fp_mdt_index != OBD_NOT_FOUND);
 
-                if (param->obdindex != OBD_NOT_FOUND)
+               if (param->fp_obd_index != OBD_NOT_FOUND)
                         print_failed_tgt(param, path, LL_STATFS_LOV);
 
-                if (param->mdtindex != OBD_NOT_FOUND)
+               if (param->fp_mdt_index != OBD_NOT_FOUND)
                         print_failed_tgt(param, path, LL_STATFS_LMV);
 
-                if (dir) {
-                        ret = ioctl(dirfd(dir), IOC_LOV_GETINFO,
-                                    (void *)param->lmd);
-                } else if (parent) {
-                        ret = ioctl(dirfd(parent), IOC_LOV_GETINFO,
-                                    (void *)param->lmd);
-                }
+               if (dir) {
+                       ret = ioctl(dirfd(dir), IOC_LOV_GETINFO,
+                                   (void *)param->fp_lmd);
+               } else if (parent) {
+                       ret = ioctl(dirfd(parent), IOC_LOV_GETINFO,
+                                   (void *)param->fp_lmd);
+               }
 
                 if (ret) {
                         if (errno == ENOENT) {
@@ -3109,14 +3240,15 @@ obd_matches:
                 break;
         }
 
-        if (param->check_size)
-                decision = find_value_cmp(st->st_size, param->size,
-                                          param->size_sign, param->exclude_size,
-                                          param->size_units, 0);
+       if (param->fp_check_size)
+               decision = find_value_cmp(st->st_size, param->fp_size,
+                                         param->fp_size_sign,
+                                         param->fp_exclude_size,
+                                         param->fp_size_units, 0);
 
         if (decision != -1) {
                 llapi_printf(LLAPI_MSG_NORMAL, "%s", path);
-                if (param->zeroend)
+               if (param->fp_zero_end)
                         llapi_printf(LLAPI_MSG_NORMAL, "%c", '\0');
                 else
                         llapi_printf(LLAPI_MSG_NORMAL, "\n");
@@ -3154,7 +3286,7 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp,
                        *dirp = NULL;
                        ret = -errno;
                        llapi_error(LLAPI_MSG_ERROR, ret,
-                                   "can not open %s\n", path);
+                                   "can not open %s", path);
                        return ret;
                }
        }
@@ -3164,8 +3296,8 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp,
        filename = basename(path);
        data.ioc_inlbuf1 = (char *)filename;
        data.ioc_inllen1 = strlen(filename) + 1;
-       data.ioc_inlbuf2 = (char *)&param->mdtindex;
-       data.ioc_inllen2 = sizeof(param->mdtindex);
+       data.ioc_inlbuf2 = (char *)&param->fp_mdt_index;
+       data.ioc_inllen2 = sizeof(param->fp_mdt_index);
        ret = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
        if (ret != 0) {
                llapi_error(LLAPI_MSG_ERROR, ret,
@@ -3178,8 +3310,9 @@ static int cb_mv_init(char *path, DIR *parent, DIR **dirp,
                ret = -errno;
                fprintf(stderr, "%s migrate failed %d\n", path, ret);
                goto out;
-       } else if (param->verbose & VERBOSE_DETAIL) {
-               fprintf(stdout, "migrate %s to MDT%d\n", path, param->mdtindex);
+       } else if (param->fp_verbose & VERBOSE_DETAIL) {
+               fprintf(stdout, "migrate %s to MDT%d\n",
+                       path, param->fp_mdt_index);
        }
 
 out:
@@ -3252,7 +3385,7 @@ static int cb_get_mdt_index(char *path, DIR *parent, DIR **dirp, void *data,
 
         if (ret) {
                 if (ret == -ENODATA) {
-                        if (!param->obduuid)
+                       if (!param->fp_obd_uuid)
                                 llapi_printf(LLAPI_MSG_NORMAL,
                                              "%s has no stripe info\n", path);
                         goto out;
@@ -3277,7 +3410,7 @@ static int cb_get_mdt_index(char *path, DIR *parent, DIR **dirp, void *data,
         * 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))
+       if (param->fp_quiet || !(param->fp_verbose & VERBOSE_DETAIL))
                /* coverity[uninit_use_in_call] */
                 llapi_printf(LLAPI_MSG_NORMAL, "%d\n", mdtidx);
         else
@@ -3304,29 +3437,32 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
 
         LASSERT(parent != NULL || d != NULL);
 
-        if (param->obduuid) {
-                param->quiet = 1;
+       if (param->fp_obd_uuid) {
+               param->fp_quiet = 1;
                 ret = setup_obd_uuid(d ? d : parent, path, param);
                 if (ret)
                         return ret;
         }
 
        if (d) {
-               if (param->get_lmv || param->get_default_lmv) {
+               if (param->fp_get_lmv || param->fp_get_default_lmv) {
                        ret = cb_get_dirstripe(path, d, param);
                } else {
                        ret = ioctl(dirfd(d), LL_IOC_LOV_GETSTRIPE,
-                                    (void *)&param->lmd->lmd_lmm);
+                                    (void *)&param->fp_lmd->lmd_lmm);
                }
 
-       } else if (parent && !param->get_lmv && !param->get_default_lmv) {
+       } else if (parent && !param->fp_get_lmv && !param->fp_get_default_lmv) {
                char *fname = strrchr(path, '/');
                fname = (fname == NULL ? path : fname + 1);
 
-               strlcpy((char *)&param->lmd->lmd_lmm, fname, param->lumlen);
+               strlcpy((char *)&param->fp_lmd->lmd_lmm, fname,
+                       param->fp_lum_size);
 
                ret = ioctl(dirfd(parent), IOC_MDC_GETFILESTRIPE,
-                           (void *)&param->lmd->lmd_lmm);
+                           (void *)&param->fp_lmd->lmd_lmm);
+       } else {
+               return 0;
        }
 
         if (ret) {
@@ -3337,14 +3473,14 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
                         * a check later on in the code path.
                         * The object_seq needs to be set for the "(Default)"
                         * prefix to be displayed. */
-                       if (param->get_default_lmv) {
+                       if (param->fp_get_default_lmv) {
                                struct lmv_user_md *lum = param->fp_lmv_md;
 
                                lum->lum_magic = LMV_USER_MAGIC;
                                lum->lum_stripe_count = 0;
                                lum->lum_stripe_offset = -1;
                                goto dump;
-                       } else if (param->get_lmv) {
+                       } else if (param->fp_get_lmv) {
                                struct lmv_user_md *lum = param->fp_lmv_md;
                                int mdtidx;
 
@@ -3356,9 +3492,11 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
                                lum->lum_stripe_offset = mdtidx;
                                goto dump;
                        } else {
-                               struct lov_user_md *lmm = &param->lmd->lmd_lmm;
+                               struct lov_user_md *lmm =
+                                       &param->fp_lmd->lmd_lmm;
+
                                lmm->lmm_magic = LOV_USER_MAGIC_V1;
-                               if (!param->raw)
+                               if (!param->fp_raw)
                                        ostid_set_seq(&lmm->lmm_oi,
                                                      FID_SEQ_LOV_DEFAULT);
                                lmm->lmm_stripe_count = 0;
@@ -3367,7 +3505,7 @@ static int cb_getstripe(char *path, DIR *parent, DIR **dirp, void *data,
                                goto dump;
                        }
                 } else if (errno == ENODATA && parent != NULL) {
-                       if (!param->obduuid && !param->mdtuuid)
+                       if (!param->fp_obd_uuid && !param->fp_mdt_uuid)
                                 llapi_printf(LLAPI_MSG_NORMAL,
                                              "%s has no stripe info\n", path);
                         goto out;
@@ -3394,7 +3532,7 @@ err_out:
         }
 
 dump:
-        if (!(param->verbose & VERBOSE_MDTINDEX))
+       if (!(param->fp_verbose & VERBOSE_MDTINDEX))
                 llapi_lov_dump_user_lmm(param, path, d ? 1 : 0);
 
 out:
@@ -3409,7 +3547,7 @@ out:
 
 int llapi_getstripe(char *path, struct find_param *param)
 {
-        return param_callback(path, (param->verbose & VERBOSE_MDTINDEX) ?
+       return param_callback(path, (param->fp_verbose & VERBOSE_MDTINDEX) ?
                               cb_get_mdt_index : cb_getstripe,
                               cb_common_fini, param);
 }
@@ -3643,10 +3781,10 @@ static int cb_quotachown(char *path, DIR *parent, DIR **dirp, void *data,
 
         LASSERT(parent != NULL || d != NULL);
 
-        rc = get_lmd_info(path, parent, d, param->lmd, param->lumlen);
+       rc = get_lmd_info(path, parent, d, param->fp_lmd, param->fp_lum_size);
         if (rc) {
                 if (rc == -ENODATA) {
-                        if (!param->obduuid && !param->quiet)
+                       if (!param->fp_obd_uuid && !param->fp_quiet)
                                 llapi_error(LLAPI_MSG_ERROR, -ENODATA,
                                           "%s has no stripe info", path);
                         rc = 0;
@@ -3656,7 +3794,7 @@ static int cb_quotachown(char *path, DIR *parent, DIR **dirp, void *data,
                 return rc;
         }
 
-        st = &param->lmd->lmd_st;
+       st = &param->fp_lmd->lmd_st;
 
         /* libc chown() will do extra check, and if the real owner is
          * the same as the ones to set, it won't fall into kernel, so
@@ -3681,9 +3819,9 @@ 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;
+       param.fp_recursive = 1;
+       param.fp_verbose = 0;
+       param.fp_quiet = 1;
 
         return param_callback(path, cb_quotachown, NULL, &param);
 }
@@ -3721,7 +3859,7 @@ static int rmtacl_notify(int ops)
                 if (fd < 0) {
                         rc = -errno;
                         llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "Can't open '%s'\n", mnt->mnt_dir);
+                                   "Can't open '%s'", mnt->mnt_dir);
                        goto out;
                 }
 
@@ -3730,7 +3868,7 @@ static int rmtacl_notify(int ops)
                 if (rc < 0) {
                         rc = -errno;
                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                   "ioctl RMTACL on '%s' err %d\n",
+                                   "ioctl RMTACL on '%s' err %d",
                                    mnt->mnt_dir, rc);
                        goto out;
                 }
@@ -3895,14 +4033,14 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
         if (output_func) {
                 if (pipe(fd) < 0) {
                         rc = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe\n");
+                       llapi_error(LLAPI_MSG_ERROR, rc, "Can't create pipe");
                         return rc;
                 }
 
                 pid = fork();
                 if (pid < 0) {
                         rc = -errno;
-                        llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork\n");
+                       llapi_error(LLAPI_MSG_ERROR, rc, "Can't fork");
                         close(fd[0]);
                         close(fd[1]);
                         return rc;
@@ -3913,7 +4051,7 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
                         if (dup2(fd[1], 1) < 0) {
                                 rc = -errno;
                                 llapi_error(LLAPI_MSG_ERROR, rc,
-                                            "Can't dup2 %d\n", fd[1]);
+                                           "Can't dup2 %d", fd[1]);
                                 close(fd[1]);
                                 return rc;
                         }
@@ -3934,7 +4072,7 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
         fp = fdopen(fd[0], "r");
         if (fp == NULL) {
                 rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed\n", fd[0]);
+               llapi_error(LLAPI_MSG_ERROR, rc, "fdopen %d failed", fd[0]);
                 kill(pid, SIGKILL);
                 close(fd[0]);
                 return rc;
@@ -3950,7 +4088,7 @@ static int do_rmtacl(int argc, char *argv[], int ops, int (output_func)(char *))
 
         if (waitpid(pid, &status, 0) < 0) {
                 rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed\n", pid);
+               llapi_error(LLAPI_MSG_ERROR, rc, "waitpid %d failed", pid);
                 return rc;
         }
 
@@ -4095,9 +4233,9 @@ static int changelog_ioctl(const char *mdtname, int opc, int id,
 
 #define CHANGELOG_PRIV_MAGIC 0xCA8E1080
 struct changelog_private {
-        int magic;
-        int flags;
-        lustre_kernelcomm kuc;
+       int                             magic;
+       enum changelog_send_flag        flags;
+       lustre_kernelcomm               kuc;
 };
 
 /** Start reading from a changelog
@@ -4107,44 +4245,53 @@ struct changelog_private {
  * @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)
+int llapi_changelog_start(void **priv, enum changelog_send_flag flags,
+                         const char *device, long long startrec)
 {
-        struct changelog_private *cp;
-        int rc;
+       struct changelog_private        *cp;
+       static bool                      warned;
+       int                              rc;
 
-        /* Set up the receiver control struct */
-        cp = calloc(1, sizeof(*cp));
-        if (cp == NULL)
-                return -ENOMEM;
+       /* Set up the receiver control struct */
+       cp = calloc(1, sizeof(*cp));
+       if (cp == NULL)
+               return -ENOMEM;
 
-        cp->magic = CHANGELOG_PRIV_MAGIC;
-        cp->flags = flags;
+       cp->magic = CHANGELOG_PRIV_MAGIC;
+       cp->flags = flags;
 
-        /* Set up the receiver */
-        rc = libcfs_ukuc_start(&cp->kuc, 0 /* no group registration */);
-        if (rc < 0)
-                goto out_free;
+       /* Set up the receiver */
+       rc = libcfs_ukuc_start(&cp->kuc, 0 /* no group registration */, 0);
+       if (rc < 0)
+               goto out_free;
 
-        *priv = cp;
+       *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 = LK_NOFD;
-        if (rc < 0) {
-                /* frees and clears priv */
-                llapi_changelog_fini(priv);
-                return rc;
-        }
+       /* CHANGELOG_FLAG_JOBID will eventually become mandatory. Display a
+        * warning if it's missing. */
+       if (!(flags & CHANGELOG_FLAG_JOBID) && !warned) {
+               llapi_err_noerrno(LLAPI_MSG_WARN, "warning: %s() called "
+                                 "w/o CHANGELOG_FLAG_JOBID", __func__);
+               warned = true;
+       }
 
-        return 0;
+       /* Tell the kernel to start sending */
+       rc = changelog_ioctl(device, OBD_IOC_CHANGELOG_SEND, cp->kuc.lk_wfd,
+                            startrec, flags);
+       /* Only the kernel reference keeps the write side open */
+       close(cp->kuc.lk_wfd);
+       cp->kuc.lk_wfd = LK_NOFD;
+       if (rc < 0) {
+               /* frees and clears priv */
+               llapi_changelog_fini(priv);
+               return rc;
+       }
+
+       return 0;
 
 out_free:
-        free(cp);
-        return rc;
+       free(cp);
+       return rc;
 }
 
 /** Finish reading from a changelog */
@@ -4161,24 +4308,15 @@ 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.
+/**
+ * Convert all records to a same format according to the caller's wishes.
+ * Default is CLF_VERSION | CLF_RENAME.
+ * Add CLF_JOBID if explicitely requested.
+ *
+ * \param rec  The record to remap. It is expected to be big enough to
+ *             properly handle the final format.
+ * \return 1 if anything changed. 0 otherwise.
  */
-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
@@ -4186,11 +4324,13 @@ static inline int changelog_extend_rec(struct changelog_ext_rec *ext)
  *         <0 error code
  *         1 EOF
  */
-int llapi_changelog_recv(void *priv, struct changelog_ext_rec **rech)
+#define DEFAULT_RECORD_FMT     (CLF_VERSION | CLF_RENAME)
+int llapi_changelog_recv(void *priv, struct changelog_rec **rech)
 {
-       struct changelog_private *cp = (struct changelog_private *)priv;
-       struct kuc_hdr *kuch;
-       int rc = 0;
+       struct changelog_private        *cp = (struct changelog_private *)priv;
+       struct kuc_hdr                  *kuch;
+       enum changelog_rec_flags         rec_fmt = DEFAULT_RECORD_FMT;
+       int                              rc = 0;
 
        if (!cp || (cp->magic != CHANGELOG_PRIV_MAGIC))
                return -EINVAL;
@@ -4200,6 +4340,9 @@ int llapi_changelog_recv(void *priv, struct changelog_ext_rec **rech)
        if (kuch == NULL)
                return -ENOMEM;
 
+       if (cp->flags & CHANGELOG_FLAG_JOBID)
+               rec_fmt |= CLF_JOBID;
+
 repeat:
        rc = libcfs_ukuc_msg_get(&cp->kuc, (char *)kuch,
                                 KUC_CHANGELOG_MSG_MAXSIZE,
@@ -4227,11 +4370,10 @@ repeat:
                 }
         }
 
-       /* 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);
+       /* Our message is a changelog_rec.  Use pointer math to skip
+        * kuch_hdr and point directly to the message payload. */
+       *rech = (struct changelog_rec *)(kuch + 1);
+       changelog_remap_rec(*rech, rec_fmt);
 
         return 0;
 
@@ -4242,7 +4384,7 @@ out_free:
 }
 
 /** Release the changelog record when done with it. */
-int llapi_changelog_free(struct changelog_ext_rec **rech)
+int llapi_changelog_free(struct changelog_rec **rech)
 {
         if (*rech) {
                 /* We allocated memory starting at the kuc_hdr, but passed
@@ -4342,6 +4484,20 @@ static int fid_from_lma(const char *path, const int fd, lustre_fid *fid)
        return 0;
 }
 
+int llapi_get_mdt_index_by_fid(int fd, const lustre_fid *fid,
+                              int *mdt_index)
+{
+       int     rc;
+
+       rc = ioctl(fd, LL_IOC_FID2MDTIDX, fid);
+       if (rc < 0)
+               return -errno;
+
+       *mdt_index = rc;
+
+       return rc;
+}
+
 int llapi_fd2fid(const int fd, lustre_fid *fid)
 {
        int rc;
@@ -4375,6 +4531,50 @@ int llapi_path2fid(const char *path, lustre_fid *fid)
        return rc;
 }
 
+int llapi_fd2parent(int fd, unsigned int linkno, lustre_fid *parent_fid,
+                   char *name, size_t name_size)
+{
+       struct getparent        *gp;
+       int                      rc;
+
+       gp = malloc(sizeof(*gp) + name_size);
+       if (gp == NULL)
+               return -ENOMEM;
+
+       gp->gp_linkno = linkno;
+       gp->gp_name_size = name_size;
+
+       rc = ioctl(fd, LL_IOC_GETPARENT, gp);
+       if (rc < 0) {
+               rc = -errno;
+               goto err_free;
+       }
+
+       *parent_fid = gp->gp_fid;
+
+       strncpy(name, gp->gp_name, name_size);
+       name[name_size - 1] = '\0';
+
+err_free:
+       free(gp);
+       return rc;
+}
+
+int llapi_path2parent(const char *path, unsigned int linkno,
+                     lustre_fid *parent_fid, char *name, size_t name_size)
+{
+       int     fd;
+       int     rc;
+
+       fd = open(path, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
+       if (fd < 0)
+               return -errno;
+
+       rc = llapi_fd2parent(fd, linkno, parent_fid, name, name_size);
+       close(fd);
+       return rc;
+}
+
 int llapi_get_connect_flags(const char *mnt, __u64 *flags)
 {
         DIR *root;
@@ -4483,29 +4683,16 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
        char    file_path[PATH_MAX];
        char    filename[PATH_MAX];
        int     fd;
-       int     random;
+       int     rnumber;
        int     rc;
 
-       fd = open("/dev/urandom", O_RDONLY);
-       if (fd < 0) {
-               llapi_error(LLAPI_MSG_ERROR, errno,
-                           "Cannot open /dev/urandom\n");
-               return -errno;
-       }
-       rc = read(fd, &random, sizeof(random));
-       close(fd);
-       if (rc < sizeof(random)) {
-               llapi_error(LLAPI_MSG_ERROR, errno,
-                           "cannot read %zu bytes from /dev/urandom",
-                           sizeof(random));
-               return -errno;
-       }
+       rnumber = random();
        if (idx == -1)
                snprintf(filename, sizeof(filename),
-                        LUSTRE_VOLATILE_HDR"::%.4X", random);
+                        LUSTRE_VOLATILE_HDR"::%.4X", rnumber);
        else
                snprintf(filename, sizeof(filename),
-                        LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, random);
+                        LUSTRE_VOLATILE_HDR":%.4X:%.4X", idx, rnumber);
 
        rc = snprintf(file_path, sizeof(file_path),
                      "%s/%s", directory, filename);
@@ -4515,7 +4702,7 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
        fd = open(file_path, O_RDWR | O_CREAT | open_flags, S_IRUSR | S_IWUSR);
        if (fd < 0) {
                llapi_error(LLAPI_MSG_ERROR, errno,
-                           "Cannot create volatile file '%s' in '%s'\n",
+                           "Cannot create volatile file '%s' in '%s'",
                            filename + LUSTRE_VOLATILE_HDR_LEN,
                            directory);
                return -errno;
@@ -4536,13 +4723,16 @@ int llapi_create_volatile_idx(char *directory, int idx, int open_flags)
  */
 int llapi_fswap_layouts(int fd1, int fd2, __u64 dv1, __u64 dv2, __u64 flags)
 {
-       struct lustre_swap_layouts lsl;
-       int rc;
+       struct lustre_swap_layouts      lsl;
+       int                             rc;
 
-       srandom(time(NULL));
        lsl.sl_fd = fd2;
        lsl.sl_flags = flags;
-       lsl.sl_gid = random();
+
+       do
+               lsl.sl_gid = random();
+       while (lsl.sl_gid == 0);
+
        lsl.sl_dv1 = dv1;
        lsl.sl_dv2 = dv2;
        rc = ioctl(fd1, LL_IOC_LOV_SWAP_LAYOUTS, &lsl);
@@ -4579,7 +4769,7 @@ int llapi_swap_layouts(const char *path1, const char *path2,
        rc = llapi_fswap_layouts(fd1, fd2, dv1, dv2, flags);
        if (rc < 0)
                llapi_error(LLAPI_MSG_ERROR, rc,
-                           "error: cannot swap layout between '%s' and '%s'\n",
+                           "error: cannot swap layout between '%s' and '%s'",
                            path1, path2);
 
        close(fd2);
@@ -4588,3 +4778,70 @@ out_close:
 out:
        return rc;
 }
+
+/**
+ * Attempt to open a file with Lustre file identifier \a fid
+ * and return an open file descriptor.
+ *
+ * \param[in] lustre_dir       path within Lustre filesystem containing \a fid
+ * \param[in] fid              Lustre file identifier of file to open
+ * \param[in] flags            open() flags
+ *
+ * \retval                     non-negative file descriptor on successful open
+ * \retval                     -1 if an error occurred
+ */
+int llapi_open_by_fid(const char *lustre_dir, const lustre_fid *fid, int flags)
+{
+       char mntdir[PATH_MAX];
+       char path[PATH_MAX];
+       int rc;
+
+       rc = llapi_search_mounts(lustre_dir, 0, mntdir, NULL);
+       if (rc != 0)
+               return -1;
+
+       snprintf(path, sizeof(path), "%s/.lustre/fid/"DFID, mntdir, PFID(fid));
+       return open(path, flags);
+}
+
+/**
+ * Take group lock.
+ *
+ * \param fd   File to lock.
+ * \param gid  Group Identifier.
+ *
+ * \retval 0 on success.
+ * \retval -errno on failure.
+ */
+int llapi_group_lock(int fd, int gid)
+{
+       int rc;
+
+       rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid);
+       if (rc < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "cannot get group lock");
+       }
+       return rc;
+}
+
+/**
+ * Put group lock.
+ *
+ * \param fd   File to unlock.
+ * \param gid  Group Identifier.
+ *
+ * \retval 0 on success.
+ * \retval -errno on failure.
+ */
+int llapi_group_unlock(int fd, int gid)
+{
+       int rc;
+
+       rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid);
+       if (rc < 0) {
+               rc = -errno;
+               llapi_error(LLAPI_MSG_ERROR, rc, "cannot put group lock");
+       }
+       return rc;
+}