Whamcloud - gitweb
LU-2444 build: fix 'error handling' issues
[fs/lustre-release.git] / lustre / utils / obd.c
index af2fccb..e6b9f11 100644 (file)
@@ -1,62 +1,75 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
- *   Author: Andreas Dilger <adilger@clusterfs.com>
- *   Author: Robert Read <rread@clusterfs.com>
+ * 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
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * Copyright (c) 2011, 2012, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * lustre/utils/obd.c
  *
+ * Author: Peter J. Braam <braam@clusterfs.com>
+ * Author: Phil Schwan <phil@clusterfs.com>
+ * Author: Andreas Dilger <adilger@clusterfs.com>
+ * Author: Robert Read <rread@clusterfs.com>
  */
 
-#include <stdlib.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
+#include <sys/un.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <signal.h>
+
 #include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <glob.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "obdctl.h"
 
 #include <obd.h>          /* for struct lov_stripe_md */
 #include <lustre/lustre_build_version.h>
 
-#include <unistd.h>
-#include <sys/un.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <string.h>
-
-#ifdef HAVE_ASM_PAGE_H
-#include <asm/page.h>           /* needed for PAGE_SIZE - rread */
-#endif
-
-#include <obd_class.h>
 #include <lnet/lnetctl.h>
-#include "parser.h"
-#include "platform.h"
-#include <stdio.h>
+#include <libcfs/libcfsutil.h>
+#include <lustre/lustreapi.h>
 
 #define MAX_STRING_SIZE 128
 #define DEVICES_LIST "/proc/fs/lustre/devices"
 #include <sys/shm.h>
 #include <pthread.h>
 
-#define MAX_THREADS 1024
-
+#define MAX_THREADS 4096
+#define MAX_BASE_ID 0xffffffff
 struct shared_data {
-        __u64 counters[MAX_THREADS];
-        __u64 offsets[MAX_THREADS];
-        int   running;
-        int   barrier;
-        int   stop;
         l_mutex_t mutex;
         l_cond_t  cond;
+        int       stopping;
+        struct {
+                __u64 counters[MAX_THREADS];
+                __u64 offsets[MAX_THREADS];
+                int   thr_running;
+                int   start_barrier;
+                int   stop_barrier;
+                struct timeval start_time;
+                struct timeval end_time;
+        } body;
 };
 
 static struct shared_data *shared_data;
@@ -89,18 +107,13 @@ const int thread = 0;
 const int nthreads = 1;
 #endif
 
-static char rawbuf[8192];
-static char *buf = rawbuf;
-static int max = sizeof(rawbuf);
-
 static int cur_device = -1;
 
-#define MAX_STRIPES     170
-struct lov_oinfo lov_oinfos[MAX_STRIPES];
+struct lov_oinfo lov_oinfos[LOV_MAX_STRIPE_COUNT];
 
 struct lsm_buffer {
         struct lov_stripe_md lsm;
-        struct lov_oinfo *ptrs[MAX_STRIPES];
+        struct lov_oinfo *ptrs[LOV_MAX_STRIPE_COUNT];
 } lsm_buffer;
 
 static int l2_ioctl(int dev_id, int opc, void *buf)
@@ -108,42 +121,25 @@ static int l2_ioctl(int dev_id, int opc, void *buf)
         return l_ioctl(dev_id, opc, buf);
 }
 
-#define IOC_INIT(data)                                                  \
-do {                                                                    \
-        memset(&data, 0, sizeof(data));                                 \
-        data.ioc_dev = cur_device;                                      \
-} while (0)
-
-#define IOC_PACK(func, data)                                            \
-do {                                                                    \
-        memset(buf, 0, sizeof(rawbuf));                                 \
-        if (obd_ioctl_pack(&data, &buf, max)) {                         \
-                fprintf(stderr, "error: %s: invalid ioctl\n",           \
-                        jt_cmdname(func));                                 \
-                return -2;                                              \
-        }                                                               \
-} while (0)
-
-#define IOC_UNPACK(func, data)                                          \
-do {                                                                    \
-        if (obd_ioctl_unpack(&data, buf, max)) {                        \
-                fprintf(stderr, "error: %s: invalid reply\n",           \
-                        jt_cmdname(func));                                 \
-                return -2;                                              \
-        }                                                               \
-} while (0)
-
 int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         data.ioc_type = LUSTRE_CFG_TYPE;
         data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
                                         lcfg->lcfg_buflens);
         data.ioc_pbuf1 = (void *)lcfg;
-        IOC_PACK(func, data);
+        memset(buf, 0, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        if (rc) {
+                fprintf(stderr, "error: %s: invalid ioctl\n",
+                        jt_cmdname(func));
+                return rc;
+        }
 
         rc =  l_ioctl(dev_id, OBD_IOC_PROCESS_CFG, buf);
 
@@ -152,42 +148,55 @@ int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg)
 
 static int do_device(char *func, char *devname);
 
-int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg)
+static int get_mgs_device()
 {
-        struct obd_ioctl_data data;
-        static int mgs_device = -1;
         char mgs[] = "$MGS";
-        int rc;
+        static int mgs_device = -1;
 
-        /* Always operates on MGS dev */
         if (mgs_device == -1) {
+                int rc;
                 do_disconnect(NULL, 1);
                 rc = do_device("mgsioc", mgs);
                 if (rc) {
+                        fprintf(stderr,
+                                "This command must be run on the MGS.\n");
                         errno = ENODEV;
                         return -1;
                 }
                 mgs_device = cur_device;
         }
+        return mgs_device;
+}
+
+/* Returns -1 on error with errno set */
+int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg)
+{
+        struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+        int rc;
 
-        IOC_INIT(data);
-        data.ioc_dev = mgs_device;
+        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;
-        IOC_PACK(func, data);
-
-        rc =  l_ioctl(dev_id, OBD_IOC_PARAM, buf);
-
-        if (rc == ENODEV) 
-                fprintf(stderr, "Is the MGS running on this node?\n");
-        if (rc == ENOSYS) 
-                fprintf(stderr, "Make sure cfg_device is set first.\n");
-        if (rc == EINVAL) 
-                fprintf(stderr, "cfg_device should be of the form "
-                        "'lustre-MDT0000'\n");
+        memset(buf, 0, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        if (rc) {
+                fprintf(stderr, "error: %s: invalid ioctl\n",
+                        jt_cmdname(func));
+                return rc;
+        }
 
+        rc = l_ioctl(dev_id, OBD_IOC_PARAM, buf);
+out:
+        if (rc) {
+                if (errno == ENOSYS)
+                        fprintf(stderr, "Make sure cfg_device is set first.\n");
+        }
         return rc;
 }
 
@@ -199,7 +208,7 @@ char *obdo_print(struct obdo *obd)
                 "\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_gr, obd->o_atime, obd->o_mtime, obd->o_ctime,
+                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);
@@ -214,18 +223,30 @@ char *obdo_print(struct obdo *obd)
 static int do_name2dev(char *func, char *name)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
-
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         data.ioc_inllen1 = strlen(name) + 1;
         data.ioc_inlbuf1 = name;
 
-        IOC_PACK(func, data);
+        memset(buf, 0, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc < 0) {
+                fprintf(stderr, "error: %s: invalid ioctl\n",
+                        jt_cmdname(func));
+               return -rc;
+        }
         rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
         if (rc < 0)
                 return errno;
-        IOC_UNPACK(func, data);
+        rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+        if (rc) {
+                fprintf(stderr, "error: %s: invalid reply\n",
+                        jt_cmdname(func));
+                return rc;
+        }
 
         return data.ioc_dev + N2D_OFF;
 }
@@ -244,7 +265,7 @@ int parse_devname(char *func, char *name)
         if (isdigit(name[0])) {
                 ret = strtoul(name, NULL, 0);
         } else {
-                if (name[0] == '$' || name[0] == '%') 
+                if (name[0] == '$' || name[0] == '%')
                         name++;
                 rc = do_name2dev(func, name);
                 if (rc >= N2D_OFF) {
@@ -252,7 +273,7 @@ int parse_devname(char *func, char *name)
                         // printf("Name %s is device %d\n", name, ret);
                 } else {
                         fprintf(stderr, "No device found for name %s: %s\n",
-                               name, strerror(rc));
+                                name, strerror(rc));
                 }
         }
         return ret;
@@ -411,15 +432,19 @@ int do_disconnect(char *func, int verbose)
 }
 
 #ifdef MAX_THREADS
-static void shmem_setup(void)
+static int shmem_setup(void)
 {
-        /* Create new segment */
-        int shmid = shmget(IPC_PRIVATE, sizeof(*shared_data), 0600);
+        pthread_mutexattr_t mattr;
+        pthread_condattr_t  cattr;
+        int                 rc;
+        int                 shmid;
 
+        /* Create new segment */
+        shmid = shmget(IPC_PRIVATE, sizeof(*shared_data), 0600);
         if (shmid == -1) {
                 fprintf(stderr, "Can't create shared data: %s\n",
                         strerror(errno));
-                return;
+                return errno;
         }
 
         /* Attatch to new segment */
@@ -429,7 +454,7 @@ static void shmem_setup(void)
                 fprintf(stderr, "Can't attach shared data: %s\n",
                         strerror(errno));
                 shared_data = NULL;
-                return;
+                return errno;
         }
 
         /* Mark segment as destroyed, so it will disappear when we exit.
@@ -438,45 +463,103 @@ static void shmem_setup(void)
         if (shmctl(shmid, IPC_RMID, NULL) == -1) {
                 fprintf(stderr, "Can't destroy shared data: %s\n",
                         strerror(errno));
+                return errno;
+        }
+
+        pthread_mutexattr_init(&mattr);
+        pthread_condattr_init(&cattr);
+
+        rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
+        if (rc != 0) {
+                fprintf(stderr, "Can't set shared mutex attr\n");
+                return rc;
+        }
+
+        rc = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
+        if (rc != 0) {
+                fprintf(stderr, "Can't set shared cond attr\n");
+                return rc;
         }
+
+        pthread_mutex_init(&shared_data->mutex, &mattr);
+        pthread_cond_init(&shared_data->cond, &cattr);
+
+        pthread_mutexattr_destroy(&mattr);
+        pthread_condattr_destroy(&cattr);
+
+        return 0;
 }
 
 static inline void shmem_lock(void)
-{ 
+{
         l_mutex_lock(&shared_data->mutex);
 }
 
 static inline void shmem_unlock(void)
-{ 
+{
         l_mutex_unlock(&shared_data->mutex);
 }
 
+static inline void shmem_wait(void)
+{
+        l_cond_wait(&shared_data->cond, &shared_data->mutex);
+}
+
+static inline void shmem_wakeup_all(void)
+{
+        l_cond_broadcast(&shared_data->cond);
+}
+
 static inline void shmem_reset(int total_threads)
 {
         if (shared_data == NULL)
                 return;
 
-        memset(shared_data, 0, sizeof(*shared_data));
-        l_mutex_init(&shared_data->mutex);
-        l_cond_init(&shared_data->cond);
+        memset(&shared_data->body, 0, sizeof(shared_data->body));
         memset(counter_snapshot, 0, sizeof(counter_snapshot));
         prev_valid = 0;
-        shared_data->barrier = total_threads;
+        shared_data->stopping = 0;
+        shared_data->body.start_barrier = total_threads;
+        shared_data->body.stop_barrier = total_threads;
 }
 
-static inline void shmem_bump(void)
+static inline void shmem_bump(__u32 counter)
 {
-        static int bumped_running;
+        static bool running_not_bumped = true;
 
         if (shared_data == NULL || thread <= 0 || thread > MAX_THREADS)
                 return;
 
         shmem_lock();
-        shared_data->counters[thread - 1]++;
-        if (!bumped_running)
-                shared_data->running++;
+        shared_data->body.counters[thread - 1] += counter;
+        if (running_not_bumped) {
+                shared_data->body.thr_running++;
+                running_not_bumped = false;
+        }
+        shmem_unlock();
+}
+
+static void shmem_total(int total_threads)
+{
+        __u64 total = 0;
+        double secs;
+        int i;
+
+        if (shared_data == NULL || total_threads > MAX_THREADS)
+                return;
+
+        shmem_lock();
+        for (i = 0; i < total_threads; i++)
+                total += shared_data->body.counters[i];
+
+        secs = difftime(&shared_data->body.end_time,
+                        &shared_data->body.start_time);
         shmem_unlock();
-        bumped_running = 1;
+
+        printf("Total: total "LPU64" threads %d sec %f %f/second\n",
+               total, total_threads, secs, total / secs);
+
+        return;
 }
 
 static void shmem_snap(int total_threads, int live_threads)
@@ -492,9 +575,9 @@ static void shmem_snap(int total_threads, int live_threads)
                 return;
 
         shmem_lock();
-        memcpy(counter_snapshot[0], shared_data->counters,
+        memcpy(counter_snapshot[0], shared_data->body.counters,
                total_threads * sizeof(counter_snapshot[0][0]));
-        running = shared_data->running;
+        running = shared_data->body.thr_running;
         shmem_unlock();
 
         gettimeofday(&this_time, NULL);
@@ -509,45 +592,72 @@ static void shmem_snap(int total_threads, int live_threads)
                 }
         }
 
-        secs = (this_time.tv_sec + this_time.tv_usec / 1000000.0) -
-               (prev_time.tv_sec + prev_time.tv_usec / 1000000.0);
-
-        if (prev_valid && 
-            live_threads == total_threads &&
-            secs > 0.0)                    /* someone screwed with the time? */
-                printf("%d/%d Total: %f/second\n", non_zero, total_threads, total / secs);
+        secs = difftime(&this_time, &prev_time);
+        if (prev_valid && secs > 1.0)    /* someone screwed with the time? */
+                printf("%d/%d Total: %f/second\n", non_zero, total_threads,
+                       total / secs);
 
         memcpy(counter_snapshot[1], counter_snapshot[0],
                total_threads * sizeof(counter_snapshot[0][0]));
         prev_time = this_time;
-        if (!prev_valid && 
+        if (!prev_valid &&
             running == total_threads)
                 prev_valid = 1;
 }
 
-static void shmem_stop(void) 
+static void shmem_stop(void)
+{
+        if (shared_data == NULL)
+                return;
+
+        shared_data->stopping = 1;
+}
+
+static void shmem_cleanup(void)
 {
         if (shared_data == NULL)
                 return;
-        
-        shared_data->stop = 1;
+
+        shmem_stop();
+
+        pthread_mutex_destroy(&shared_data->mutex);
+        pthread_cond_destroy(&shared_data->cond);
 }
 
 static int shmem_running(void)
 {
-        return (shared_data == NULL ||
-                !shared_data->stop);
+        return (shared_data == NULL || !shared_data->stopping);
+}
+
+static void shmem_end_time_locked(void)
+{
+        shared_data->body.stop_barrier--;
+        if (shared_data->body.stop_barrier == 0)
+                gettimeofday(&shared_data->body.end_time, NULL);
+}
+
+static void shmem_start_time_locked(void)
+{
+        shared_data->body.start_barrier--;
+        if (shared_data->body.start_barrier == 0) {
+                shmem_wakeup_all();
+                gettimeofday(&shared_data->body.start_time, NULL);
+        } else {
+                shmem_wait();
+        }
 }
+
 #else
-static void shmem_setup(void)
+static int shmem_setup(void)
 {
+        return 0;
 }
 
 static inline void shmem_reset(int total_threads)
 {
 }
 
-static inline void shmem_bump(void)
+static inline void shmem_bump(__u32 counters)
 {
 }
 
@@ -559,7 +669,7 @@ static void shmem_unlock()
 {
 }
 
-static void shmem_stop(void)
+static void shmem_cleanup(void)
 {
 }
 
@@ -576,7 +686,7 @@ static int do_device(char *func, char *devname)
         int dev;
 
         dev = parse_devname(func, devname);
-        if (dev < 0) 
+        if (dev < 0)
                 return -1;
 
         lcfg_set_devname(devname);
@@ -595,7 +705,7 @@ int jt_obd_device(int argc, char **argv)
 
         if (argc > 2)
                 return CMD_HELP;
-        
+
         if (argc == 1) {
                 printf("current device is %d - %s\n",
                        cur_device, lcfg_get_devname() ? : "not set");
@@ -603,7 +713,7 @@ int jt_obd_device(int argc, char **argv)
         }
         rc = do_device("device", argv[1]);
         return rc;
-}                     
+}
 
 int jt_opt_device(int argc, char **argv)
 {
@@ -670,11 +780,11 @@ int jt_opt_threads(int argc, char **argv)
                 for (i = 5; i < argc; i++)
                         snprintf(cmdstr + strlen(cmdstr), sizeof(cmdstr),
                                  " %s", argv[i]);
-                
+
                 printf("%s: starting %ld threads on device %s running %s\n",
                        argv[0], threads, argv[3], cmdstr);
         }
-        
+
         shmem_reset(threads);
 
         sigemptyset(&sigset);
@@ -683,7 +793,7 @@ int jt_opt_threads(int argc, char **argv)
         sigprocmask(SIG_BLOCK, &sigset, &saveset);
 
         nthreads = threads;
-             
+
         for (i = 1, next_thread = verbose; i <= threads; i++) {
                 rc = fork();
                 if (rc < 0) {
@@ -695,7 +805,7 @@ int jt_opt_threads(int argc, char **argv)
 
                         thread = i;
                         argv[2] = "--device";
-                        return jt_opt_device(argc - 2, argv + 2);
+                        exit(jt_opt_device(argc - 2, argv + 2));
                 } else if (be_verbose(verbose, NULL, i, &next_thread, threads))
                         printf("%s: thread #%d (PID %d) started\n",
                                argv[0], i, rc);
@@ -709,7 +819,7 @@ int jt_opt_threads(int argc, char **argv)
                 sigemptyset(&sigact.sa_mask);
                 sigact.sa_handler = parent_sighandler;
                 sigact.sa_flags = 0;
-                
+
                 sigaction(SIGALRM, &sigact, &saveact1);
                 sigaction(SIGCHLD, &sigact, &saveact2);
 
@@ -727,7 +837,7 @@ int jt_opt_threads(int argc, char **argv)
                                 ret = waitpid(0, &status, WNOHANG);
                                 if (ret == 0)
                                         break;
-                                
+
                                 if (ret < 0) {
                                         fprintf(stderr, "error: %s: wait - %s\n",
                                                 argv[0], strerror(errno));
@@ -765,6 +875,7 @@ int jt_opt_threads(int argc, char **argv)
                 sigaction(SIGALRM, &saveact1, NULL);
         }
 
+        shmem_total(threads);
         sigprocmask(SIG_SETMASK, &saveset, NULL);
 
         return rc;
@@ -800,14 +911,22 @@ int jt_opt_net(int argc, char **argv)
 int jt_obd_no_transno(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        IOC_PACK(argv[0], data);
+        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_NO_TRANSNO, buf);
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
@@ -819,14 +938,22 @@ int jt_obd_no_transno(int argc, char **argv)
 int jt_obd_set_readonly(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        IOC_PACK(argv[0], data);
+        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_SET_READONLY, buf);
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
@@ -838,14 +965,22 @@ int jt_obd_set_readonly(int argc, char **argv)
 int jt_obd_abort_recovery(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        IOC_PACK(argv[0], data);
+        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_ABORT_RECOVERY, buf);
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
@@ -857,45 +992,92 @@ int jt_obd_abort_recovery(int argc, char **argv)
 int jt_get_version(int argc, char **argv)
 {
         int rc;
-        char buf[8192];
-        struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
+        char rawbuf[MAX_IOC_BUFLEN];
+        char *version;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        memset(buf, 0, sizeof(buf));
-        data->ioc_version = OBD_IOCTL_VERSION;
-        data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
-        data->ioc_inlbuf1 = buf + size_round(sizeof(*data));
-        data->ioc_len = obd_ioctl_packlen(data);
-
-        rc = l2_ioctl(OBD_DEV_ID, OBD_GET_VERSION, buf);
-        if (rc < 0)
+        rc = llapi_get_version(rawbuf, MAX_IOC_BUFLEN, &version);
+        if (rc)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
-                        strerror(rc = errno));
-        else {
-                printf("Lustre version: %s\n", data->ioc_bulk);
-        }
+                        strerror(-rc));
+        else
+                printf("Lustre version: %s\n", version);
 
         printf("lctl   version: %s\n", BUILD_VERSION);
         return rc;
 }
 
+/*
+ * 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;
+
+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;
+}
+
 /* get device list by ioctl */
 int jt_obd_list_ioctl(int argc, char **argv)
 {
         int rc, index;
-        char buf[8192];
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
 
-        if (argc != 1)
+        if (argc > 2)
+                return CMD_HELP;
+        /* Just ignore a -t option.  Only supported with /proc. */
+        else if (argc == 2 && strcmp(argv[1], "-t") != 0)
                 return CMD_HELP;
 
         for (index = 0;; index++) {
-                memset(buf, 0, sizeof(buf));
+                memset(buf, 0, sizeof(rawbuf));
                 data->ioc_version = OBD_IOCTL_VERSION;
-                data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
-                data->ioc_inlbuf1 = buf + size_round(sizeof(*data));
+                data->ioc_inllen1 =
+                        sizeof(rawbuf) - cfs_size_round(sizeof(*data));
+                data->ioc_inlbuf1 = buf + cfs_size_round(sizeof(*data));
                 data->ioc_len = obd_ioctl_packlen(data);
                 data->ioc_count = index;
 
@@ -905,13 +1087,12 @@ int jt_obd_list_ioctl(int argc, char **argv)
                 printf("%s\n", (char *)data->ioc_bulk);
         }
         if (rc != 0) {
-                if (errno == ENOENT) 
+                if (errno == ENOENT)
                         /* no device or the last device */
                         rc = 0;
-                else 
+                else
                         fprintf(stderr, "Error getting device list: %s: "
-                                        "check dmesg.\n",
-                                        strerror(errno));
+                                "check dmesg.\n", strerror(errno));
         }
         return rc;
 }
@@ -921,9 +1102,16 @@ int jt_obd_list(int argc, char **argv)
         int rc;
         char buf[MAX_STRING_SIZE];
         FILE *fp = NULL;
+        int print_obd = 0;
 
-        if (argc != 1)
+        if (argc > 2)
                 return CMD_HELP;
+        else if (argc == 2) {
+                if (strcmp(argv[1], "-t") == 0)
+                        print_obd = 1;
+                else
+                        return CMD_HELP;
+        }
 
         fp = fopen(DEVICES_LIST, "r");
         if (fp == NULL) {
@@ -933,91 +1121,492 @@ int jt_obd_list(int argc, char **argv)
         }
 
         while (fgets(buf, sizeof(buf), fp) != NULL)
-                printf("%s", buf);
+                if (print_obd)
+                        print_obd_line(buf);
+                else
+                        printf("%s", buf);
 
         fclose(fp);
         return 0;
 }
 
+struct jt_fid_space {
+        obd_seq jt_seq;
+        obd_id  jt_id;
+        int     jt_width;
+};
 
+int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid,
+                      __u64 *count)
+{
+        int rc;
 
+        if (space->jt_seq == 0 || space->jt_id == space->jt_width) {
+                struct obd_ioctl_data  data;
+                char rawbuf[MAX_IOC_BUFLEN];
+                char *buf = rawbuf;
+                __u64 seqnr;
+                int max_count;
 
-/* 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)
-{
-        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 *end;
+                memset(&data, 0, sizeof(data));
+                data.ioc_dev = cur_device;
 
-        IOC_INIT(data);
-        if (argc < 2 || argc > 5)
-                return CMD_HELP;
+                data.ioc_pbuf1 = (char *)&seqnr;
+                data.ioc_plen1 = sizeof(seqnr);
 
-        count = strtoull(argv[1], &end, 0);
-        if (*end) {
-                fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
-                        jt_cmdname(argv[0]), argv[1]);
-                return CMD_HELP;
-        }
+                data.ioc_pbuf2 = (char *)&max_count;
+                data.ioc_plen2 = sizeof(max_count);
 
-        if (argc > 2) {
-                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;
+                memset(buf, 0, sizeof(rawbuf));
+                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                if (rc) {
+                        fprintf(stderr, "error: invalid ioctl rc = %d\n", rc);
+                        return rc;
                 }
-                if (!(mode & S_IFMT))
-                        mode |= S_IFREG;
-        }
-
-        if (argc > 3) {
-                verbose = get_verbose(argv[0], argv[3]);
-                if (verbose == BAD_VERBOSE)
-                        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;
+                rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_ECHO_ALLOC_SEQ, buf);
+                if (rc) {
+                        fprintf(stderr, "ioctl error: rc = %d\n", rc);
+                        return rc;
                 }
-                base_id = lsm_buffer.lsm.lsm_object_id;
-                valid_lsm = 1;
-        }
 
-        printf("%s: "LPD64" objects\n", jt_cmdname(argv[0]), count);
-        gettimeofday(&next_time, NULL);
-        next_time.tv_sec -= verbose;
+                space->jt_seq = *(__u64 *)data.ioc_pbuf1;
+                space->jt_width = *(int *)data.ioc_pbuf2;
+                space->jt_id = 1;
+        }
+        fid->f_seq = space->jt_seq;
+        fid->f_oid = space->jt_id;
+        fid->f_ver = 0;
 
-        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;
+        space->jt_id = min(space->jt_id + *count, space->jt_width);
 
-                if (valid_lsm) {
-                        data.ioc_plen1 = sizeof lsm_buffer;
-                        data.ioc_pbuf1 = (char *)&lsm_buffer;
-                }
+        *count = space->jt_id - fid->f_oid;
+        return 0;
+}
 
-                IOC_PACK(argv[0], data);
-                rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
-                IOC_UNPACK(argv[0], data);
-                shmem_bump();
+#define MD_STEP_COUNT 1000
+int jt_obd_md_common(int argc, char **argv, int cmd)
+{
+        struct obd_ioctl_data  data;
+        struct timeval         start;
+        struct timeval         end_time;
+        char                   rawbuf[MAX_IOC_BUFLEN];
+        char                  *buf = rawbuf;
+        int                    mode = 0000644;
+        int                    create_mode;
+        int                    rc = 0;
+        char                  *parent_basedir = NULL;
+        char                   dirname[4096];
+        int                    parent_base_id = 0;
+        int                    parent_count = 1;
+        __u64                  child_base_id = -1;
+        int                    stripe_count = 0;
+        int                    stripe_index = -1;
+        int                    count = 0;
+        char                  *end;
+        __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:",
+                                long_opts, NULL)) >= 0) {
+                switch (c) {
+                case 'b':
+                        child_base_id = strtoull(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: bad child_base_id"
+                                        " '%s'\n", jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 'c':
+                        stripe_count = strtoul(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: bad stripe count"
+                                        " '%s'\n", jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 'd':
+                        parent_basedir = optarg;
+                        break;
+                case 'D':
+                        parent_count = strtoul(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: bad parent count"
+                                        " '%s'\n", jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 'i':
+                        stripe_index = strtoul(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: bad stripe index"
+                                        " '%s'\n", jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 'm':
+                        mode = strtoul(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: bad mode '%s'\n",
+                                        jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 'n':
+                        total_count = strtoul(optarg, &end, 0);
+                        if (*end || total_count == 0) {
+                                fprintf(stderr, "%s: bad child count '%s'\n",
+                                        jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                case 't':
+                        seconds = strtoull(optarg, &end, 0);
+                        if (*end) {
+                                fprintf(stderr, "error: %s: seconds '%s'\n",
+                                        jt_cmdname(argv[0]), optarg);
+                                return CMD_HELP;
+                        }
+                        break;
+                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]);
+                        return CMD_HELP;
+                }
+        }
+
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
+        if (child_base_id == -1) {
+                if (optind >= argc)
+                        return CMD_HELP;
+                name = argv[optind];
+                total_count = 1;
+        } else {
+                if (optind < argc) {
+                        fprintf(stderr, "child_base_id and name can not"
+                                        " specified at the same time\n");
+                        return CMD_HELP;
+                }
+        }
+
+        if (stripe_count == 0 && stripe_index != -1) {
+                fprintf(stderr, "If stripe_count is 0, stripe_index can not"
+                                "be specified\n");
+                return CMD_HELP;
+        }
+
+        if (total_count == 0 && seconds == 0) {
+                fprintf(stderr, "count or seconds needs to be indicated\n");
+                return CMD_HELP;
+        }
+
+        if (parent_count <= 0) {
+                fprintf(stderr, "parent count must < 0\n");
+                return CMD_HELP;
+        }
+
+#ifdef MAX_THREADS
+        if (thread) {
+                shmem_lock();
+                /* threads interleave */
+                if (parent_base_id != -1)
+                        parent_base_id += (thread - 1) % parent_count;
+
+                if (child_base_id != -1)
+                        child_base_id +=  (thread - 1) * \
+                                          (MAX_BASE_ID / nthreads);
+
+                shmem_start_time_locked();
+                shmem_unlock();
+        }
+#endif
+        /* If parent directory is not specified, try to get the directory
+         * from name */
+        if (parent_basedir == NULL) {
+                char *last_lash;
+                if (name == NULL) {
+                        fprintf(stderr, "parent_basedir or name must be"
+                                        "indicated!\n");
+                        return CMD_HELP;
+                }
+                /*Get directory and name from name*/
+                last_lash = strrchr(name, '/');
+                if (last_lash == NULL || name[0] != '/') {
+                        fprintf(stderr, "Can not locate %s\n", name);
+                        return CMD_HELP;
+                }
+
+                if (last_lash == name) {
+                        sprintf(dirname, "%s", "/");
+                        name++;
+                } else {
+                        int namelen = (unsigned long)last_lash -
+                                      (unsigned long)name;
+                        snprintf(dirname, namelen, "%s", name);
+                }
+
+                data.ioc_pbuf1 = dirname;
+                data.ioc_plen1 = strlen(dirname);
+
+                data.ioc_pbuf2 = name;
+                data.ioc_plen2 = strlen(name);
+        } else {
+                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);
+                }
+                data.ioc_pbuf1 = dirname;
+                data.ioc_plen1 = strlen(dirname);
+        }
+
+        if (cmd == ECHO_MD_MKDIR || cmd == ECHO_MD_RMDIR)
+                create_mode = S_IFDIR;
+        else
+                create_mode = S_IFREG;
+
+        data.ioc_obdo1.o_mode = mode | S_IFDIR;
+        data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE |
+                                 OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
+        data.ioc_command = cmd;
+
+        gettimeofday(&start, NULL);
+        while (shmem_running()) {
+                struct lu_fid fid;
+
+                data.ioc_obdo2.o_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 |
+                                         OBD_MD_FLGROUP;
+                data.ioc_obdo2.o_misc = stripe_count;
+                data.ioc_obdo2.o_stripe_idx = stripe_index;
+
+                if (total_count > 0) {
+                        if ((total_count - count) > MD_STEP_COUNT)
+                                data.ioc_count = MD_STEP_COUNT;
+                        else
+                                data.ioc_count = total_count - count;
+                } else {
+                        data.ioc_count = MD_STEP_COUNT;
+                }
+
+                if (cmd == ECHO_MD_CREATE || cmd == ECHO_MD_MKDIR) {
+                        /*Allocate fids for the create */
+                        rc = jt_obd_alloc_fids(&fid_space, &fid,
+                                               &data.ioc_count);
+                        if (rc) {
+                                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;
+                }
+
+                child_base_id += data.ioc_count;
+                count += data.ioc_count;
+
+                memset(buf, 0, sizeof(rawbuf));
+                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                if (rc) {
+                        fprintf(stderr, "error: %s: invalid ioctl %d\n",
+                                jt_cmdname(argv[0]), rc);
+                        return rc;
+                }
+
+                rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_ECHO_MD, buf);
+                if (rc) {
+                        fprintf(stderr, "error: %s: %s\n",
+                                jt_cmdname(argv[0]), strerror(rc = errno));
+                        return rc;
+                }
+                shmem_bump(data.ioc_count);
+
+                gettimeofday(&end_time, NULL);
+                diff = difftime(&end_time, &start);
+                if (seconds > 0 && (__u64)diff > seconds)
+                        break;
+
+                if (count >= total_count && total_count > 0)
+                        break;
+        }
+
+        if (count > 0 && version) {
+                gettimeofday(&end_time, NULL);
+                diff = difftime(&end_time, &start);
+                printf("%s: %d in %.3fs (%.3f /s): %s",
+                        jt_cmdname(argv[0]), count, diff,
+                        (double)count/diff, ctime(&end_time.tv_sec));
+        }
+
+#ifdef MAX_THREADS
+        if (thread) {
+                shmem_lock();
+                shmem_end_time_locked();
+                shmem_unlock();
+        }
+#endif
+        return rc;
+}
+
+int jt_obd_test_create(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_CREATE);
+}
+
+int jt_obd_test_mkdir(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_MKDIR);
+}
+
+int jt_obd_test_destroy(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_DESTROY);
+}
+
+int jt_obd_test_rmdir(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_RMDIR);
+}
+
+int jt_obd_test_lookup(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_LOOKUP);
+}
+
+int jt_obd_test_setxattr(int argc, char **argv)
+{
+        return jt_obd_md_common(argc, argv, ECHO_MD_SETATTR);
+}
+
+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 *end;
+
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
+        if (argc < 2 || argc > 5)
+                return CMD_HELP;
+
+        count = strtoull(argv[1], &end, 0);
+        if (*end) {
+                fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
+                        jt_cmdname(argv[0]), argv[1]);
+                return CMD_HELP;
+        }
+
+        if (argc > 2) {
+                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;
+                }
+                if (!(mode & S_IFMT))
+                        mode |= S_IFREG;
+        }
+
+        if (argc > 3) {
+                verbose = get_verbose(argv[0], argv[3]);
+                if (verbose == BAD_VERBOSE)
+                        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);
+        gettimeofday(&next_time, NULL);
+        next_time.tv_sec -= verbose;
+
+        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;
+                }
+
+                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_CREATE, buf);
+                obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+                shmem_bump(1);
                 if (rc < 0) {
                         fprintf(stderr, "error: %s: #%d - %s\n",
                                 jt_cmdname(argv[0]), i, strerror(rc = errno));
@@ -1040,10 +1629,12 @@ int jt_obd_create(int argc, char **argv)
 int jt_obd_setattr(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         char *end;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         if (argc != 2)
                 return CMD_HELP;
 
@@ -1061,7 +1652,13 @@ int jt_obd_setattr(int argc, char **argv)
         }
         data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
 
-        IOC_PACK(argv[0], data);
+        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_SETATTR, buf);
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
@@ -1075,6 +1672,7 @@ int jt_obd_test_setattr(int argc, char **argv)
         struct obd_ioctl_data data;
         struct timeval start, next_time;
         __u64 i, count, next_count;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int verbose = 1;
         obd_id objid = 3;
         char *end;
@@ -1083,7 +1681,8 @@ int jt_obd_test_setattr(int argc, char **argv)
         if (argc < 2 || argc > 4)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         count = strtoull(argv[1], &end, 0);
         if (*end) {
                 fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
@@ -1122,9 +1721,15 @@ int jt_obd_test_setattr(int argc, char **argv)
                 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;
-                IOC_PACK(argv[0], data);
+                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_SETATTR, &data);
-                shmem_bump();
+                shmem_bump(1);
                 if (rc < 0) {
                         fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n",
                                 jt_cmdname(argv[0]), i, errno, strerror(rc = errno));
@@ -1158,18 +1763,20 @@ int jt_obd_destroy(int argc, char **argv)
 {
         struct obd_ioctl_data data;
         struct timeval next_time;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         __u64 count = 1, next_count;
         int verbose = 1;
         __u64 id;
         char *end;
         int rc = 0, i;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         if (argc < 2 || argc > 4)
                 return CMD_HELP;
 
         id = strtoull(argv[1], &end, 0);
-        if (*end) {
+        if (*end || id == 0 || errno != 0) {
                 fprintf(stderr, "error: %s: invalid objid '%s'\n",
                         jt_cmdname(argv[0]), argv[1]);
                 return CMD_HELP;
@@ -1199,10 +1806,16 @@ int jt_obd_destroy(int argc, char **argv)
                 data.ioc_obdo1.o_mode = S_IFREG | 0644;
                 data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
 
-                IOC_PACK(argv[0], data);
+                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_DESTROY, buf);
-                IOC_UNPACK(argv[0], data);
-                shmem_bump();
+                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));
@@ -1220,13 +1833,15 @@ int jt_obd_destroy(int argc, char **argv)
 int jt_obd_getattr(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         char *end;
         int rc;
 
         if (argc != 2)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        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",
@@ -1238,9 +1853,15 @@ int jt_obd_getattr(int argc, char **argv)
         data.ioc_obdo1.o_valid = 0xffffffff;
         printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]),data.ioc_obdo1.o_id);
 
-        IOC_PACK(argv[0], data);
+        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, buf);
-        IOC_UNPACK(argv[0], data);
+        obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -1255,6 +1876,7 @@ 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;
         int verbose = 1;
         obd_id objid = 3;
@@ -1264,7 +1886,8 @@ int jt_obd_test_getattr(int argc, char **argv)
         if (argc < 2 || argc > 4)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         count = strtoull(argv[1], &end, 0);
         if (*end) {
                 fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
@@ -1303,9 +1926,15 @@ int jt_obd_test_getattr(int argc, char **argv)
                 data.ioc_obdo1.o_id = objid;
                 data.ioc_obdo1.o_mode = S_IFREG;
                 data.ioc_obdo1.o_valid = 0xffffffff;
-                IOC_PACK(argv[0], data);
+                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();
+                shmem_bump(1);
                 if (rc < 0) {
                         fprintf(stderr, "error: %s: #"LPD64" - %d:%s\n",
                                 jt_cmdname(argv[0]), i, errno, strerror(rc = errno));
@@ -1339,12 +1968,13 @@ int jt_obd_test_getattr(int argc, char **argv)
         <r|w[r(repeat)x(noverify)]>                             mode
         <q|v|#(print interval)>                                 verbosity
         <npages[+offset]>                                       blocksize
-        <[[<interleave_threads>]t(inc obj by thread#)]obj>      object 
+        <[[<interleave_threads>]t(inc obj by thread#)]obj>      object
         [p|g<args>]                                             batch */
 int jt_obd_test_brw(int argc, char **argv)
 {
         struct obd_ioctl_data data;
         struct timeval start, next_time;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         __u64 count, next_count, len, stride, thr_offset = 0, objid = 3;
         int write = 0, verbose = 1, cmd, i, rc = 0, pages = 1;
         int offset_pages = 0;
@@ -1435,7 +2065,8 @@ int jt_obd_test_brw(int argc, char **argv)
                 }
         }
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         /* communicate the 'type' of brw test and batching to echo_client.
          * don't start.  we'd love to refactor this lctl->echo_client
@@ -1482,21 +2113,17 @@ int jt_obd_test_brw(int argc, char **argv)
                         obj_idx = (thread - 1)/nthr_per_obj;
                         objid += obj_idx;
                         stride *= nthr_per_obj;
-                        if (thread == 1)
-                                shared_data->offsets[obj_idx] = stride + thr_offset;
+                        if ((thread - 1) % nthr_per_obj == 0) {
+                                shared_data->body.offsets[obj_idx] =
+                                        stride + thr_offset;
+                        }
                         thr_offset += ((thread - 1) % nthr_per_obj) * len;
                 } else {
                         /* threads disjoint */
                         thr_offset += (thread - 1) * len;
                 }
 
-                shared_data->barrier--;
-                if (shared_data->barrier == 0)
-                        l_cond_broadcast(&shared_data->cond);
-                else
-                        l_cond_wait(&shared_data->cond,
-                                          &shared_data->mutex);
-
+                shmem_start_time_locked();
                 shmem_unlock ();
         }
 #endif
@@ -1520,9 +2147,15 @@ int jt_obd_test_brw(int argc, char **argv)
         cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ;
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
                 data.ioc_obdo1.o_valid &= ~(OBD_MD_FLBLOCKS|OBD_MD_FLGRANT);
-                IOC_PACK(argv[0], data);
+                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, cmd, buf);
-                shmem_bump();
+                shmem_bump(1);
                 if (rc) {
                         fprintf(stderr, "error: %s: #%d - %s on %s\n",
                                 jt_cmdname(argv[0]), i, strerror(rc = errno),
@@ -1536,15 +2169,16 @@ int jt_obd_test_brw(int argc, char **argv)
                                (int)(pages * getpagesize()));
                         shmem_unlock ();
                 }
-                
+
                 if (!repeat_offset) {
 #ifdef MAX_THREADS
                         if (stride == len) {
                                 data.ioc_offset += stride;
                         } else if (i < count) {
                                 shmem_lock ();
-                                data.ioc_offset = shared_data->offsets[obj_idx];
-                                shared_data->offsets[obj_idx] += len;
+                                data.ioc_offset =
+                                        shared_data->body.offsets[obj_idx];
+                                shared_data->body.offsets[obj_idx] += len;
                                 shmem_unlock ();
                         }
 #else
@@ -1572,6 +2206,13 @@ int jt_obd_test_brw(int argc, char **argv)
                                ctime(&end.tv_sec));
         }
 
+#ifdef MAX_THREADS
+        if (thread) {
+                shmem_lock();
+                shmem_end_time_locked();
+                shmem_unlock();
+        }
+#endif
         return rc;
 }
 
@@ -1580,11 +2221,13 @@ int jt_obd_lov_getconfig(int argc, char **argv)
         struct obd_ioctl_data data;
         struct lov_desc desc;
         struct obd_uuid *uuidarray;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         __u32 *obdgens;
         char *path;
         int rc, fd;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         if (argc != 2)
                 return CMD_HELP;
@@ -1602,7 +2245,6 @@ int jt_obd_lov_getconfig(int argc, char **argv)
         desc.ld_tgt_count = ((OBD_MAX_IOCTL_BUFFER-sizeof(data)-sizeof(desc)) /
                              (sizeof(*uuidarray) + sizeof(*obdgens)));
 
-
 repeat:
         uuidarray = calloc(desc.ld_tgt_count, sizeof(*uuidarray));
         if (!uuidarray) {
@@ -1619,6 +2261,7 @@ repeat:
                 goto out_uuidarray;
         }
 
+        memset(buf, 0, sizeof(rawbuf));
         data.ioc_inllen1 = sizeof(desc);
         data.ioc_inlbuf1 = (char *)&desc;
         data.ioc_inllen2 = desc.ld_tgt_count * sizeof(*uuidarray);
@@ -1626,7 +2269,7 @@ repeat:
         data.ioc_inllen3 = desc.ld_tgt_count * sizeof(*obdgens);
         data.ioc_inlbuf3 = (char *)obdgens;
 
-        if (obd_ioctl_pack(&data, &buf, max)) {
+        if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
                 rc = -EINVAL;
@@ -1645,14 +2288,17 @@ repeat:
                 __u32 *genp;
                 int i;
 
-                if (obd_ioctl_unpack(&data, buf, max)) {
+                if (obd_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
                         fprintf(stderr, "error: %s: invalid reply\n",
                                 jt_cmdname(argv[0]));
                         rc = -EINVAL;
                         goto out;
                 }
-                printf("default_stripe_count: %u\n",
-                       desc.ld_default_stripe_count);
+                if (desc.ld_default_stripe_count == (__u32)-1)
+                        printf("default_stripe_count: %d\n", -1);
+                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",
@@ -1678,10 +2324,12 @@ 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;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         if (argc > 5)
                 return CMD_HELP;
 
@@ -1698,7 +2346,13 @@ int jt_obd_ldlm_regress_start(int argc, char **argv)
                 data.ioc_inllen1 = strlen(argstring) + 1;
         }
 
-        IOC_PACK(argv[0], data);
+        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",
@@ -1710,13 +2364,22 @@ int jt_obd_ldlm_regress_start(int argc, char **argv)
 int jt_obd_ldlm_regress_stop(int argc, char **argv)
 {
         int rc;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         struct obd_ioctl_data data;
-        IOC_INIT(data);
+
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        IOC_PACK(argv[0], data);
+        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)
@@ -1728,16 +2391,24 @@ int jt_obd_ldlm_regress_stop(int argc, char **argv)
 static int do_activate(int argc, char **argv, int flag)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         if (argc != 1)
                 return CMD_HELP;
 
         /* reuse offset for 'active' */
         data.ioc_offset = flag;
 
-        IOC_PACK(argv[0], data);
+        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_OSC_SET_ACTIVE, buf);
         if (rc)
                 fprintf(stderr, "error: %s: failed: %s\n",
@@ -1746,6 +2417,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);
@@ -1759,9 +2480,11 @@ int jt_obd_activate(int argc, char **argv)
 int jt_obd_recover(int argc, char **argv)
 {
         int rc;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         struct obd_ioctl_data data;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         if (argc > 2)
                 return CMD_HELP;
 
@@ -1770,7 +2493,13 @@ int jt_obd_recover(int argc, char **argv)
                 data.ioc_inlbuf1 = argv[1];
         }
 
-        IOC_PACK(argv[0], data);
+        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_CLIENT_RECOVER, buf);
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
@@ -1783,6 +2512,7 @@ int jt_obd_recover(int argc, char **argv)
 int jt_obd_mdc_lookup(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         char *parent, *child;
         int rc, fd, verbose = 1;
 
@@ -1794,12 +2524,19 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         if (argc == 4)
                 verbose = get_verbose(argv[0], argv[3]);
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
 
         data.ioc_inllen1 = strlen(child) + 1;
         data.ioc_inlbuf1 = child;
 
-        IOC_PACK(argv[0], data);
+        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;
+        }
 
         fd = open(parent, O_RDONLY);
         if (fd < 0) {
@@ -1816,9 +2553,14 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         close(fd);
 
         if (verbose) {
-                IOC_UNPACK(argv[0], data);
-                printf("%s: mode %o uid %d gid %d\n", child,
-                       data.ioc_obdo1.o_mode, data.ioc_obdo1.o_uid,
+                rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+                if (rc) {
+                        fprintf(stderr, "error: %s: invalid reply\n",
+                                jt_cmdname(argv[0]));
+                        return rc;
+                }
+                printf("%s: mode %o uid %d gid %d\n", child,
+                       data.ioc_obdo1.o_mode, data.ioc_obdo1.o_uid,
                        data.ioc_obdo1.o_gid);
         }
 
@@ -1828,17 +2570,24 @@ int jt_obd_mdc_lookup(int argc, char **argv)
 int jt_cfg_dump_log(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
-        IOC_INIT(data);
-
         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];
 
-        IOC_PACK(argv[0], data);
+        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",
@@ -1850,15 +2599,22 @@ int jt_cfg_dump_log(int argc, char **argv)
 int jt_llog_catlist(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        IOC_INIT(data);
-        data.ioc_inllen1 = max - size_round(sizeof(data));
-        IOC_PACK(argv[0], data);
-
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
+        data.ioc_inllen1 = sizeof(rawbuf) - cfs_size_round(sizeof(data));
+        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_CATLOGLIST, buf);
         if (rc == 0)
                 fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
@@ -1872,17 +2628,25 @@ int jt_llog_catlist(int argc, char **argv)
 int jt_llog_info(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 2)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        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 = max - size_round(sizeof(data)) - 
-                size_round(data.ioc_inllen1);
-        IOC_PACK(argv[0], data);
+        data.ioc_inllen2 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
+                cfs_size_round(data.ioc_inllen1);
+        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_INFO, buf);
         if (rc == 0)
@@ -1897,12 +2661,14 @@ int jt_llog_info(int argc, char **argv)
 int jt_llog_print(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 2 && argc != 4)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         data.ioc_inllen1 = strlen(argv[1]) + 1;
         data.ioc_inlbuf1 = argv[1];
         if (argc == 4) {
@@ -1917,11 +2683,17 @@ int jt_llog_print(int argc, char **argv)
                 data.ioc_inllen3 = strlen(to) + 1;
                 data.ioc_inlbuf3 = to;
         }
-        data.ioc_inllen4 = max - size_round(sizeof(data)) -
-                size_round(data.ioc_inllen1) -
-                size_round(data.ioc_inllen2) -
-                size_round(data.ioc_inllen3);
-        IOC_PACK(argv[0], data);
+        data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
+                cfs_size_round(data.ioc_inllen1) -
+                cfs_size_round(data.ioc_inllen2) -
+                cfs_size_round(data.ioc_inllen3);
+        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_PRINT, buf);
         if (rc == 0)
@@ -1936,19 +2708,27 @@ int jt_llog_print(int argc, char **argv)
 int jt_llog_cancel(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 4)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        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];
-        IOC_PACK(argv[0], data);
+        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)
@@ -1963,12 +2743,14 @@ int jt_llog_cancel(int argc, char **argv)
 int jt_llog_check(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 2 && argc != 4)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         data.ioc_inllen1 = strlen(argv[1]) + 1;
         data.ioc_inlbuf1 = argv[1];
         if (argc == 4) {
@@ -1983,11 +2765,17 @@ int jt_llog_check(int argc, char **argv)
                 data.ioc_inllen3 = strlen(to) + 1;
                 data.ioc_inlbuf3 = to;
         }
-        data.ioc_inllen4 = max - size_round(sizeof(data)) -
-                size_round(data.ioc_inllen1) -
-                size_round(data.ioc_inllen2) -
-                size_round(data.ioc_inllen3);
-        IOC_PACK(argv[0], data);
+        data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
+                cfs_size_round(data.ioc_inllen1) -
+                cfs_size_round(data.ioc_inllen2) -
+                cfs_size_round(data.ioc_inllen3);
+        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_CHECK, buf);
         if (rc == 0)
@@ -2001,19 +2789,27 @@ int jt_llog_check(int argc, char **argv)
 int jt_llog_remove(int argc, char **argv)
 {
         struct obd_ioctl_data data;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
         int rc;
 
         if (argc != 3 && argc != 2)
                 return CMD_HELP;
 
-        IOC_INIT(data);
+        memset(&data, 0, sizeof(data));
+        data.ioc_dev = cur_device;
         data.ioc_inllen1 = strlen(argv[1]) + 1;
         data.ioc_inlbuf1 = argv[1];
         if (argc == 3){
                 data.ioc_inllen2 = strlen(argv[2]) + 1;
                 data.ioc_inlbuf2 = argv[2];
         }
-        IOC_PACK(argv[0], data);
+        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_REMOVE, buf);
         if (rc == 0) {
@@ -2028,6 +2824,205 @@ 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[])
+{
+        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;
+}
+
+static int jt_blockdev_find_module(const char *module)
+{
+        FILE *fp;
+        int found = 0;
+        char buf[1024];
+
+        fp = fopen("/proc/modules", "r");
+        if (fp == NULL)
+                return -1;
+
+        while (fgets(buf, 1024, fp) != NULL) {
+                *strchr(buf, ' ') = 0;
+                if (strcmp(module, buf) == 0) {
+                        found = 1;
+                        break;
+                }
+        }
+        fclose(fp);
+
+        return found;
+}
+
+static int jt_blockdev_probe_module(const char *module)
+{
+        char buf[1024];
+        char *argv[10];
+        int c, rc;
+
+        if (jt_blockdev_find_module(module) == 1)
+                return 0;
+
+        /* 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;
+
+        /* 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;
+}
+
+int jt_blockdev_attach(int argc, char **argv)
+{
+        int rc, fd;
+        struct stat st;
+        char *filename, *devname;
+        unsigned long dev;
+
+        if (argc != 3)
+                return CMD_HELP;
+
+        if (jt_blockdev_probe_module("llite_lloop") < 0) {
+                fprintf(stderr, "error: cannot find module llite_lloop.(k)o\n");
+                return ENOENT;
+        }
+
+        filename = argv[1];
+        devname = argv[2];
+
+        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) {
@@ -2041,10 +3036,12 @@ int obd_initialize(int argc, char **argv)
 {
         int i;
 
-        for (i = 0; i < MAX_STRIPES; i++)
+        for (i = 0; i < LOV_MAX_STRIPE_COUNT; i++)
                 lsm_buffer.lsm.lsm_oinfo[i] = lov_oinfos + i;
 
-        shmem_setup();
+        if (shmem_setup() != 0)
+                return -1;
+
         register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH,
                          OBD_DEV_MAJOR, OBD_DEV_MINOR);
 
@@ -2055,11 +3052,716 @@ void obd_finalize(int argc, char **argv)
 {
         struct sigaction sigact;
 
+       /* 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);
 
-        shmem_stop();
+        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);
+                        return -EEXIST;
+                }
+                return 0;
+        }
+        case LCFG_POOL_DEL: {
+                LASSERT(ostname == NULL);
+                if (rc == 1) {
+                        fprintf(stderr, "Pool %s.%s not empty, "
+                                "please remove all members\n",
+                                fsname, poolname);
+                        return -ENOTEMPTY;
+                }
+                return 0;
+        }
+        case LCFG_POOL_ADD: {
+                if (rc == 1) {
+                        fprintf(stderr, "OST %s is already in pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return -EEXIST;
+                }
+                rc = llapi_search_ost(fsname, NULL, ostname);
+                if (rc == 0) {
+                        fprintf(stderr, "OST %s is not part of the '%s' fs.\n",
+                                ostname, fsname);
+                        return -ENOENT;
+                }
+                return 0;
+        }
+        case LCFG_POOL_REM: {
+                if (rc == 0) {
+                        fprintf(stderr, "OST %s not found in pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return -ENOENT;
+                }
+                return 0;
+        }
+        default:
+                break;
+        } /* switch */
+        return -EINVAL;
+}
+
+/* This check only verifies that the changes have been "pushed out" to
+   the client successfully.  This involves waiting for a config update,
+   and so may fail because of problems in that code or post-command
+   network loss. So reporting a warning is appropriate, but not a failure.
+*/
+static int check_pool_cmd_result(enum lcfg_command_type cmd,
+                                 char *fsname, char *poolname,
+                                 char *ostname)
+{
+        int cpt = 10;
+        int rc = 0;
+
+        switch (cmd) {
+        case LCFG_POOL_NEW: {
+                do {
+                        rc = llapi_search_ost(fsname, poolname, NULL);
+                        if (rc == -ENODEV)
+                                return rc;
+                        if (rc < 0)
+                                sleep(2);
+                        cpt--;
+                } while ((rc < 0) && (cpt > 0));
+                if (rc >= 0) {
+                        fprintf(stderr, "Pool %s.%s created\n",
+                                fsname, poolname);
+                        return 0;
+                } else {
+                        fprintf(stderr, "Warning, pool %s.%s not found\n",
+                                fsname, poolname);
+                        return -ENOENT;
+                }
+        }
+        case LCFG_POOL_DEL: {
+                do {
+                        rc = llapi_search_ost(fsname, poolname, NULL);
+                        if (rc == -ENODEV)
+                                return rc;
+                        if (rc >= 0)
+                                sleep(2);
+                        cpt--;
+                } while ((rc >= 0) && (cpt > 0));
+                if (rc < 0) {
+                        fprintf(stderr, "Pool %s.%s destroyed\n",
+                                fsname, poolname);
+                        return 0;
+                } else {
+                        fprintf(stderr, "Warning, pool %s.%s still found\n",
+                                fsname, poolname);
+                        return -EEXIST;
+                }
+        }
+        case LCFG_POOL_ADD: {
+                do {
+                        rc = llapi_search_ost(fsname, poolname, ostname);
+                        if (rc == -ENODEV)
+                                return rc;
+                        if (rc != 1)
+                                sleep(2);
+                        cpt--;
+                } while ((rc != 1) && (cpt > 0));
+                if (rc == 1) {
+                        fprintf(stderr, "OST %s added to pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return 0;
+                } else {
+                        fprintf(stderr, "Warning, OST %s not found in pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return -ENOENT;
+                }
+        }
+        case LCFG_POOL_REM: {
+                do {
+                        rc = llapi_search_ost(fsname, poolname, ostname);
+                        if (rc == -ENODEV)
+                                return rc;
+                        if (rc == 1)
+                                sleep(2);
+                        cpt--;
+                } while ((rc == 1) && (cpt > 0));
+                if (rc != 1) {
+                        fprintf(stderr, "OST %s removed from pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return 0;
+                } else {
+                        fprintf(stderr, "Warning, OST %s still found in pool %s.%s\n",
+                                ostname, fsname, poolname);
+                        return -EEXIST;
+                }
+        }
+        default:
+                break;
+        }
+        return -EINVAL;
+}
+
+static int check_and_complete_ostname(char *fsname, char *ostname)
+{
+        char *ptr;
+        char real_ostname[MAX_OBD_NAME + 1];
+        char i;
+
+        /* if OST name does not start with fsname, we add it */
+        /* if not check if the fsname is the right one */
+        ptr = strchr(ostname, '-');
+        if (ptr == NULL) {
+                sprintf(real_ostname, "%s-%s", fsname, ostname);
+        } else if (strncmp(ostname, fsname, strlen(fsname)) != 0) {
+                fprintf(stderr, "%s does not start with fsname %s\n",
+                        ostname, fsname);
+                return -EINVAL;
+        } else {
+             strcpy(real_ostname, ostname);
+        }
+        /* real_ostname is fsname-????? */
+        ptr = real_ostname + strlen(fsname) + 1;
+        if (strncmp(ptr, "OST", 3) != 0) {
+                fprintf(stderr, "%s does not start by %s-OST nor OST\n",
+                        ostname, fsname);
+                return -EINVAL;
+        }
+        /* real_ostname is fsname-OST????? */
+        ptr += 3;
+        for (i = 0; i < 4; i++) {
+                if (!isxdigit(*ptr)) {
+                        fprintf(stderr,
+                                "ost's index in %s is not an hexa number\n",
+                                ostname);
+                        return -EINVAL;
+                }
+                ptr++;
+        }
+        /* real_ostname is fsname-OSTXXXX????? */
+        /* if OST name does not end with _UUID, we add it */
+        if (*ptr == '\0') {
+                strcat(real_ostname, "_UUID");
+        } else if (strcmp(ptr, "_UUID") != 0) {
+                fprintf(stderr,
+                        "ostname %s does not end with _UUID\n", ostname);
+                return -EINVAL;
+        }
+        /* real_ostname is fsname-OSTXXXX_UUID */
+        strcpy(ostname, real_ostname);
+        return 0;
+}
+
+/* returns 0 or -errno */
+static int pool_cmd(enum lcfg_command_type cmd,
+                    char *cmdname, char *fullpoolname,
+                    char *fsname, char *poolname, char *ostname)
+{
+        int rc = 0;
+        struct obd_ioctl_data data;
+        struct lustre_cfg_bufs bufs;
+        struct lustre_cfg *lcfg;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+
+        rc = check_pool_cmd(cmd, fsname, poolname, ostname);
+        if (rc == -ENODEV)
+                fprintf(stderr, "Can't verify pool command since there "
+                        "is no local MDT or client, proceeding anyhow...\n");
+        else if (rc)
+                return rc;
+
+        lustre_cfg_bufs_reset(&bufs, NULL);
+        lustre_cfg_bufs_set_string(&bufs, 0, cmdname);
+        lustre_cfg_bufs_set_string(&bufs, 1, fullpoolname);
+        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;
+        }
+
+        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) {
+                fprintf(stderr, "error: %s: invalid ioctl\n",
+                        jt_cmdname(cmdname));
+                return rc;
+        }
+        rc = l_ioctl(OBD_DEV_ID, OBD_IOC_POOL, buf);
+out:
+        if (rc)
+                rc = -errno;
+        lustre_cfg_free(lcfg);
+        return rc;
+}
+
+/*
+ * this function tranforms a rule [start-end/step] into an array
+ * of matching numbers
+ * supported forms are:
+ * [start]                : just this number
+ * [start-end]            : all numbers from start to end
+ * [start-end/step]       : numbers from start to end with increment of step
+ * on return, format contains a printf format string which can be used
+ * to generate all the strings
+ */
+static int get_array_idx(char *rule, char *format, int **array)
+{
+        char *start, *end, *ptr;
+        unsigned int lo, hi, step;
+        int array_sz = 0;
+        int i, array_idx;
+        int rc;
+
+        start = strchr(rule, '[');
+        end = strchr(rule, ']');
+        if ((start == NULL) || (end == NULL)) {
+                *array = malloc(sizeof(int));
+                if (*array == NULL)
+                        return 0;
+                strcpy(format, rule);
+                array_sz = 1;
+                return array_sz;
+        }
+        *start = '\0';
+        *end = '\0';
+        end++;
+        start++;
+        /* put in format the printf format (the rule without the range) */
+        sprintf(format, "%s%%.4x%s", rule, end);
+
+        array_idx = 0;
+        array_sz = 0;
+        *array = NULL;
+        /* loop on , separator */
+        do {
+                /* 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;
+                        (*array)[array_idx] = lo;
+                        array_idx++;
+                        break;
+                }
+                case 2: {
+                        step = 1;
+                        /* 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;
+                        for (i = lo; i <= hi; i+=step, array_idx++)
+                                (*array)[array_idx] = i;
+                        break;
+                }
+                }
+                ptr = strchr(start, ',');
+                if (ptr != NULL)
+                        start = ptr + 1;
+
+        } while (ptr != NULL);
+        return array_sz;
+}
+
+static int extract_fsname_poolname(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;
+
+err:
+        fprintf(stderr, "argument %s must be <fsname>.<poolname>\n", arg);
+        return rc;
+}
+
+int jt_pool_cmd(int argc, char **argv)
+{
+        enum lcfg_command_type cmd;
+        char fsname[PATH_MAX + 1];
+        char poolname[LOV_MAXPOOLNAME + 1];
+        char *ostnames_buf = NULL;
+        int i, rc;
+        int *array = NULL, array_sz;
+        struct {
+                int     rc;
+                char   *ostname;
+        } *cmds = NULL;
+
+        switch (argc) {
+        case 0:
+        case 1: return CMD_HELP;
+        case 2: {
+                if (strcmp("pool_new", argv[0]) == 0)
+                        cmd = LCFG_POOL_NEW;
+                else if (strcmp("pool_destroy", argv[0]) == 0)
+                        cmd = LCFG_POOL_DEL;
+                else if (strcmp("pool_list", argv[0]) == 0)
+                         return llapi_poollist(argv[1]);
+                else return CMD_HELP;
+
+                rc = extract_fsname_poolname(argv[1], fsname, poolname);
+                if (rc)
+                        break;
+
+                rc = pool_cmd(cmd, argv[0], argv[1], fsname, poolname, NULL);
+                if (rc)
+                        break;
+
+                check_pool_cmd_result(cmd, fsname, poolname, NULL);
+                break;
+        }
+        default: {
+                char format[2*MAX_OBD_NAME];
+
+                if (strcmp("pool_remove", argv[0]) == 0) {
+                        cmd = LCFG_POOL_REM;
+                } else if (strcmp("pool_add", argv[0]) == 0) {
+                        cmd = LCFG_POOL_ADD;
+                } else {
+                        return CMD_HELP;
+                }
+
+                rc = extract_fsname_poolname(argv[1], fsname, poolname);
+                if (rc)
+                        break;
+
+                for (i = 2; i < argc; i++) {
+                        int j;
+
+                        array_sz = get_array_idx(argv[i], format, &array);
+                        if (array_sz == 0)
+                                return CMD_HELP;
+
+                        cmds = malloc(array_sz * sizeof(cmds[0]));
+                        if (cmds != NULL) {
+                                ostnames_buf = malloc(array_sz *
+                                                      (MAX_OBD_NAME + 1));
+                        } else {
+                                free(array);
+                                rc = -ENOMEM;
+                                goto out;
+                        }
+
+                        for (j = 0; j < array_sz; j++) {
+                                char ostname[MAX_OBD_NAME + 1];
+
+                                snprintf(ostname, MAX_OBD_NAME, format,
+                                         array[j]);
+                                ostname[MAX_OBD_NAME] = '\0';
+
+                                rc = check_and_complete_ostname(fsname,ostname);
+                                if (rc) {
+                                        free(array);
+                                        free(cmds);
+                                        if (ostnames_buf)
+                                                free(ostnames_buf);
+                                        goto out;
+                                }
+                                if (ostnames_buf != NULL) {
+                                        cmds[j].ostname =
+                                          &ostnames_buf[(MAX_OBD_NAME + 1) * j];
+                                        strcpy(cmds[j].ostname, ostname);
+                                } else {
+                                        cmds[j].ostname = NULL;
+                                }
+                                cmds[j].rc = pool_cmd(cmd, argv[0], argv[1],
+                                                      fsname, poolname,
+                                                      ostname);
+                                /* Return an err if any of the add/dels fail */
+                                if (!rc)
+                                        rc = cmds[j].rc;
+                        }
+                        for (j = 0; j < array_sz; j++) {
+                                if (!cmds[j].rc) {
+                                        char ostname[MAX_OBD_NAME + 1];
+
+                                        if (!cmds[j].ostname) {
+                                                snprintf(ostname, MAX_OBD_NAME,
+                                                         format, array[j]);
+                                                ostname[MAX_OBD_NAME] = '\0';
+                                                check_and_complete_ostname(
+                                                        fsname, ostname);
+                                        } else {
+                                                strcpy(ostname,
+                                                       cmds[j].ostname);
+                                        }
+                                        check_pool_cmd_result(cmd, fsname,
+                                                              poolname,ostname);
+                                }
+                        }
+                        if (array_sz > 0)
+                                free(array);
+                        if (cmds)
+                                free(cmds);
+                        if (ostnames_buf);
+                                free(ostnames_buf);
+                }
+                /* fall through */
+        }
+        } /* switch */
+
+out:
+        if (rc != 0) {
+                errno = -rc;
+                perror(argv[0]);
+        }
+
+        return rc;
+}
+
+int jt_get_obj_version(int argc, char **argv)
+{
+        struct lu_fid fid;
+        struct obd_ioctl_data data;
+        __u64 version;
+        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf, *fidstr;
+        int rc;
+
+        if (argc != 2)
+                return CMD_HELP;
+
+        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;
+        }
+
+        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;
+
+        memset(buf, 0, sizeof *buf);
+        rc = obd_ioctl_pack(&data, &buf, sizeof rawbuf);
+        if (rc) {
+                fprintf(stderr, "error: %s: packing ioctl arguments: %s\n",
+                        jt_cmdname(argv[0]), strerror(-rc));
+                return rc;
+        }
+
+        rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GET_OBJ_VERSION, buf);
+        if (rc == -1) {
+                fprintf(stderr, "error: %s: ioctl: %s\n",
+                        jt_cmdname(argv[0]), strerror(errno));
+                return -errno;
+        }
+
+        obd_ioctl_unpack(&data, buf, sizeof rawbuf);
+        printf(LPX64"\n", 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;
+}
+
+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;
+}
+
+