Whamcloud - gitweb
LU-6210 utils: Use C99 initializer in jt_nodemap_modify()
[fs/lustre-release.git] / lustre / utils / obd.c
index f8c3053..f029e92 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -52,7 +48,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <glob.h>
+#include <getopt.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "obdctl.h"
+#include "lustreapi_internal.h"
+#include <libcfs/util/list.h>
+#include <libcfs/util/ioctl.h>
+#include <libcfs/util/param.h>
+#include <libcfs/util/parser.h>
+#include <libcfs/util/string.h>
+
+#include <lnet/nidstr.h>
+#include <linux/lustre_ostid.h>
+#include <linux/lustre_cfg.h>
+#include <linux/lustre_ioctl.h>
+#include <lustre_ver.h>
 
-#include <obd.h>          /* for struct lov_stripe_md */
-#include <lustre/lustre_build_version.h>
-
-#include <obd_class.h>
 #include <lnet/lnetctl.h>
-#include <libcfs/libcfsutil.h>
-#include <lustre/liblustreapi.h>
+#include <lustre/lustreapi.h>
+#include <linux/lustre_param.h>
+#include <lustre/lustre_barrier_user.h>
 
 #define MAX_STRING_SIZE 128
-#define DEVICES_LIST "/proc/fs/lustre/devices"
 
 #if HAVE_LIBPTHREAD
 #include <sys/ipc.h>
 
 #define MAX_THREADS 4096
 #define MAX_BASE_ID 0xffffffff
+#define NIDSTRING_LENGTH 64
 struct shared_data {
-        l_mutex_t mutex;
-        l_cond_t  cond;
+       pthread_mutex_t mutex;
+       pthread_cond_t  cond;
         int       stopping;
         struct {
                 __u64 counters[MAX_THREADS];
@@ -110,13 +116,6 @@ const int nthreads = 1;
 
 static int cur_device = -1;
 
-struct lov_oinfo lov_oinfos[LOV_MAX_STRIPE_COUNT];
-
-struct lsm_buffer {
-        struct lov_stripe_md lsm;
-        struct lov_oinfo *ptrs[LOV_MAX_STRIPE_COUNT];
-} lsm_buffer;
-
 static int l2_ioctl(int dev_id, int opc, void *buf)
 {
         return l_ioctl(dev_id, opc, buf);
@@ -203,17 +202,20 @@ out:
 
 char *obdo_print(struct obdo *obd)
 {
-        char buf[1024];
-
-        sprintf(buf, "id: "LPX64"\ngrp: "LPX64"\natime: "LPU64"\nmtime: "LPU64
-                "\nctime: "LPU64"\nsize: "LPU64"\nblocks: "LPU64
-                "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n"
-                "misc: %x\nnlink: %d,\nvalid "LPX64"\n",
-                obd->o_id, obd->o_seq, obd->o_atime, obd->o_mtime, obd->o_ctime,
-                obd->o_size, obd->o_blocks, obd->o_blksize, obd->o_mode,
-                obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc,
-                obd->o_nlink, obd->o_valid);
-        return strdup(buf);
+       char buf[1024];
+
+       snprintf(buf, sizeof(buf), "id: %#jx\ngrp: %#jx\natime: %ju\n"
+                "mtime: %ju\nctime: %ju\nsize: %ju\nblocks: %ju"
+                "\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n"
+                "misc: %x\nnlink: %d,\nvalid %#jx\n",
+                (uintmax_t)ostid_id(&obd->o_oi),
+                (uintmax_t)ostid_seq(&obd->o_oi),
+                (uintmax_t)obd->o_atime, (uintmax_t)obd->o_mtime,
+                (uintmax_t)obd->o_ctime, (uintmax_t)obd->o_size,
+                (uintmax_t)obd->o_blocks, obd->o_blksize, obd->o_mode,
+                obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc,
+                obd->o_nlink, (uintmax_t)obd->o_valid);
+       return strdup(buf);
 }
 
 
@@ -234,10 +236,10 @@ static int do_name2dev(char *func, char *name)
 
         memset(buf, 0, sizeof(rawbuf));
         rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
+       if (rc < 0) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(func));
-                return rc;
+               return -rc;
         }
         rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
         if (rc < 0)
@@ -280,74 +282,6 @@ int parse_devname(char *func, char *name)
         return ret;
 }
 
-static void
-reset_lsmb (struct lsm_buffer *lsmb)
-{
-        memset (&lsmb->lsm, 0, sizeof (lsmb->lsm));
-        memset(lov_oinfos, 0, sizeof(lov_oinfos));
-        lsmb->lsm.lsm_magic = LOV_MAGIC;
-}
-
-static int
-parse_lsm (struct lsm_buffer *lsmb, char *string)
-{
-        struct lov_stripe_md *lsm = &lsmb->lsm;
-        char                 *end;
-        int                   i;
-
-        /*
-         * object_id[=size#count[@offset:id]*]
-         */
-
-        reset_lsmb (lsmb);
-
-        lsm->lsm_object_id = strtoull (string, &end, 0);
-        if (end == string)
-                return (-1);
-        string = end;
-
-        if (*string == 0)
-                return (0);
-
-        if (*string != '=')
-                return (-1);
-        string++;
-
-        lsm->lsm_stripe_size = strtoul (string, &end, 0);
-        if (end == string)
-                return (-1);
-        string = end;
-
-        if (*string != '#')
-                return (-1);
-        string++;
-
-        lsm->lsm_stripe_count = strtoul (string, &end, 0);
-        if (end == string)
-                return (-1);
-        string = end;
-
-        if (*string == 0)               /* don't have to specify obj ids */
-                return (0);
-
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                if (*string != '@')
-                        return (-1);
-                string++;
-                lsm->lsm_oinfo[i]->loi_ost_idx = strtoul(string, &end, 0);
-                if (*end != ':')
-                        return (-1);
-                string = end + 1;
-                lsm->lsm_oinfo[i]->loi_id = strtoull(string, &end, 0);
-                string = end;
-        }
-
-        if (*string != 0)
-                return (-1);
-
-        return (0);
-}
-
 char *jt_cmdname(char *func)
 {
         static char buf[512];
@@ -473,42 +407,42 @@ static int shmem_setup(void)
         rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
         if (rc != 0) {
                 fprintf(stderr, "Can't set shared mutex attr\n");
-                return rc;
+               goto out;
         }
 
         rc = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
         if (rc != 0) {
                 fprintf(stderr, "Can't set shared cond attr\n");
-                return rc;
+               goto out;
         }
 
         pthread_mutex_init(&shared_data->mutex, &mattr);
         pthread_cond_init(&shared_data->cond, &cattr);
-
+out:
         pthread_mutexattr_destroy(&mattr);
         pthread_condattr_destroy(&cattr);
 
-        return 0;
+       return rc;
 }
 
 static inline void shmem_lock(void)
 {
-        l_mutex_lock(&shared_data->mutex);
+       pthread_mutex_lock(&shared_data->mutex);
 }
 
 static inline void shmem_unlock(void)
 {
-        l_mutex_unlock(&shared_data->mutex);
+       pthread_mutex_unlock(&shared_data->mutex);
 }
 
 static inline void shmem_wait(void)
 {
-        l_cond_wait(&shared_data->cond, &shared_data->mutex);
+       pthread_cond_wait(&shared_data->cond, &shared_data->mutex);
 }
 
 static inline void shmem_wakeup_all(void)
 {
-        l_cond_broadcast(&shared_data->cond);
+       pthread_cond_broadcast(&shared_data->cond);
 }
 
 static inline void shmem_reset(int total_threads)
@@ -557,8 +491,8 @@ static void shmem_total(int total_threads)
                         &shared_data->body.start_time);
         shmem_unlock();
 
-        printf("Total: total "LPU64" threads %d sec %f %f/second\n",
-               total, total_threads, secs, total / secs);
+       printf("Total: total %ju threads %d sec %f %f/second\n",
+              (uintmax_t)total, total_threads, secs, total / secs);
 
         return;
 }
@@ -992,72 +926,69 @@ int jt_obd_abort_recovery(int argc, char **argv)
 
 int jt_get_version(int argc, char **argv)
 {
-        int rc;
-        char rawbuf[MAX_IOC_BUFLEN];
-        char *version;
+       char version[128];
+       int rc;
 
-        if (argc != 1)
-                return CMD_HELP;
+       if (argc != 1)
+               return CMD_HELP;
 
-        rc = llapi_get_version(rawbuf, MAX_IOC_BUFLEN, &version);
-        if (rc)
-                fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
-                        strerror(-rc));
-        else
-                printf("Lustre version: %s\n", version);
+       rc = llapi_get_version_string(version, sizeof(version));
+       if (rc)
+               printf("Lustre version: %s\n", LUSTRE_VERSION_STRING);
+       else
+               printf("Lustre version: %s\n", version);
 
-        printf("lctl   version: %s\n", BUILD_VERSION);
-        return rc;
+       return 0;
 }
 
-/*
- * Print an obd device line with the ost_conn_uuid inserted, if the obd
- * is an osc.
- */
 static void print_obd_line(char *s)
 {
-        char buf[MAX_STRING_SIZE];
-        char obd_name[MAX_OBD_NAME];
-        FILE *fp = NULL;
-        char *ptr;
-
-        if (sscanf(s, " %*d %*s osc %s %*s %*d ", obd_name) == 0)
-                goto try_mdc;
-        snprintf(buf, sizeof(buf),
-                 "/proc/fs/lustre/osc/%s/ost_conn_uuid", obd_name);
-        if ((fp = fopen(buf, "r")) == NULL)
-                goto try_mdc;
-        goto got_one;
-
+       const char *param = "osc/%s/ost_conn_uuid";
+       char buf[MAX_STRING_SIZE];
+       char obd_name[MAX_OBD_NAME];
+       FILE *fp = NULL;
+       glob_t path;
+       char *ptr;
+retry:
+       /* obd device type is the first 3 characters of param name */
+       snprintf(buf, sizeof(buf), " %%*d %%*s %.3s %%%zus %%*s %%*d ",
+                param, sizeof(obd_name) - 1);
+       if (sscanf(s, buf, obd_name) == 0)
+               goto try_mdc;
+       if (cfs_get_param_paths(&path, param, obd_name) != 0)
+               goto try_mdc;
+       fp = fopen(path.gl_pathv[0], "r");
+       if (fp == NULL) {
+               /* need to free path data before retry */
+               cfs_free_param_data(&path);
 try_mdc:
-        if (sscanf(s, " %*d %*s mdc %s %*s %*d ", obd_name) == 0)
-                goto fail;
-        snprintf(buf, sizeof(buf),
-                 "/proc/fs/lustre/mdc/%s/mds_conn_uuid", obd_name);
-        if ((fp = fopen(buf, "r")) == NULL)
-                goto fail;
-
-got_one:
-        /* should not ignore fgets(3)'s return value */
-        if (!fgets(buf, sizeof(buf), fp)) {
-                fprintf(stderr, "reading from %s: %s", buf, strerror(errno));
-                fclose(fp);
-                return;
-        }
-        fclose(fp);
-
-        /* trim trailing newlines */
-        ptr = strrchr(buf, '\n');
-        if (ptr) *ptr = '\0';
-        ptr = strrchr(s, '\n');
-        if (ptr) *ptr = '\0';
-
-        printf("%s %s\n", s, buf);
-        return;
-
-fail:
-        printf("%s", s);
-        return;
+               if (param[0] == 'o') { /* failed with osc, try mdc */
+                       param = "mdc/%s/mds_conn_uuid";
+                       goto retry;
+               }
+               buf[0] = '\0';
+               goto fail_print;
+       }
+
+       /* should not ignore fgets(3)'s return value */
+       if (!fgets(buf, sizeof(buf), fp)) {
+               fprintf(stderr, "reading from %s: %s", buf, strerror(errno));
+               goto fail_close;
+       }
+
+fail_close:
+       fclose(fp);
+       cfs_free_param_data(&path);
+
+       /* trim trailing newlines */
+       ptr = strrchr(buf, '\n');
+       if (ptr)
+               *ptr = '\0';
+fail_print:
+       ptr = strrchr(s, '\n');
+       if (ptr)
+               *ptr = '\0';
+       printf("%s%s%s\n", s, buf[0] ? " " : "", buf);
 }
 
 /* get device list by ioctl */
@@ -1100,10 +1031,10 @@ int jt_obd_list_ioctl(int argc, char **argv)
 
 int jt_obd_list(int argc, char **argv)
 {
-        int rc;
-        char buf[MAX_STRING_SIZE];
-        FILE *fp = NULL;
-        int print_obd = 0;
+       char buf[MAX_STRING_SIZE];
+       int print_obd = 0;
+       glob_t path;
+       FILE *fp;
 
         if (argc > 2)
                 return CMD_HELP;
@@ -1114,10 +1045,14 @@ int jt_obd_list(int argc, char **argv)
                         return CMD_HELP;
         }
 
-        fp = fopen(DEVICES_LIST, "r");
+       if (cfs_get_param_paths(&path, "devices") != 0)
+               return -errno;
+
+       fp = fopen(path.gl_pathv[0], "r");
         if (fp == NULL) {
-                fprintf(stderr, "error: %s: %s opening "DEVICES_LIST"\n",
-                        jt_cmdname(argv[0]), strerror(rc =  errno));
+               fprintf(stderr, "error: %s: %s opening %s\n",
+                       jt_cmdname(argv[0]), strerror(errno), path.gl_pathv[0]);
+               cfs_free_param_data(&path);
                 return jt_obd_list_ioctl(argc, argv);
         }
 
@@ -1127,14 +1062,15 @@ int jt_obd_list(int argc, char **argv)
                 else
                         printf("%s", buf);
 
+       cfs_free_param_data(&path);
         fclose(fp);
         return 0;
 }
 
 struct jt_fid_space {
-        obd_seq jt_seq;
-        obd_id  jt_id;
-        int     jt_width;
+       __u64   jt_seq;
+       __u64   jt_id;
+       int     jt_width;
 };
 
 int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid,
@@ -1179,7 +1115,9 @@ int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid,
         fid->f_oid = space->jt_id;
         fid->f_ver = 0;
 
-        space->jt_id = min(space->jt_id + *count, space->jt_width);
+       space->jt_id = space->jt_id + *count;
+       if (space->jt_id > space->jt_width)
+               space->jt_id = space->jt_width;
 
         *count = space->jt_id - fid->f_oid;
         return 0;
@@ -1208,27 +1146,27 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
         __u64                  seconds = 0;
         double                 diff;
         int                    c;
-        int                    xattr_size = 0;
         __u64                  total_count = 0;
         char                  *name = NULL;
         struct jt_fid_space    fid_space = {0};
         int                    version = 0;
-        struct option          long_opts[] = {
-                {"child_base_id",     required_argument, 0, 'b'},
-                {"stripe_count",      required_argument, 0, 'c'},
-                {"parent_basedir",    required_argument, 0, 'd'},
-                {"parent_dircount",   required_argument, 0, 'D'},
-                {"stripe_index",      required_argument, 0, 'i'},
-                {"mode",              required_argument, 0, 'm'},
-                {"count",             required_argument, 0, 'n'},
-                {"time",              required_argument, 0, 't'},
-                {"version",           no_argument,       0, 'v'},
-                {"xattr_size",        required_argument, 0, 'x'},
-                {0, 0, 0, 0}
-        };
-
-        optind = 0;
-        while ((c = getopt_long(argc, argv, "b:c:d:D:m:n:t:vx:",
+       struct option long_opts[] = {
+       { .val = 'b',   .name = "child_base_id",
+                                               .has_arg = required_argument },
+       { .val = 'c',   .name = "stripe_count",
+                                               .has_arg = required_argument },
+       { .val = 'd',   .name = "parent_basedir",
+                                               .has_arg = required_argument },
+       { .val = 'D',   .name = "parent_dircount",
+                                               .has_arg = required_argument },
+       { .val = 'i',   .name = "stripe_index", .has_arg = required_argument },
+       { .val = 'm',   .name = "mode",         .has_arg = required_argument },
+       { .val = 'n',   .name = "count",        .has_arg = required_argument },
+       { .val = 't',   .name = "time",         .has_arg = required_argument },
+       { .val = 'v',   .name = "version",      .has_arg = no_argument },
+       { .name = NULL } };
+
+        while ((c = getopt_long(argc, argv, "b:c:d:D:m:n:t:v",
                                 long_opts, NULL)) >= 0) {
                 switch (c) {
                 case 'b':
@@ -1293,15 +1231,6 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
                 case 'v':
                         version = 1;
                         break;
-                case 'x':
-                        xattr_size = strtoul(optarg, &end, 0);
-                        if (*end) {
-                                fprintf(stderr, "error: %s: xattr_size '%s'\n",
-                                        jt_cmdname(argv[0]), optarg);
-                                return CMD_HELP;
-                        }
-                        SET_BUT_UNUSED(xattr_size);
-                        break;
                 default:
                         fprintf(stderr, "error: %s: option '%s' "
                                 "unrecognized\n", argv[0], argv[optind - 1]);
@@ -1375,10 +1304,11 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
                         sprintf(dirname, "%s", "/");
                         name++;
                 } else {
-                        int namelen = (unsigned long)last_lash -
-                                      (unsigned long)name;
-                        snprintf(dirname, namelen, "%s", name);
-                }
+                       int namelen = (unsigned long)last_lash -
+                                     (unsigned long)name + 1;
+                       snprintf(dirname, namelen, "%s", name);
+                       name = last_lash + 1;
+               }
 
                 data.ioc_pbuf1 = dirname;
                 data.ioc_plen1 = strlen(dirname);
@@ -1389,13 +1319,12 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
                 if (name != NULL) {
                         data.ioc_pbuf2 = name;
                         data.ioc_plen2 = strlen(name);
-                } else {
-                        if (parent_base_id > 0)
-                                sprintf(dirname, "%s%d", parent_basedir,
-                                        parent_base_id);
-                        else
-                                sprintf(dirname, "%s", parent_basedir);
                 }
+               if (parent_base_id > 0)
+                       sprintf(dirname, "%s%d", parent_basedir,
+                               parent_base_id);
+               else
+                       sprintf(dirname, "%s", parent_basedir);
                 data.ioc_pbuf1 = dirname;
                 data.ioc_plen1 = strlen(dirname);
         }
@@ -1412,9 +1341,10 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
 
         gettimeofday(&start, NULL);
         while (shmem_running()) {
-                struct lu_fid fid;
+                struct lu_fid fid = { 0 };
 
-                data.ioc_obdo2.o_id = child_base_id;
+               if (child_base_id != -1)
+                       data.ioc_obdo2.o_oi.oi.oi_id = child_base_id;
                 data.ioc_obdo2.o_mode = mode | create_mode;
                 data.ioc_obdo2.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE |
                                          OBD_MD_FLMODE | OBD_MD_FLFLAGS |
@@ -1439,8 +1369,7 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
                                 fprintf(stderr, "Allocate fids error %d.\n",rc);
                                 return rc;
                         }
-                        data.ioc_obdo1.o_seq = fid.f_seq;
-                        data.ioc_obdo1.o_id = fid.f_oid;
+                       data.ioc_obdo1.o_oi.oi_fid = fid;
                 }
 
                 child_base_id += data.ioc_count;
@@ -1524,25 +1453,19 @@ int jt_obd_test_md_getattr(int argc, char **argv)
         return jt_obd_md_common(argc, argv, ECHO_MD_GETATTR);
 }
 
-/* Create one or more objects, arg[4] may describe stripe meta-data.  If
- * not, defaults assumed.  This echo-client instance stashes the stripe
- * object ids.  Use get_stripe on this node to print full lsm and
- * set_stripe on another node to cut/paste between nodes.
- */
-/* create <count> [<file_create_mode>] [q|v|# verbosity] [striping] */
 int jt_obd_create(int argc, char **argv)
 {
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        struct obd_ioctl_data data;
-        struct timeval next_time;
-        __u64 count = 1, next_count, base_id = 0;
-        int verbose = 1, mode = 0100644, rc = 0, i, valid_lsm = 0;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct obd_ioctl_data data;
+       struct timeval next_time;
+       __u64 count = 1, next_count, base_id = 1;
+       int verbose = 1, mode = 0100644, rc = 0, i;
         char *end;
 
         memset(&data, 0, sizeof(data));
         data.ioc_dev = cur_device;
-        if (argc < 2 || argc > 5)
-                return CMD_HELP;
+       if (argc < 2 || argc > 4)
+               return CMD_HELP;
 
         count = strtoull(argv[1], &end, 0);
         if (*end) {
@@ -1568,35 +1491,25 @@ int jt_obd_create(int argc, char **argv)
                         return CMD_HELP;
         }
 
-        if (argc < 5) {
-                reset_lsmb (&lsm_buffer);       /* will set default */
-        } else {
-                rc = parse_lsm (&lsm_buffer, argv[4]);
-                if (rc != 0) {
-                        fprintf(stderr, "error: %s: invalid lsm '%s'\n",
-                                jt_cmdname(argv[0]), argv[4]);
-                        return CMD_HELP;
-                }
-                base_id = lsm_buffer.lsm.lsm_object_id;
-                valid_lsm = 1;
-        }
-
-        printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count);
+       printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count);
         gettimeofday(&next_time, NULL);
         next_time.tv_sec -= verbose;
 
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
-                data.ioc_obdo1.o_mode = mode;
-                data.ioc_obdo1.o_id = base_id;
-                data.ioc_obdo1.o_uid = 0;
-                data.ioc_obdo1.o_gid = 0;
-                data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE |
-                        OBD_MD_FLID | OBD_MD_FLUID | OBD_MD_FLGID;
-
-                if (valid_lsm) {
-                        data.ioc_plen1 = sizeof lsm_buffer;
-                        data.ioc_pbuf1 = (char *)&lsm_buffer;
-                }
+               /*
+                * base_id is 1 so we don't need to worry about it being
+                * greater than OBIF_MAX_OID
+                */
+               data.ioc_obdo1.o_oi.oi_fid.f_oid = base_id;
+               data.ioc_obdo1.o_mode = mode;
+               data.ioc_obdo1.o_uid = 0;
+               data.ioc_obdo1.o_gid = 0;
+               data.ioc_obdo1.o_projid = 0;
+               data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE |
+                                        OBD_MD_FLID | OBD_MD_FLUID |
+                                        OBD_MD_FLGID | OBD_MD_FLGROUP |
+                                        OBD_MD_FLPROJID;
 
                 memset(buf, 0, sizeof(rawbuf));
                 rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
@@ -1614,44 +1527,59 @@ int jt_obd_create(int argc, char **argv)
                         break;
                 }
                 if (!(data.ioc_obdo1.o_valid & OBD_MD_FLID)) {
-                        fprintf(stderr,"error: %s: oid not valid #%d:"LPX64"\n",
-                                jt_cmdname(argv[0]), i, data.ioc_obdo1.o_valid);
+                       fprintf(stderr, "error: %s: oid not valid #%d:%#jx\n",
+                               jt_cmdname(argv[0]), i,
+                               (uintmax_t)data.ioc_obdo1.o_valid);
                         rc = EINVAL;
                         break;
                 }
 
-                if (be_verbose(verbose, &next_time, i, &next_count, count))
-                        printf("%s: #%d is object id "LPX64"\n",
-                                jt_cmdname(argv[0]), i, data.ioc_obdo1.o_id);
+               if (be_verbose(verbose, &next_time, i, &next_count, count))
+                       printf("%s: #%d is object id %#jx\n",
+                              jt_cmdname(argv[0]), i,
+                              (uintmax_t) ostid_id(&data.ioc_obdo1.o_oi));
         }
         return rc;
 }
 
 int jt_obd_setattr(int argc, char **argv)
 {
-        struct obd_ioctl_data data;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        char *end;
-        int rc;
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       __u64 objid;
+       char *end;
+       int mode;
+       int rc;
 
         memset(&data, 0, sizeof(data));
         data.ioc_dev = cur_device;
         if (argc != 2)
                 return CMD_HELP;
 
-        data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0);
-        if (*end) {
+       objid = strtoull(argv[1], &end, 0);
+       if (*end) {
+               fprintf(stderr, "error: %s: objid '%s' is not a number\n",
+                       jt_cmdname(argv[0]), argv[1]);
+               return CMD_HELP;
+       }
+
+       if (objid >= OBIF_MAX_OID) {
                 fprintf(stderr, "error: %s: invalid objid '%s'\n",
                         jt_cmdname(argv[0]), argv[1]);
                 return CMD_HELP;
         }
-        data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], &end, 0);
+
+       mode = strtoul(argv[2], &end, 0);
         if (*end) {
                 fprintf(stderr, "error: %s: invalid mode '%s'\n",
                         jt_cmdname(argv[0]), argv[2]);
                 return CMD_HELP;
         }
-        data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
+
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
+       data.ioc_obdo1.o_mode = S_IFREG | mode;
+       data.ioc_obdo1.o_oi.oi_fid.f_oid = objid;
+       data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
 
         memset(buf, 0, sizeof(rawbuf));
         rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
@@ -1672,10 +1600,10 @@ int jt_obd_test_setattr(int argc, char **argv)
 {
         struct obd_ioctl_data data;
         struct timeval start, next_time;
-        __u64 i, count, next_count;
+       __u64 i, count, next_count;
         char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int verbose = 1;
-        obd_id objid = 3;
+       __u64 objid = 3;
         char *end;
         int rc = 0;
 
@@ -1715,11 +1643,19 @@ int jt_obd_test_setattr(int argc, char **argv)
         next_time.tv_sec = start.tv_sec - verbose;
         next_time.tv_usec = start.tv_usec;
         if (verbose != 0)
-                printf("%s: setting "LPD64" attrs (objid "LPX64"): %s",
-                       jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec));
+               printf("%s: setting %jd attrs (objid %#jx): %s",
+                      jt_cmdname(argv[0]), (uintmax_t)count,
+                      (uintmax_t)objid, ctime(&start.tv_sec));
 
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
-                data.ioc_obdo1.o_id = objid;
+               if (objid >= OBIF_MAX_OID) {
+                       fprintf(stderr, "errr: %s: invalid objid '%llu'\n",
+                               jt_cmdname(argv[0]), objid);
+                       return -E2BIG;
+               }
+
+               data.ioc_obdo1.o_oi.oi_fid.f_oid = objid;
                 data.ioc_obdo1.o_mode = S_IFREG;
                 data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
                 memset(buf, 0, sizeof(rawbuf));
@@ -1732,14 +1668,15 @@ int jt_obd_test_setattr(int argc, char **argv)
                 rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, &data);
                 shmem_bump(1);
                 if (rc < 0) {
-                        fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n",
-                                jt_cmdname(argv[0]), i, errno, strerror(rc = errno));
+                       fprintf(stderr, "error: %s: #%jd - %d:%s\n",
+                               jt_cmdname(argv[0]), (uintmax_t)i,
+                               errno, strerror(rc = errno));
                         break;
                 } else {
                         if (be_verbose
                             (verbose, &next_time, i, &next_count, count))
-                                printf("%s: set attr #"LPD64"\n",
-                                       jt_cmdname(argv[0]), i);
+                               printf("%s: set attr #%jd\n",
+                                      jt_cmdname(argv[0]), (uintmax_t)i);
                 }
         }
 
@@ -1753,9 +1690,9 @@ int jt_obd_test_setattr(int argc, char **argv)
 
                 --i;
                 if (verbose != 0)
-                        printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s",
-                               jt_cmdname(argv[0]), i, diff, i / diff,
-                               ctime(&end.tv_sec));
+                       printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s",
+                              jt_cmdname(argv[0]), (uintmax_t)i, diff,
+                              i / diff, ctime(&end.tv_sec));
         }
         return rc;
 }
@@ -1798,14 +1735,21 @@ int jt_obd_destroy(int argc, char **argv)
                         return CMD_HELP;
         }
 
-        printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count);
+       printf("%s: %jd objects\n", jt_cmdname(argv[0]), (uintmax_t)count);
         gettimeofday(&next_time, NULL);
         next_time.tv_sec -= verbose;
 
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++, id++) {
-                data.ioc_obdo1.o_id = id;
-                data.ioc_obdo1.o_mode = S_IFREG | 0644;
-                data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
+               if (id >= OBIF_MAX_OID) {
+                       fprintf(stderr, "errr: %s: invalid objid '%llu'\n",
+                               jt_cmdname(argv[0]), id);
+                       return -E2BIG;
+               }
+
+               data.ioc_obdo1.o_oi.oi_fid.f_oid = id;
+               data.ioc_obdo1.o_mode = S_IFREG | 0644;
+               data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
 
                 memset(buf, 0, sizeof(rawbuf));
                 rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
@@ -1818,14 +1762,15 @@ int jt_obd_destroy(int argc, char **argv)
                 obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 shmem_bump(1);
                 if (rc < 0) {
-                        fprintf(stderr, "error: %s: objid "LPX64": %s\n",
-                                jt_cmdname(argv[0]), id, strerror(rc = errno));
+                       fprintf(stderr, "error: %s: objid %#jx: %s\n",
+                               jt_cmdname(argv[0]), (uintmax_t)id,
+                               strerror(rc = errno));
                         break;
                 }
 
                 if (be_verbose(verbose, &next_time, i, &next_count, count))
-                        printf("%s: #%d is object id "LPX64"\n",
-                               jt_cmdname(argv[0]), i, id);
+                       printf("%s: #%d is object id %#jx\n",
+                              jt_cmdname(argv[0]), i, (uintmax_t)id);
         }
 
         return rc;
@@ -1835,24 +1780,35 @@ int jt_obd_getattr(int argc, char **argv)
 {
         struct obd_ioctl_data data;
         char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       __u64 objid;
         char *end;
         int rc;
 
         if (argc != 2)
                 return CMD_HELP;
 
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0);
-        if (*end) {
-                fprintf(stderr, "error: %s: invalid objid '%s'\n",
-                        jt_cmdname(argv[0]), argv[1]);
-                return CMD_HELP;
-        }
-        /* to help obd filter */
-        data.ioc_obdo1.o_mode = 0100644;
-        data.ioc_obdo1.o_valid = 0xffffffff;
-        printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]),data.ioc_obdo1.o_id);
+       objid = strtoull(argv[1], &end, 0);
+       if (*end) {
+               fprintf(stderr, "error: %s: objid '%s' is not a number\n",
+                       jt_cmdname(argv[0]), argv[1]);
+               return CMD_HELP;
+       }
+
+       if (objid >= OBIF_MAX_OID) {
+               fprintf(stderr, "error: %s: invalid objid '%s'\n",
+                       jt_cmdname(argv[0]), argv[1]);
+               return CMD_HELP;
+       }
+
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = cur_device;
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
+       data.ioc_obdo1.o_oi.oi_fid.f_oid = objid;
+       /* to help obd filter */
+       data.ioc_obdo1.o_mode = 0100644;
+       data.ioc_obdo1.o_valid = 0xffffffff;
+       printf("%s: object id %#jx\n", jt_cmdname(argv[0]),
+              (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi));
 
         memset(buf, 0, sizeof(rawbuf));
         rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
@@ -1867,8 +1823,9 @@ int jt_obd_getattr(int argc, char **argv)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
         } else {
-                printf("%s: object id "LPX64", mode %o\n", jt_cmdname(argv[0]),
-                       data.ioc_obdo1.o_id, data.ioc_obdo1.o_mode);
+               printf("%s: object id %ju, mode %o\n", jt_cmdname(argv[0]),
+                      (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi),
+                      data.ioc_obdo1.o_mode);
         }
         return rc;
 }
@@ -1878,9 +1835,9 @@ int jt_obd_test_getattr(int argc, char **argv)
         struct obd_ioctl_data data;
         struct timeval start, next_time;
         char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        __u64 i, count, next_count;
+       __u64 i, count, next_count;
         int verbose = 1;
-        obd_id objid = 3;
+       __u64 objid = 3;
         char *end;
         int rc = 0;
 
@@ -1920,31 +1877,40 @@ int jt_obd_test_getattr(int argc, char **argv)
         next_time.tv_sec = start.tv_sec - verbose;
         next_time.tv_usec = start.tv_usec;
         if (verbose != 0)
-                printf("%s: getting "LPD64" attrs (objid "LPX64"): %s",
-                       jt_cmdname(argv[0]), count, objid, ctime(&start.tv_sec));
+               printf("%s: getting %jd attrs (objid %#jx): %s",
+                      jt_cmdname(argv[0]), (uintmax_t) count,
+                      (uintmax_t)objid, ctime(&start.tv_sec));
 
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
-                data.ioc_obdo1.o_id = objid;
-                data.ioc_obdo1.o_mode = S_IFREG;
-                data.ioc_obdo1.o_valid = 0xffffffff;
-                memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-                if (rc) {
-                        fprintf(stderr, "error: %s: invalid ioctl\n",
-                                jt_cmdname(argv[0]));
-                        return rc;
-                }
+               if (objid >= OBIF_MAX_OID) {
+                       fprintf(stderr, "errr: %s: invalid objid '%llu'\n",
+                               jt_cmdname(argv[0]), objid);
+                       return -E2BIG;
+               }
+
+               data.ioc_obdo1.o_oi.oi_fid.f_oid = objid;
+               data.ioc_obdo1.o_mode = S_IFREG;
+               data.ioc_obdo1.o_valid = 0xffffffff;
+               memset(buf, 0, sizeof(rawbuf));
+               rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               if (rc) {
+                       fprintf(stderr, "error: %s: invalid ioctl\n",
+                               jt_cmdname(argv[0]));
+                       return rc;
+               }
                 rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data);
                 shmem_bump(1);
                 if (rc < 0) {
-                        fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n",
-                                jt_cmdname(argv[0]), i, errno, strerror(rc = errno));
+                       fprintf(stderr, "error: %s: #%jd - %d:%s\n",
+                               jt_cmdname(argv[0]), (uintmax_t)i,
+                               errno, strerror(rc = errno));
                         break;
                 } else {
                         if (be_verbose
                             (verbose, &next_time, i, &next_count, count))
-                                printf("%s: got attr #"LPD64"\n",
-                                       jt_cmdname(argv[0]), i);
+                               printf("%s: got attr #%jd\n",
+                                      jt_cmdname(argv[0]), (uintmax_t)i);
                 }
         }
 
@@ -1958,9 +1924,9 @@ int jt_obd_test_getattr(int argc, char **argv)
 
                 --i;
                 if (verbose != 0)
-                        printf("%s: "LPD64" attrs in %.3fs (%.3f attr/s): %s",
-                               jt_cmdname(argv[0]), i, diff, i / diff,
-                               ctime(&end.tv_sec));
+                       printf("%s: %jd attrs in %.3fs (%.3f attr/s): %s",
+                              jt_cmdname(argv[0]), (uintmax_t) i, diff,
+                              i / diff, ctime(&end.tv_sec));
         }
         return rc;
 }
@@ -2129,21 +2095,30 @@ int jt_obd_test_brw(int argc, char **argv)
         }
 #endif
 
-        data.ioc_obdo1.o_id = objid;
-        data.ioc_obdo1.o_mode = S_IFREG;
-        data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLFLAGS;
-        data.ioc_obdo1.o_flags = (verify ? OBD_FL_DEBUG_CHECK : 0);
-        data.ioc_count = len;
-        data.ioc_offset = (repeat_offset ? 0 : thr_offset);
+       ostid_set_seq_echo(&data.ioc_obdo1.o_oi);
+       if (objid >= OBIF_MAX_OID) {
+               fprintf(stderr, "errr: %s: invalid objid '%llu'\n",
+                       jt_cmdname(argv[0]), objid);
+               return -E2BIG;
+       }
+
+       data.ioc_obdo1.o_oi.oi_fid.f_oid = objid;
+       data.ioc_obdo1.o_mode = S_IFREG;
+       data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE |
+                                OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
+       data.ioc_obdo1.o_flags = (verify ? OBD_FL_DEBUG_CHECK : 0);
+       data.ioc_count = len;
+       data.ioc_offset = (repeat_offset ? 0 : thr_offset);
 
         gettimeofday(&start, NULL);
         next_time.tv_sec = start.tv_sec - verbose;
         next_time.tv_usec = start.tv_usec;
 
         if (verbose != 0)
-                printf("%s: %s "LPU64"x%d pages (obj "LPX64", off "LPU64"): %s",
-                       jt_cmdname(argv[0]), write ? "writing" : "reading", count,
-                       pages, objid, data.ioc_offset, ctime(&start.tv_sec));
+               printf("%s: %s %jux%d pages (obj %#jx, off %ju): %s",
+                      jt_cmdname(argv[0]), write ? "writing" : "reading",
+                      (uintmax_t)count, pages, (uintmax_t) objid,
+                      (uintmax_t)data.ioc_offset, ctime(&start.tv_sec));
 
         cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ;
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
@@ -2163,12 +2138,13 @@ int jt_obd_test_brw(int argc, char **argv)
                                 write ? "write" : "read");
                         break;
                 } else if (be_verbose(verbose, &next_time,i, &next_count,count)) {
-                        shmem_lock ();
-                        printf("%s: %s number %d @ "LPD64":"LPU64" for %d\n",
-                               jt_cmdname(argv[0]), write ? "write" : "read", i,
-                               data.ioc_obdo1.o_id, data.ioc_offset,
-                               (int)(pages * getpagesize()));
-                        shmem_unlock ();
+                       shmem_lock ();
+                       printf("%s: %s number %d @ %jd:%ju for %d\n",
+                              jt_cmdname(argv[0]), write ? "write" : "read", i,
+                              (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi),
+                              (uintmax_t)data.ioc_offset,
+                              (int)(pages * getpagesize()));
+                       shmem_unlock ();
                 }
 
                 if (!repeat_offset) {
@@ -2300,10 +2276,10 @@ repeat:
                 else
                         printf("default_stripe_count: %u\n",
                                desc.ld_default_stripe_count);
-                printf("default_stripe_size: "LPU64"\n",
-                       desc.ld_default_stripe_size);
-                printf("default_stripe_offset: "LPU64"\n",
-                       desc.ld_default_stripe_offset);
+               printf("default_stripe_size: %ju\n",
+                      (uintmax_t)desc.ld_default_stripe_size);
+               printf("default_stripe_offset: %ju\n",
+                      (uintmax_t)desc.ld_default_stripe_offset);
                 printf("default_stripe_pattern: %u\n", desc.ld_pattern);
                 printf("obd_count: %u\n", desc.ld_tgt_count);
                 printf("OBDS:\tobdidx\t\tobdgen\t\t obduuid\n");
@@ -2321,74 +2297,6 @@ out:
         return rc;
 }
 
-int jt_obd_ldlm_regress_start(int argc, char **argv)
-{
-        int rc;
-        struct obd_ioctl_data data;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        char argstring[200];
-        int i, count = sizeof(argstring) - 1;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        if (argc > 5)
-                return CMD_HELP;
-
-        argstring[0] = '\0';
-        for (i = 1; i < argc; i++) {
-                strncat(argstring, " ", count);
-                count--;
-                strncat(argstring, argv[i], count);
-                count -= strlen(argv[i]);
-        }
-
-        if (strlen(argstring)) {
-                data.ioc_inlbuf1 = argstring;
-                data.ioc_inllen1 = strlen(argstring) + 1;
-        }
-
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-                return rc;
-        }
-        rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_START, buf);
-        if (rc)
-                fprintf(stderr, "error: %s: test failed: %s\n",
-                        jt_cmdname(argv[0]), strerror(rc = errno));
-
-        return rc;
-}
-
-int jt_obd_ldlm_regress_stop(int argc, char **argv)
-{
-        int rc;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        struct obd_ioctl_data data;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-
-        if (argc != 1)
-                return CMD_HELP;
-
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-                return rc;
-        }
-        rc = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_STOP, buf);
-
-        if (rc)
-                fprintf(stderr, "error: %s: test failed: %s\n",
-                        jt_cmdname(argv[0]), strerror(rc = errno));
-        return rc;
-}
-
 static int do_activate(int argc, char **argv, int flag)
 {
         struct obd_ioctl_data data;
@@ -2418,6 +2326,56 @@ static int do_activate(int argc, char **argv, int flag)
         return rc;
 }
 
+/**
+ * Replace nids for given device.
+ * lctl replace_nids <devicename> <nid1>[,nid2,nid3]
+ * Command should be started on MGS server.
+ * Only MGS server should be started (command execution
+ * returns error in another cases). Command mount
+ * -t lustre <MDT partition> -o nosvc <mount point>
+ * can be used for that.
+ *
+ * llogs for MDTs and clients are processed. All
+ * records copied as is except add_uuid and setup. This records
+ * are skipped and recorded with new nids and uuid.
+ *
+ * \see mgs_replace_nids
+ * \see mgs_replace_nids_log
+ * \see mgs_replace_handler
+ */
+int jt_replace_nids(int argc, char **argv)
+{
+       int rc;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct obd_ioctl_data data;
+
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = get_mgs_device();
+       if (argc != 3)
+               return CMD_HELP;
+
+       data.ioc_inllen1 = strlen(argv[1]) + 1;
+       data.ioc_inlbuf1 = argv[1];
+
+       data.ioc_inllen2 = strlen(argv[2]) + 1;
+       data.ioc_inlbuf2 = argv[2];
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_REPLACE_NIDS, buf);
+       if (rc < 0) {
+               fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+                       strerror(rc = errno));
+       }
+
+       return rc;
+}
+
 int jt_obd_deactivate(int argc, char **argv)
 {
         return do_activate(argc, argv, 0);
@@ -2518,33 +2476,71 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         return rc;
 }
 
-int jt_cfg_dump_log(int argc, char **argv)
+int jt_lcfg_fork(int argc, char **argv)
 {
-        struct obd_ioctl_data data;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        int rc;
-
-        if (argc != 2)
-                return CMD_HELP;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        data.ioc_inllen1 = strlen(argv[1]) + 1;
-        data.ioc_inlbuf1 = argv[1];
-
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-                return rc;
-        }
-        rc = l_ioctl(OBD_DEV_ID, OBD_IOC_DUMP_LOG, buf);
-        if (rc < 0)
-                fprintf(stderr, "OBD_IOC_DUMP_LOG failed: %s\n",
-                        strerror(errno));
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       int rc;
+
+       if (argc != 3)
+               return CMD_HELP;
+
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = get_mgs_device();
+       data.ioc_inllen1 = strlen(argv[1]) + 1;
+       data.ioc_inlbuf1 = argv[1];
+       data.ioc_inllen2 = strlen(argv[2]) + 1;
+       data.ioc_inlbuf2 = argv[2];
+
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_FORK, buf);
+       if (rc < 0)
+               fprintf(stderr, "error: %s: OBD_IOC_LCFG_FORK failed: %s\n",
+                       jt_cmdname(argv[0]), strerror(errno));
+
+       return rc;
+}
 
-        return rc;
+int jt_lcfg_erase(int argc, char **argv)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       int rc;
+
+       if (argc == 3) {
+               if (strncmp(argv[2], "-q", strlen("-q")) != 0 &&
+                   strncmp(argv[2], "--quiet", strlen("--quiet")) != 0)
+                       return CMD_HELP;
+       } else if (argc != 2) {
+               return CMD_HELP;
+       }
+
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = get_mgs_device();
+       data.ioc_inllen1 = strlen(argv[1]) + 1;
+       data.ioc_inlbuf1 = argv[1];
+
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LCFG_ERASE, buf);
+       if (rc < 0)
+               fprintf(stderr, "error: %s: OBD_IOC_LCFG_ERASE failed: %s\n",
+                       jt_cmdname(argv[0]), strerror(errno));
+
+       return rc;
 }
 
 int jt_llog_catlist(int argc, char **argv)
@@ -2656,41 +2652,117 @@ int jt_llog_print(int argc, char **argv)
         return rc;
 }
 
-int jt_llog_cancel(int argc, char **argv)
+static int llog_cancel_parse_optional(int argc, char **argv,
+                                     struct obd_ioctl_data *data)
 {
-        struct obd_ioctl_data data;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        int rc;
-
-        if (argc != 4)
-                return CMD_HELP;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        data.ioc_inllen1 = strlen(argv[1]) + 1;
-        data.ioc_inlbuf1 = argv[1];
-        data.ioc_inllen2 = strlen(argv[2]) + 1;
-        data.ioc_inlbuf2 = argv[2];
-        data.ioc_inllen3 = strlen(argv[3]) + 1;
-        data.ioc_inlbuf3 = argv[3];
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-                return rc;
-        }
-
-        rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf);
-        if (rc == 0)
-                fprintf(stdout, "index %s be canceled.\n", argv[3]);
-        else
-                fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n",
-                        strerror(errno));
-
-        return rc;
+       int cOpt;
+       const char *const short_opts = "c:l:i:h";
+       const struct option long_opts[] = {
+       { .val = 'c',   .name = "catalog",      .has_arg = required_argument },
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'i',   .name = "log_idx",      .has_arg = required_argument },
+       { .val = 'l',   .name = "log_id",       .has_arg = required_argument },
+       { .name = NULL } };
+
+       /* sanity check */
+       if (!data || argc <= 1) {
+               return -1;
+       }
+
+       /*now process command line arguments*/
+       while ((cOpt = getopt_long(argc, argv, short_opts,
+                                       long_opts, NULL)) != -1) {
+               switch (cOpt) {
+               case 'c':
+                       data->ioc_inllen1 = strlen(optarg) + 1;
+                       data->ioc_inlbuf1 = optarg;
+                       break;
+
+               case 'l':
+                       data->ioc_inllen2 = strlen(optarg) + 1;
+                       data->ioc_inlbuf2 = optarg;
+                       break;
+
+               case 'i':
+                       data->ioc_inllen3 = strlen(optarg) + 1;
+                       data->ioc_inlbuf3 = optarg;
+                       break;
+
+               case 'h':
+               default:
+                       return -1;
+               }
+       }
+
+       if ((data->ioc_inlbuf1 == NULL) || (data->ioc_inlbuf3 == NULL)) {
+               /* missing mandatory parameters */
+               return -1;
+       }
+
+       return 0;
+}
 
+int jt_llog_cancel(int argc, char **argv)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       int rc, i;
+
+       /* check that the arguments provided are either all
+        * optional or all positional.  No mixing allowed
+        *
+        * if argc is 4 or 3 then check all arguments to ensure that none
+        * of them start with a '-'.  If so then this is invalid.
+        * Otherwise if arg is > 4 then assume that this is optional
+        * arguments, and parse as such ignoring any thing that's not
+        * optional.  The result is that user must use optional arguments
+        * for all mandatory parameters.  Code will ignore all other args
+        *
+        * The positional arguments option should eventually be phased out.
+        */
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = cur_device;
+
+       if (argc == 3 || argc == 4) {
+               for (i = 1; i < argc; i++) {
+                       if (argv[i][0] == '-')
+                               return CMD_HELP;
+               }
+               data.ioc_inllen1 = strlen(argv[1]) + 1;
+               data.ioc_inlbuf1 = argv[1];
+               if (argc == 4) {
+                       data.ioc_inllen2 = strlen(argv[2]) + 1;
+                       data.ioc_inlbuf2 = argv[2];
+                       data.ioc_inllen3 = strlen(argv[3]) + 1;
+                       data.ioc_inlbuf3 = argv[3];
+               } else {
+                       data.ioc_inllen3 = strlen(argv[2]) + 1;
+                       data.ioc_inlbuf3 = argv[2];
+               }
+       } else {
+               if (llog_cancel_parse_optional(argc, argv, &data) != 0)
+                       return CMD_HELP;
+       }
+
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf);
+       if (rc == 0)
+               fprintf(stdout, "index %s was canceled.\n",
+                       argc == 4 ? argv[3] : argv[2]);
+       else
+               fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n",
+                       strerror(errno));
+
+       return rc;
 }
+
 int jt_llog_check(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -2764,10 +2836,11 @@ int jt_llog_remove(int argc, char **argv)
 
         rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_REMOVE, buf);
         if (rc == 0) {
-                if (argc == 3)
-                        fprintf(stdout, "log %s are removed.\n", argv[2]);
-                else
-                        fprintf(stdout, "the log in catalog %s are removed. \n", argv[1]);
+                if (argc == 2)
+                       fprintf(stdout, "log %s is removed.\n", argv[1]);
+               else
+                       fprintf(stdout, "the log in catalog %s is removed. \n",
+                               argv[1]);
         } else
                 fprintf(stderr, "OBD_IOC_LLOG_REMOVE failed: %s\n",
                         strerror(errno));
@@ -2775,259 +2848,59 @@ int jt_llog_remove(int argc, char **argv)
         return rc;
 }
 
-/* attach a regular file to virtual block device.
- * return vaule:
- *  -1: fatal error
- *  1: error, it always means the command run failed
- *  0: success
- */
-static int jt_blockdev_run_process(const char *file, char *argv[])
+static void signal_server(int sig)
 {
-        pid_t pid;
-        int rc;
-
-        pid = vfork();
-        if (pid == 0) { /* child process */
-                /* don't print error messages */
-                close(1), close(2);
-                (void)execvp(file, argv);
-                exit(-1);
-        } else if (pid > 0) {
-                int status;
-
-                rc = waitpid(pid, &status, 0);
-                if (rc < 0 || !WIFEXITED(status))
-                        return -1;
-
-                return WEXITSTATUS(status);
-        }
-
-        return -1;
+        if (sig == SIGINT) {
+                do_disconnect("sigint", 1);
+                exit(1);
+        } else
+                fprintf(stderr, "%s: got signal %d\n", jt_cmdname("sigint"), sig);
 }
 
-static int jt_blockdev_find_module(const char *module)
+int obd_initialize(int argc, char **argv)
 {
-        FILE *fp;
-        int found = 0;
-        char buf[1024];
-
-        fp = fopen("/proc/modules", "r");
-        if (fp == NULL)
-                return -1;
+       if (shmem_setup() != 0)
+               return -1;
 
-        while (fgets(buf, 1024, fp) != NULL) {
-                *strchr(buf, ' ') = 0;
-                if (strcmp(module, buf) == 0) {
-                        found = 1;
-                        break;
-                }
-        }
-        fclose(fp);
+       register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH,
+                        OBD_DEV_MAJOR, OBD_DEV_MINOR);
 
-        return found;
+       return 0;
 }
 
-static int jt_blockdev_probe_module(const char *module)
+void obd_finalize(int argc, char **argv)
 {
-        char buf[1024];
-        char *argv[10];
-        int c, rc;
-
-        if (jt_blockdev_find_module(module) == 1)
-                return 0;
+        struct sigaction sigact;
 
-        /* run modprobe first */
-        c = 0;
-        argv[c++] = "/sbin/modprobe";
-        argv[c++] = "-q";
-        argv[c++] = (char *)module;
-        argv[c++] = NULL;
-        rc = jt_blockdev_run_process("modprobe", argv);
-        if (rc != 1)
-                return rc;
+       /* sigact initialization */
+        sigact.sa_handler = signal_server;
+        sigfillset(&sigact.sa_mask);
+        sigact.sa_flags = SA_RESTART;
+       /* coverity[uninit_use_in_call] */
+        sigaction(SIGINT, &sigact, NULL);
 
-        /* cannot find the module in default directory ... */
-        sprintf(buf, "../llite/%s.ko", module);
-        c = 0;
-        argv[c++] = "/sbin/insmod";
-        argv[c++] = buf;
-        argv[c++] = NULL;
-        rc = jt_blockdev_run_process("insmod", argv);
-        return rc ? -1 : 0;
+        shmem_cleanup();
+        do_disconnect(argv[0], 1);
 }
 
-int jt_blockdev_attach(int argc, char **argv)
+static int check_pool_cmd(enum lcfg_command_type cmd,
+                          char *fsname, char *poolname,
+                          char *ostname)
 {
-        int rc, fd;
-        struct stat st;
-        char *filename, *devname;
-        unsigned long dev;
-
-        if (argc != 3)
-                return CMD_HELP;
+        int rc;
 
-        if (jt_blockdev_probe_module("llite_lloop") < 0) {
-                fprintf(stderr, "error: cannot find module llite_lloop.(k)o\n");
-                return ENOENT;
+        rc = llapi_search_ost(fsname, poolname, ostname);
+        if (rc < 0 && (cmd != LCFG_POOL_NEW)) {
+                fprintf(stderr, "Pool %s.%s not found\n",
+                        fsname, poolname);
+                return rc;
         }
 
-        filename = argv[1];
-        devname = argv[2];
+        switch (cmd) {
+        case LCFG_POOL_NEW: {
+               if (ostname != NULL)
+                       return -EINVAL;
 
-        fd = open(filename, O_RDWR);
-        if (fd < 0) {
-                fprintf(stderr, "file %s can't be opened(%s)\n\n",
-                        filename, strerror(errno));
-                return CMD_HELP;
-        }
-
-        rc = ioctl(fd, LL_IOC_LLOOP_ATTACH, &dev);
-        if (rc < 0) {
-                rc = errno;
-                fprintf(stderr, "attach error(%s)\n", strerror(rc));
-                goto out;
-        }
-
-        rc = stat(devname, &st);
-        if (rc == 0 && (!S_ISBLK(st.st_mode) || st.st_rdev != dev)) {
-                rc = EEXIST;
-        } else if (rc < 0) {
-                if (errno == ENOENT &&
-                    !mknod(devname, S_IFBLK|S_IRUSR|S_IWUSR, dev))
-                        rc = 0;
-                else
-                        rc = errno;
-        }
-
-        if (rc) {
-                fprintf(stderr, "error: the file %s could be attached to block "
-                                "device %X but creating %s failed: %s\n"
-                                "now detaching the block device..",
-                        filename, (int)dev, devname, strerror(rc));
-
-                (void)ioctl(fd, LL_IOC_LLOOP_DETACH_BYDEV, dev);
-                fprintf(stderr, "%s\n", strerror(errno));
-        }
-out:
-        close(fd);
-        return -rc;
-}
-
-int jt_blockdev_detach(int argc, char **argv)
-{
-        char *filename;
-        int rc, fd;
-
-        if (argc != 2)
-                return CMD_HELP;
-
-        filename = argv[1];
-        fd = open(filename, O_RDONLY);
-        if (fd < 0) {
-                fprintf(stderr, "cannot open file %s error %s\n",
-                        filename, strerror(errno));
-                return CMD_HELP;
-        }
-
-        rc = ioctl(fd, LL_IOC_LLOOP_DETACH, 0);
-        if (rc < 0) {
-                rc = errno;
-                fprintf(stderr, "detach error(%s)\n", strerror(rc));
-        } else {
-                (void)unlink(filename);
-        }
-
-        close(fd);
-        return -rc;
-}
-
-int jt_blockdev_info(int argc, char **argv)
-{
-        char *filename;
-        int rc, fd;
-        struct lu_fid fid;
-
-        if (argc != 2)
-                return CMD_HELP;
-
-        filename = argv[1];
-        fd = open(filename, O_RDONLY);
-        if (fd < 0) {
-                fprintf(stderr, "cannot open file %s error: %s\n",
-                        filename, strerror(errno));
-                return CMD_HELP;
-        }
-
-        rc = ioctl(fd, LL_IOC_LLOOP_INFO, &fid);
-        if (rc < 0) {
-                rc = errno;
-                fprintf(stderr, "error: %s\n", strerror(errno));
-                goto out;
-        }
-        fprintf(stdout, "lloop device info: ");
-        if (fid_is_zero(&fid))
-                fprintf(stdout, "Not attached\n");
-        else
-                fprintf(stdout, "attached to inode "DFID"\n", PFID(&fid));
-out:
-        close(fd);
-        return -rc;
-}
-
-static void signal_server(int sig)
-{
-        if (sig == SIGINT) {
-                do_disconnect("sigint", 1);
-                exit(1);
-        } else
-                fprintf(stderr, "%s: got signal %d\n", jt_cmdname("sigint"), sig);
-}
-
-int obd_initialize(int argc, char **argv)
-{
-        int i;
-
-        for (i = 0; i < LOV_MAX_STRIPE_COUNT; i++)
-                lsm_buffer.lsm.lsm_oinfo[i] = lov_oinfos + i;
-
-        if (shmem_setup() != 0)
-                return -1;
-
-        register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH,
-                         OBD_DEV_MAJOR, OBD_DEV_MINOR);
-
-        return 0;
-}
-
-void obd_finalize(int argc, char **argv)
-{
-        struct sigaction sigact;
-
-        sigact.sa_handler = signal_server;
-        sigfillset(&sigact.sa_mask);
-        sigact.sa_flags = SA_RESTART;
-        sigaction(SIGINT, &sigact, NULL);
-
-        shmem_cleanup();
-        do_disconnect(argv[0], 1);
-}
-
-static int check_pool_cmd(enum lcfg_command_type cmd,
-                          char *fsname, char *poolname,
-                          char *ostname)
-{
-        int rc;
-
-        rc = llapi_search_ost(fsname, poolname, ostname);
-        if (rc < 0 && (cmd != LCFG_POOL_NEW)) {
-                fprintf(stderr, "Pool %s.%s not found\n",
-                        fsname, poolname);
-                return rc;
-        }
-
-        switch (cmd) {
-        case LCFG_POOL_NEW: {
-                LASSERT(ostname == NULL);
                 if (rc >= 0) {
                         fprintf(stderr, "Pool %s.%s already exists\n",
                                 fsname, poolname);
@@ -3036,7 +2909,9 @@ static int check_pool_cmd(enum lcfg_command_type cmd,
                 return 0;
         }
         case LCFG_POOL_DEL: {
-                LASSERT(ostname == NULL);
+               if (ostname != NULL)
+                       return -EINVAL;
+
                 if (rc == 1) {
                         fprintf(stderr, "Pool %s.%s not empty, "
                                 "please remove all members\n",
@@ -3184,7 +3059,9 @@ static int check_and_complete_ostname(char *fsname, char *ostname)
                         ostname, fsname);
                 return -EINVAL;
         } else {
-             strcpy(real_ostname, ostname);
+               if (strlen(ostname) > sizeof(real_ostname)-1)
+                       return -E2BIG;
+               strncpy(real_ostname, ostname, sizeof(real_ostname));
         }
         /* real_ostname is fsname-????? */
         ptr = real_ostname + strlen(fsname) + 1;
@@ -3242,11 +3119,11 @@ static int pool_cmd(enum lcfg_command_type cmd,
         if (ostname != NULL)
                 lustre_cfg_bufs_set_string(&bufs, 2, ostname);
 
-        lcfg = lustre_cfg_new(cmd, &bufs);
-        if (IS_ERR(lcfg)) {
-                rc = PTR_ERR(lcfg);
-                return rc;
-        }
+
+       lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen));
+       if (lcfg == NULL)
+               return -ENOMEM;
+       lustre_cfg_init(lcfg, cmd, &bufs);
 
         memset(&data, 0, sizeof(data));
         rc = data.ioc_dev = get_mgs_device();
@@ -3263,16 +3140,725 @@ static int pool_cmd(enum lcfg_command_type cmd,
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(cmdname));
+               free(lcfg);
                 return rc;
         }
         rc = l_ioctl(OBD_DEV_ID, OBD_IOC_POOL, buf);
 out:
         if (rc)
                 rc = -errno;
-        lustre_cfg_free(lcfg);
+       free(lcfg);
         return rc;
 }
 
+/**
+ * Format and send the ioctl to the MGS.
+ *
+ * \param      cmd             IOCTL to send
+ * \param      ret_data        void pointer to return anything from
+ *                             ioctl
+ * \param      num_args        number of arguments to pack into the
+ *                             ioctl buffer
+ * \param      argv[]          variable number of string arguments
+ *
+ * \retval                     0 on success
+ */
+static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
+                      unsigned int ret_size, ...)
+{
+       va_list                 ap;
+       char                    *arg;
+       int                     i = 0;
+       struct lustre_cfg_bufs  bufs;
+       struct obd_ioctl_data   data;
+       struct lustre_cfg       *lcfg;
+       char                    rawbuf[MAX_IOC_BUFLEN];
+       char                    *buf = rawbuf;
+       int                     rc = 0;
+
+       lustre_cfg_bufs_reset(&bufs, NULL);
+
+       va_start(ap, ret_size);
+       arg = va_arg(ap, char *);
+       while (arg != NULL) {
+               lustre_cfg_bufs_set_string(&bufs, i, arg);
+               i++;
+               arg = va_arg(ap, char *);
+       }
+       va_end(ap);
+
+       lcfg = malloc(lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen));
+       if (lcfg == NULL)
+               return -ENOMEM;
+       lustre_cfg_init(lcfg, cmd, &bufs);
+
+       memset(&data, 0, sizeof(data));
+       rc = data.ioc_dev = get_mgs_device();
+       if (rc < 0)
+               goto out;
+
+       data.ioc_type = LUSTRE_CFG_TYPE;
+       data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
+                        lcfg->lcfg_buflens);
+       data.ioc_pbuf1 = (void *)lcfg;
+
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc != 0) {
+               fprintf(stderr, "error: invalid ioctl: %08x errno: %d with "
+                              "rc=%d\n", cmd, errno, rc);
+               goto out;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_NODEMAP, buf);
+       if (rc != 0) {
+               fprintf(stderr, "error: invalid ioctl: %08x errno: %d with "
+                              "rc=%d\n", cmd, errno, rc);
+               goto out;
+       }
+
+       if (ret_data != NULL) {
+               rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               if (rc != 0)
+                       goto out;
+
+               if (ret_size > data.ioc_plen1)
+                       ret_size = data.ioc_plen1;
+
+               memcpy(ret_data, data.ioc_pbuf1, ret_size);
+       }
+out:
+       free(lcfg);
+
+       return rc;
+}
+
+/**
+ * activate nodemap functions
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * argv[0]                     1 for activate or 0 for deactivate
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_activate(int argc, char **argv)
+{
+       int rc;
+
+       rc = nodemap_cmd(LCFG_NODEMAP_ACTIVATE, NULL, 0, argv[0], argv[1],
+                        NULL);
+
+       if (rc != 0) {
+               errno = -rc;
+               perror(argv[0]);
+       }
+
+       return rc;
+}
+
+/**
+ * add a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * argv[0]                     nodemap name
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_add(int argc, char **argv)
+{
+       int rc;
+
+       rc = llapi_nodemap_exists(argv[1]);
+       if (rc == 0) {
+               fprintf(stderr, "error: %s existing nodemap name\n", argv[1]);
+               return 1;
+       }
+
+       rc = nodemap_cmd(LCFG_NODEMAP_ADD, NULL, 0, argv[0], argv[1], NULL);
+
+       if (rc != 0) {
+               errno = -rc;
+               perror(argv[0]);
+       }
+
+       return rc;
+}
+
+/**
+ * delete a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * argv[0]                     nodemap name
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_del(int argc, char **argv)
+{
+       int rc;
+
+       rc = llapi_nodemap_exists(argv[1]);
+       if (rc != 0) {
+               fprintf(stderr, "error: %s not existing nodemap name\n",
+                       argv[1]);
+               return rc;
+       }
+       rc = nodemap_cmd(LCFG_NODEMAP_DEL, NULL, 0, argv[0], argv[1], NULL);
+
+       if (rc != 0) {
+               errno = -rc;
+               perror(argv[0]);
+       }
+
+       return rc;
+}
+
+/**
+ * test a nid for nodemap membership
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * argv[0]                     properly formatted nid
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_test_nid(int argc, char **argv)
+{
+
+       char    rawbuf[MAX_IOC_BUFLEN];
+       int     rc;
+
+       rc = nodemap_cmd(LCFG_NODEMAP_TEST_NID, &rawbuf, sizeof(rawbuf),
+                        argv[0], argv[1], NULL);
+       if (rc == 0)
+               printf("%s\n", (char *)rawbuf);
+
+       return rc;
+}
+
+/**
+ * test a nodemap id pair for mapping
+ *
+ * \param      argc            number of args
+ * \param      argv[[]         variable string arguments
+ *
+ * \retval                     0 on success
+ *
+ * The argv array should contain the nodemap name, the id
+ * to checking the mapping on, and the id type (UID or GID)
+ *
+ */
+int jt_nodemap_test_id(int argc, char **argv)
+{
+       char    rawbuf[MAX_IOC_BUFLEN];
+       char    *nidstr = NULL;
+       char    *idstr = NULL;
+       char    *typestr = NULL;
+       int     rc = 0;
+       int     c;
+
+       static struct option long_options[] = {
+               {
+                       .name           = "nid",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'n',
+               },
+               {
+                       .name           = "idtype",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 't',
+               },
+               {
+                       .name           = "id",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'i',
+               },
+               {
+                       NULL
+               }
+       };
+
+       while ((c = getopt_long(argc, argv, "n:t:i:",
+                               long_options, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nidstr = optarg;
+                       break;
+               case 't':
+                       typestr = optarg;
+                       break;
+               case 'i':
+                       idstr = optarg;
+                       break;
+               }
+       }
+
+       if (nidstr == NULL || typestr == NULL || idstr == NULL) {
+               fprintf(stderr, "usage: nodemap_test_id --nid <nid> "
+                               "--idtype [uid|gid] --id <id>\n");
+               return -1;
+       }
+
+       rc = nodemap_cmd(LCFG_NODEMAP_TEST_ID, &rawbuf, sizeof(rawbuf),
+                        argv[0], nidstr, typestr, idstr);
+       if (rc == 0)
+               printf("%s\n", (char *)rawbuf);
+
+       return rc;
+}
+
+/**
+ * add an nid range to a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * --name                      nodemap name
+ * --range                     properly formatted nid range
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_add_range(int argc, char **argv)
+{
+       char                    *nodemap_name = NULL;
+       char                    *nodemap_range = NULL;
+       struct list_head        nidlist;
+       char                    min_nid[LNET_NIDSTR_SIZE + 1];
+       char                    max_nid[LNET_NIDSTR_SIZE + 1];
+       char                    nid_range[2 * LNET_NIDSTR_SIZE + 2];
+       int                     rc = 0;
+       int                     c;
+
+       static struct option long_opts[] = {
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .val = 'r',   .name = "range",        .has_arg = required_argument },
+       { .name = NULL } };
+
+       INIT_LIST_HEAD(&nidlist);
+
+       while ((c = getopt_long(argc, argv, "n:r:",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'r':
+                       nodemap_range = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || nodemap_range == NULL) {
+               fprintf(stderr, "usage: nodemap_add_range --name <name> "
+                               "--range <range>\n");
+               return -1;
+       }
+
+       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+                             &nidlist) <= 0) {
+               fprintf(stderr, "error: %s: can't parse nid range: %s\n",
+                       jt_cmdname(argv[0]), nodemap_range);
+               return -1;
+       }
+
+       if (!cfs_nidrange_is_contiguous(&nidlist)) {
+               fprintf(stderr, "error: %s: nodemap ranges must be "
+                       "contiguous\n", jt_cmdname(argv[0]));
+               return -1;
+       }
+
+       cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                 LNET_NIDSTR_SIZE);
+       snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
+
+       rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0],
+                        nodemap_name, nid_range, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "error: %s: cannot add range '%s' to nodemap "
+                               "'%s': rc = %d\n",
+                       jt_cmdname(argv[0]), nodemap_range, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
+/**
+ * delete an nid range to a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * --name                      nodemap name
+ * --range                     properly formatted nid range
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_del_range(int argc, char **argv)
+{
+       char                    *nodemap_name = NULL;
+       char                    *nodemap_range = NULL;
+       struct list_head        nidlist;
+       char                    min_nid[LNET_NIDSTR_SIZE + 1];
+       char                    max_nid[LNET_NIDSTR_SIZE + 1];
+       char                    nid_range[2 * LNET_NIDSTR_SIZE + 2];
+       int                     rc = 0;
+       int                     c;
+
+       static struct option long_options[] = {
+               {
+                       .name           = "name",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'n',
+               },
+               {
+                       .name           = "range",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'r',
+               },
+               {
+                       NULL
+               }
+       };
+
+       INIT_LIST_HEAD(&nidlist);
+
+       while ((c = getopt_long(argc, argv, "n:r:",
+                               long_options, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'r':
+                       nodemap_range = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || nodemap_range == NULL) {
+               fprintf(stderr, "usage: nodemap_del_range --name <name> "
+                               "--range <range>\n");
+               return -1;
+       }
+
+       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+                             &nidlist) <= 0) {
+               fprintf(stderr, "error: %s: can't parse nid range: %s\n",
+                       jt_cmdname(argv[0]), nodemap_range);
+               return -1;
+       }
+
+       if (!cfs_nidrange_is_contiguous(&nidlist)) {
+               fprintf(stderr, "error: %s: nodemap ranges must be "
+                       "contiguous\n", jt_cmdname(argv[0]));
+               return -1;
+       }
+
+       cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                 LNET_NIDSTR_SIZE);
+       snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
+
+       rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0],
+                        nodemap_name, nid_range, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "error: %s: cannot delete range '%s' to "
+                              "nodemap '%s': rc = %d\n",
+                       jt_cmdname(argv[0]), nodemap_range, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
+/**
+ * set a fileset on a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * --name                      nodemap name
+ * --fileset                   fileset name
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_set_fileset(int argc, char **argv)
+{
+       char *nodemap_name = NULL;
+       char *fileset_name = NULL;
+       int   rc = 0;
+       int   c;
+
+       static struct option long_opts[] = {
+       { .val = 'f',   .name = "fileset",      .has_arg = required_argument },
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .name = NULL } };
+
+       while ((c = getopt_long(argc, argv, "n:f:",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'f':
+                       fileset_name = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || fileset_name == NULL) {
+               fprintf(stderr, "usage: nodemap_set_fileset --name <name> "
+                               "--fileset <fileset>\n");
+               return -1;
+       }
+
+       rc = nodemap_cmd(LCFG_NODEMAP_SET_FILESET, NULL, 0, argv[0],
+                        nodemap_name, fileset_name, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "error: %s: cannot set fileset '%s' on nodemap "
+                               "'%s': rc = %d\n",
+                       jt_cmdname(argv[0]), fileset_name, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
+/**
+ * modify a nodemap's behavior
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * --name                      nodemap name
+ * --property                  nodemap property to change
+ *                             admin, trusted, squash_uid, squash_gid)
+ * --value                     value to set property
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_modify(int argc, char **argv)
+{
+       int                     c;
+       int                     rc = 0;
+       enum lcfg_command_type  cmd = 0;
+       char                    *nodemap_name = NULL;
+       char                    *param = NULL;
+       char                    *value = NULL;
+
+       static struct option long_opts[] = {
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .val = 'p',   .name = "property",     .has_arg = required_argument },
+       { .val = 'v',   .name = "value",        .has_arg = required_argument },
+       { .name = NULL } };
+
+       while ((c = getopt_long(argc, argv, "n:p:v:",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'p':
+                       param = optarg;
+                       break;
+               case 'v':
+                       value = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || param == NULL || value == NULL) {
+               fprintf(stderr, "usage: nodemap_modify --name <nodemap_name> "
+                               "--property <property_name> --value <value>\n");
+               fprintf(stderr, "valid properties: admin trusted map_mode "
+                               "squash_uid squash_gid deny_unknown\n");
+               return -1;
+       }
+
+       if (strcmp("admin", param) == 0) {
+               cmd = LCFG_NODEMAP_ADMIN;
+       } else if (strcmp("trusted", param) == 0) {
+               cmd = LCFG_NODEMAP_TRUSTED;
+       } else if (strcmp("deny_unknown", param) == 0) {
+               cmd = LCFG_NODEMAP_DENY_UNKNOWN;
+       } else if (strcmp("squash_uid", param) == 0) {
+               cmd = LCFG_NODEMAP_SQUASH_UID;
+       } else if (strcmp("squash_gid", param) == 0) {
+               cmd = LCFG_NODEMAP_SQUASH_GID;
+       } else if (strcmp("map_mode", param) == 0) {
+               cmd = LCFG_NODEMAP_MAP_MODE;
+       } else {
+               fprintf(stderr, "error: %s: nodemap_modify invalid "
+                               "subcommand: %s\n",
+                       jt_cmdname(argv[0]), param);
+               return -1;
+       }
+
+       rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, param,
+                        value, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "error: %s: cannot modify nodemap '%s' "
+                              "to param '%s': value '%s': rc = %d\n",
+                       jt_cmdname(argv[0]), nodemap_name, param, value, rc);
+       }
+
+       return rc;
+}
+
+int jt_nodemap_add_idmap(int argc, char **argv)
+{
+       int                     c;
+       enum                    lcfg_command_type cmd = 0;
+       char                    *nodemap_name = NULL;
+       char                    *idmap = NULL;
+       char                    *idtype = NULL;
+       int                     rc = 0;
+
+       static struct option long_options[] = {
+               {
+                       .name           = "name",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'n',
+               },
+               {
+                       .name           = "idmap",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'm',
+               },
+               {
+                       .name           = "idtype",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'i',
+               },
+               {
+                       NULL
+               }
+       };
+
+       while ((c = getopt_long(argc, argv, "n:m:i:",
+                               long_options, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'm':
+                       idmap = optarg;
+                       break;
+               case 'i':
+                       idtype = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || idmap == NULL || idtype == NULL) {
+               fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+                       " --idmap <client id>:<filesystem id>\n", argv[0]);
+               return -1;
+       }
+
+       if (strcmp("uid", idtype) == 0) {
+               cmd = LCFG_NODEMAP_ADD_UIDMAP;
+       } else if (strcmp("gid", idtype) == 0) {
+               cmd = LCFG_NODEMAP_ADD_GIDMAP;
+       } else {
+               fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+                       " --idmap <client id>:<filesystem id>\n", argv[0]);
+               return -1;
+       }
+
+       rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, idmap, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "cannot add %smap '%s' to nodemap '%s'"
+                       ": rc = %d\n", idtype, idmap, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
+int jt_nodemap_del_idmap(int argc, char **argv)
+{
+       int                     c;
+       enum                    lcfg_command_type cmd = 0;
+       char                    *nodemap_name = NULL;
+       char                    *idmap = NULL;
+       char                    *idtype = NULL;
+       int                     rc = 0;
+
+       static struct option long_options[] = {
+               {
+                       .name           = "name",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'n',
+               },
+               {
+                       .name           = "idmap",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'm',
+               },
+               {
+                       .name           = "idtype",
+                       .has_arg        = required_argument,
+                       .flag           = 0,
+                       .val            = 'i',
+               },
+               {
+                       NULL
+               }
+       };
+
+       while ((c = getopt_long(argc, argv, "n:m:i:",
+                               long_options, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 'm':
+                       idmap = optarg;
+                       break;
+               case 'i':
+                       idtype = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || idmap == NULL || idtype == NULL) {
+               fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+                       " --idmap <client id>:<filesystem id>\n", argv[0]);
+               return -1;
+       }
+
+       if (strcmp("uid", idtype) == 0)
+               cmd = LCFG_NODEMAP_DEL_UIDMAP;
+       else
+               cmd = LCFG_NODEMAP_DEL_GIDMAP;
+
+       rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, idmap, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "cannot delete %smap '%s' from nodemap '%s'"
+                       ": rc = %d\n", idtype, idmap, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
 /*
  * this function tranforms a rule [start-end/step] into an array
  * of matching numbers
@@ -3316,14 +3902,16 @@ static int get_array_idx(char *rule, char *format, int **array)
                 /* extract the 3 fields */
                 rc = sscanf(start, "%x-%x/%u", &lo, &hi, &step);
                 switch (rc) {
-                case 0: {
-                        return 0;
-                }
-                case 1: {
-                        array_sz++;
-                        *array = realloc(*array, array_sz * sizeof(int));
-                        if (*array == NULL)
-                                return 0;
+                case 0:
+                       goto err;
+               case 1: {
+                       void *tmp;
+
+                       array_sz++;
+                       tmp = realloc(*array, array_sz * sizeof(int));
+                       if (tmp == NULL)
+                               goto err;
+                       *array = tmp;
                         (*array)[array_idx] = lo;
                         array_idx++;
                         break;
@@ -3333,12 +3921,15 @@ static int get_array_idx(char *rule, char *format, int **array)
                         /* do not break to share code with case 3: */
                 }
                 case 3: {
-                        if ((hi < lo) || (step == 0))
-                                return 0;
-                        array_sz += (hi - lo) / step + 1;
-                        *array = realloc(*array, sizeof(int) * array_sz);
-                        if (*array == NULL)
-                                return 0;
+                       void *tmp;
+
+                       if ((hi < lo) || (step == 0))
+                               goto err;
+                       array_sz += (hi - lo) / step + 1;
+                       tmp = realloc(*array, array_sz * sizeof(int));
+                       if (tmp == NULL)
+                               goto err;
+                       *array = tmp;
                         for (i = lo; i <= hi; i+=step, array_idx++)
                                 (*array)[array_idx] = i;
                         break;
@@ -3350,50 +3941,50 @@ static int get_array_idx(char *rule, char *format, int **array)
 
         } while (ptr != NULL);
         return array_sz;
+err:
+       if (*array != NULL) {
+               free(*array);
+               *array = NULL;
+       }
+       return 0;
 }
 
-static int extract_fsname_poolname(char *arg, char *fsname, char *poolname)
+static int extract_fsname_poolname(const char *arg, char *fsname,
+                                  char *poolname)
 {
-        char *ptr;
-        int len;
-        int rc;
-
-        strcpy(fsname, arg);
-        ptr = strchr(fsname, '.');
-        if (ptr == NULL) {
-                fprintf(stderr, ". is missing in %s\n", fsname);
-                rc = -EINVAL;
-                goto err;
-        }
-
-        len = ptr - fsname;
-        if (len == 0) {
-                fprintf(stderr, "fsname is empty\n");
-                rc = -EINVAL;
-                goto err;
-        }
-
-        len = strlen(ptr + 1);
-        if (len == 0) {
-                fprintf(stderr, "poolname is empty\n");
-                rc = -EINVAL;
-                goto err;
-        }
-        if (len > LOV_MAXPOOLNAME) {
-                fprintf(stderr,
-                        "poolname %s is too long (length is %d max is %d)\n",
-                        ptr + 1, len, LOV_MAXPOOLNAME);
-                rc = -ENAMETOOLONG;
-                goto err;
-        }
-        strncpy(poolname, ptr + 1, LOV_MAXPOOLNAME);
-        poolname[LOV_MAXPOOLNAME] = '\0';
-        *ptr = '\0';
-        return 0;
+       char *ptr;
+       int rc;
+
+       strlcpy(fsname, arg, PATH_MAX + 1);
+       ptr = strchr(fsname, '.');
+       if (ptr == NULL) {
+               fprintf(stderr, ". is missing in %s\n", fsname);
+               rc = -EINVAL;
+               goto err;
+       }
+
+       if ((ptr - fsname) == 0) {
+               fprintf(stderr, "fsname is empty\n");
+               rc = -EINVAL;
+               goto err;
+       }
+
+       *ptr = '\0';
+       ++ptr;
+
+       if (strlen(ptr) == 0) {
+               fprintf(stderr, "poolname is empty\n");
+               rc = -EINVAL;
+               goto err;
+       }
+
+       strncpy(poolname, ptr, LOV_MAXPOOLNAME);
+       poolname[LOV_MAXPOOLNAME] = '\0';
+       return 0;
 
 err:
-        fprintf(stderr, "argument %s must be <fsname>.<poolname>\n", arg);
-        return rc;
+       fprintf(stderr, "argument %s must be <fsname>.<poolname>\n", arg);
+       return rc;
 }
 
 int jt_pool_cmd(int argc, char **argv)
@@ -3515,8 +4106,8 @@ int jt_pool_cmd(int argc, char **argv)
                                 free(array);
                         if (cmds)
                                 free(cmds);
-                        if (ostnames_buf);
-                                free(ostnames_buf);
+                       if (ostnames_buf != NULL)
+                               free(ostnames_buf);
                 }
                 /* fall through */
         }
@@ -3531,33 +4122,282 @@ out:
         return rc;
 }
 
-int jt_get_obj_version(int argc, char **argv)
+static const char *barrier_status2name(enum barrier_status status)
 {
-        struct lu_fid fid;
-        struct obd_ioctl_data data;
-        __u64 version;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf, *fidstr;
-        int rc;
+       switch (status) {
+       case BS_INIT:
+               return "init";
+       case BS_FREEZING_P1:
+               return "freezing_p1";
+       case BS_FREEZING_P2:
+               return "freezing_p2";
+       case BS_FROZEN:
+               return "frozen";
+       case BS_THAWING:
+               return "thawing";
+       case BS_THAWED:
+               return "thawed";
+       case BS_FAILED:
+               return "failed";
+       case BS_EXPIRED:
+               return "expired";
+       case BS_RESCAN:
+               return "rescan";
+       default:
+               return "unknown";
+       }
+}
 
-        if (argc != 2)
-                return CMD_HELP;
+int jt_barrier_freeze(int argc, char **argv)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct barrier_ctl bc;
+       int rc;
+
+       if (argc < 2 || argc > 3)
+               return CMD_HELP;
+
+       memset(&data, 0, sizeof(data));
+       rc = data.ioc_dev = get_mgs_device();
+       if (rc < 0)
+               return rc;
+
+       memset(&bc, 0, sizeof(bc));
+       bc.bc_version = BARRIER_VERSION_V1;
+       bc.bc_cmd = BC_FREEZE;
+       if (argc == 3)
+               bc.bc_timeout = atoi(argv[2]);
+       if (bc.bc_timeout == 0)
+               bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT;
+
+       if (strlen(argv[1]) > 8) {
+               fprintf(stderr, "%s: fsname name %s is too long. "
+                       "It should not exceed 8.\n", argv[0], argv[1]);
+               return -EINVAL;
+       }
+
+       strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name));
+       data.ioc_inlbuf1 = (char *)&bc;
+       data.ioc_inllen1 = sizeof(bc);
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf);
+       if (rc < 0)
+               fprintf(stderr, "Fail to freeze barrier for %s: %s\n",
+                       argv[1], strerror(errno));
+
+       return rc;
+}
 
-        fidstr = argv[1];
-        while (*fidstr == '[')
-                fidstr++;
-        sscanf(fidstr, SFID, RFID(&fid));
-        if (!fid_is_sane(&fid)) {
-                fprintf(stderr, "bad FID format [%s], should be "DFID"\n",
-                        fidstr, (__u64)1, 2, 0);
-                return -EINVAL;
-        }
+int jt_barrier_thaw(int argc, char **argv)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct barrier_ctl bc;
+       int rc;
+
+       if (argc != 2)
+               return CMD_HELP;
+
+       memset(&data, 0, sizeof(data));
+       rc = data.ioc_dev = get_mgs_device();
+       if (rc < 0)
+               return rc;
+
+       memset(&bc, 0, sizeof(bc));
+       bc.bc_version = BARRIER_VERSION_V1;
+       bc.bc_cmd = BC_THAW;
+
+       if (strlen(argv[1]) > 8) {
+               fprintf(stderr, "fsname name %s is too long. "
+                       "It should not exceed 8.\n", argv[1]);
+               return -EINVAL;
+       }
+
+       strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name));
+       data.ioc_inlbuf1 = (char *)&bc;
+       data.ioc_inllen1 = sizeof(bc);
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf);
+       if (rc < 0)
+               fprintf(stderr, "Fail to thaw barrier for %s: %s\n",
+                       argv[1], strerror(errno));
+
+       return rc;
+}
 
-        memset(&data, 0, sizeof data);
-        data.ioc_dev = cur_device;
-        data.ioc_inlbuf1 = (char *) &fid;
-        data.ioc_inllen1 = sizeof fid;
-        data.ioc_inlbuf2 = (char *) &version;
-        data.ioc_inllen2 = sizeof version;
+int __jt_barrier_stat(int argc, char **argv, struct barrier_ctl *bc)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       int rc;
+
+       memset(&data, 0, sizeof(data));
+       rc = data.ioc_dev = get_mgs_device();
+       if (rc < 0)
+               return rc;
+
+       memset(bc, 0, sizeof(*bc));
+       bc->bc_version = BARRIER_VERSION_V1;
+       bc->bc_cmd = BC_STAT;
+       strncpy(bc->bc_name, argv[1], sizeof(bc->bc_name));
+       data.ioc_inlbuf1 = (char *)bc;
+       data.ioc_inllen1 = sizeof(*bc);
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf);
+       if (rc < 0)
+               fprintf(stderr, "Fail to query barrier for %s: %s\n",
+                       argv[1], strerror(errno));
+       else
+               obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+
+       return rc;
+}
+
+int jt_barrier_stat(int argc, char **argv)
+{
+       struct barrier_ctl bc;
+       int rc;
+
+       if (argc != 2)
+               return CMD_HELP;
+
+       if (strlen(argv[1]) > 8) {
+               fprintf(stderr, "fsname name %s is too long. "
+                       "It should not exceed 8.\n", argv[1]);
+               return -EINVAL;
+       }
+
+       rc = __jt_barrier_stat(argc, argv, &bc);
+       if (!rc) {
+               printf("The barrier for %s is in '%s'\n",
+                      argv[1], barrier_status2name(bc.bc_status));
+               if (bc.bc_status == BS_FREEZING_P1 ||
+                   bc.bc_status == BS_FREEZING_P2 ||
+                   bc.bc_status == BS_FROZEN)
+                       printf("The barrier will be expired after %d "
+                              "seconds\n", bc.bc_timeout);
+       }
+
+       return rc;
+}
+
+int jt_barrier_rescan(int argc, char **argv)
+{
+       struct obd_ioctl_data data;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct barrier_ctl bc;
+       int rc;
+
+       if (argc < 2 || argc > 3)
+               return CMD_HELP;
+
+       memset(&data, 0, sizeof(data));
+       rc = data.ioc_dev = get_mgs_device();
+       if (rc < 0)
+               return rc;
+
+       memset(&bc, 0, sizeof(bc));
+       bc.bc_version = BARRIER_VERSION_V1;
+       bc.bc_cmd = BC_RESCAN;
+       if (argc == 3)
+               bc.bc_timeout = atoi(argv[2]);
+       if (bc.bc_timeout == 0)
+               bc.bc_timeout = BARRIER_TIMEOUT_DEFAULT;
+
+       if (strlen(argv[1]) > 8) {
+               fprintf(stderr, "fsname name %s is too long. "
+                       "It should not exceed 8.\n", argv[1]);
+               return -EINVAL;
+       }
+
+       strncpy(bc.bc_name, argv[1], sizeof(bc.bc_name));
+       data.ioc_inlbuf1 = (char *)&bc;
+       data.ioc_inllen1 = sizeof(bc);
+       memset(buf, 0, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
+               return rc;
+       }
+
+       rc = l_ioctl(OBD_DEV_ID, OBD_IOC_BARRIER, buf);
+       if (rc < 0) {
+               fprintf(stderr, "Fail to rescan barrier bitmap for %s: %s\n",
+                       argv[1], strerror(errno));
+       } else {
+               obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               printf("%u of %u MDT(s) in the filesystem %s are inactive\n",
+                      bc.bc_absence, bc.bc_total, argv[1]);
+       }
+
+       return rc;
+}
+
+int jt_get_obj_version(int argc, char **argv)
+{
+       struct lu_fid fid;
+       struct obd_ioctl_data data;
+       __u64 version, id = ULLONG_MAX, group = ULLONG_MAX;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf, *fidstr;
+       int rc, c;
+
+       while ((c = getopt(argc, argv, "i:g:")) != -1) {
+               switch (c) {
+               case 'i':
+                       id = strtoull(optarg, NULL, 0);
+                       break;
+               case 'g':
+                       group = strtoull(optarg, NULL, 0);
+                       break;
+               default:
+                       return CMD_HELP;
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (!(id != ULLONG_MAX && group != ULLONG_MAX && argc == 0) &&
+           !(id == ULLONG_MAX && group == ULLONG_MAX && argc == 1))
+               return CMD_HELP;
+
+       memset(&data, 0, sizeof data);
+       data.ioc_dev = cur_device;
+       if (argc == 1) {
+               fidstr = *argv;
+               while (*fidstr == '[')
+                       fidstr++;
+               sscanf(fidstr, SFID, RFID(&fid));
+
+               data.ioc_inlbuf1 = (char *) &fid;
+               data.ioc_inllen1 = sizeof fid;
+       } else {
+               data.ioc_inlbuf3 = (char *) &id;
+               data.ioc_inllen3 = sizeof id;
+               data.ioc_inlbuf4 = (char *) &group;
+               data.ioc_inllen4 = sizeof group;
+       }
+       data.ioc_inlbuf2 = (char *) &version;
+       data.ioc_inllen2 = sizeof version;
 
         memset(buf, 0, sizeof *buf);
         rc = obd_ioctl_pack(&data, &buf, sizeof rawbuf);
@@ -3575,142 +4415,110 @@ int jt_get_obj_version(int argc, char **argv)
         }
 
         obd_ioctl_unpack(&data, buf, sizeof rawbuf);
-        printf(LPX64"\n", version);
+       printf("%#jx\n", (uintmax_t)version);
         return 0;
 }
 
-void  llapi_ping_target(char *obd_type, char *obd_name,
-                        char *obd_uuid, void *args)
-{
-        int  rc;
-        struct obd_ioctl_data data;
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_inlbuf4 = obd_name;
-        data.ioc_inllen4 = strlen(obd_name) + 1;
-        data.ioc_dev = OBD_DEV_BY_DEVNAME;
-        memset(buf, 0, sizeof(rawbuf));
-        if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
-                fprintf(stderr, "error: invalid ioctl\n");
-                return;
-        }
-        rc = l_ioctl(OBD_DEV_ID, OBD_IOC_PING_TARGET, buf);
-        if (rc)
-                rc = errno;
-        if (rc == ENOTCONN || rc == ESHUTDOWN) {
-                printf("%s: INACTIVE\n", obd_name);
-        } else if (rc) {
-                printf("%s: check error: %s\n",
-                        obd_name, strerror(errno));
-        } else {
-                printf("%s: active\n", obd_name);
-        }
-}
-
 int jt_changelog_register(int argc, char **argv)
 {
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        struct obd_ioctl_data data;
-        char devname[30];
-        int rc;
-
-        if (argc > 2)
-                return CMD_HELP;
-        else if (argc == 2 && strcmp(argv[1], "-n") != 0)
-                return CMD_HELP;
-        if (cur_device < 0)
-                return CMD_HELP;
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-               return rc;
-        }
-
-        rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf);
-        if (rc < 0) {
-                fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
-                        strerror(rc = errno));
-                return rc;
-        }
-        obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
-
-        if (data.ioc_u32_1 == 0) {
-                fprintf(stderr, "received invalid userid!\n");
-                return EPROTO;
-        }
-
-        if (lcfg_get_devname() != NULL)
-                strcpy(devname, lcfg_get_devname());
-        else
-                sprintf(devname, "dev %d", cur_device);
-
-        if (argc == 2)
-                /* -n means bare name */
-                printf(CHANGELOG_USER_PREFIX"%u\n", data.ioc_u32_1);
-        else
-                printf("%s: Registered changelog userid '"CHANGELOG_USER_PREFIX
-                       "%u'\n", devname, data.ioc_u32_1);
-        return 0;
+       struct obd_ioctl_data    data = { 0 };
+       char                     rawbuf[MAX_IOC_BUFLEN] = "";
+       char                    *buf = rawbuf;
+       char                    *device = lcfg_get_devname();
+       bool                     print_name_only = false;
+       int                      c;
+       int                      rc;
+
+       if (argc > 2)
+               return CMD_HELP;
+
+       while ((c = getopt(argc, argv, "hn")) >= 0) {
+               switch (c) {
+               case 'n':
+                       print_name_only = true;
+                       break;
+               case 'h':
+               default:
+                       return CMD_HELP;
+               }
+       }
+
+       if (cur_device < 0 || device == NULL)
+               return CMD_HELP;
+
+       data.ioc_dev = cur_device;
+
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc < 0) {
+               fprintf(stderr, "error: %s: cannot pack ioctl: %s\n",
+                       jt_cmdname(argv[0]), strerror(-rc));
+              return rc;
+       }
+
+       rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf);
+       if (rc < 0) {
+               rc = -errno;
+               fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+                       strerror(-rc));
+               return rc;
+       }
+
+       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+
+       if (data.ioc_u32_1 == 0) {
+               fprintf(stderr, "received invalid userid!\n");
+               return -EPROTO;
+       }
+
+       if (print_name_only)
+               printf("%s%u\n", CHANGELOG_USER_PREFIX, data.ioc_u32_1);
+       else
+               printf("%s: Registered changelog userid '%s%u'\n",
+                      device, CHANGELOG_USER_PREFIX, data.ioc_u32_1);
+
+       return 0;
 }
 
 int jt_changelog_deregister(int argc, char **argv)
 {
-        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
-        struct obd_ioctl_data data;
-        char devname[30];
-        int id, rc;
-
-        if (argc != 2 || cur_device < 0)
-                return CMD_HELP;
-
-        id = strtol(argv[1] + strlen(CHANGELOG_USER_PREFIX), NULL, 10);
-        if ((id == 0) || (strncmp(argv[1], CHANGELOG_USER_PREFIX,
-                                  strlen(CHANGELOG_USER_PREFIX)) != 0)) {
-                fprintf(stderr, "expecting id of the form '"
-                        CHANGELOG_USER_PREFIX"<num>'; got '%s'\n", argv[1]);
-                return CMD_HELP;
-        }
-
-        memset(&data, 0, sizeof(data));
-        data.ioc_dev = cur_device;
-        data.ioc_u32_1 = id;
-        memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
-        if (rc) {
-                fprintf(stderr, "error: %s: invalid ioctl\n",
-                        jt_cmdname(argv[0]));
-                return rc;
-        }
-
-        rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf);
-        if (rc < 0) {
-                fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
-                        strerror(rc = errno));
-                return rc;
-        }
-        obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
-
-        if (data.ioc_u32_1 != id) {
-                fprintf(stderr, "No changelog user '%s'.  Blocking user"
-                        " is '"CHANGELOG_USER_PREFIX"%d'.\n", argv[1],
-                        data.ioc_u32_1);
-                return ENOENT;
-        }
-
-        if (lcfg_get_devname() != NULL)
-                strcpy(devname, lcfg_get_devname());
-        else
-                sprintf(devname, "dev %d", cur_device);
-
-        printf("%s: Deregistered changelog user '"CHANGELOG_USER_PREFIX"%d'\n",
-               devname, data.ioc_u32_1);
-        return 0;
+       struct obd_ioctl_data    data = { 0 };
+       char                     rawbuf[MAX_IOC_BUFLEN] = "";
+       char                    *buf = rawbuf;
+       char                    *device = lcfg_get_devname();
+       int                      id;
+       int                      rc;
+
+       if (argc != 2 || cur_device < 0 || device == NULL)
+               return CMD_HELP;
+
+       rc = sscanf(argv[1], CHANGELOG_USER_PREFIX"%d", &id);
+       if (rc != 1 || id <= 0) {
+               fprintf(stderr,
+                       "error: %s: expected id of the form %s<num> got '%s'\n",
+                       jt_cmdname(argv[0]), CHANGELOG_USER_PREFIX, argv[1]);
+               return CMD_HELP;
+       }
+
+       data.ioc_dev = cur_device;
+       data.ioc_u32_1 = id;
+
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc < 0) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf);
+       if (rc < 0) {
+               fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+                       strerror(rc = errno));
+               return rc;
+       }
+
+       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       printf("%s: Deregistered changelog user '%s%u'\n",
+              device, CHANGELOG_USER_PREFIX, data.ioc_u32_1);
+
+       return 0;
 }
-
-