Whamcloud - gitweb
LU-13456 ldlm: fix reprocessing of locks with more bits
[fs/lustre-release.git] / lustre / tests / multiop.c
index 32dcb93..100d014 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _GNU_SOURCE
@@ -36,6 +35,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <malloc.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -51,6 +51,7 @@
 #include <semaphore.h>
 #include <time.h>
 #include <err.h>
+#include <dirent.h>
 
 #include <lustre/lustreapi.h>
 
@@ -58,7 +59,7 @@
 #define T2 "write data after unlink\n"
 char msg[] = "yabba dabba doo, I'm coming for you, I live in a shoe, I don't know what to do.\n'Bigger, bigger,and bigger yet!' cried the Creator.  'You are not yet substantial enough for my boundless intents!'  And ever greater and greater the object became, until all was lost 'neath its momentus bulk.\n";
 char *buf, *buf_align;
-int bufsize = 0;
+int bufsize;
 sem_t sem;
 #define ALIGN_LEN 65535
 #define XATTR "user.multiop"
@@ -67,7 +68,7 @@ char usage[] =
 "Usage: %s filename command-sequence [path...]\n"
 "    command-sequence items:\n"
 "       A  fsetxattr(\"user.multiop\")\n"
-"       a  fgetxattr(\"user.multiop\")\n"
+"       a[num] fgetxattr(\"user.multiop\") [optional buffer size, default 0]\n"
 "       c  close\n"
 "       B[num] call setstripe ioctl to create stripes\n"
 "       C[num] create with optional stripes\n"
@@ -77,9 +78,9 @@ char usage[] =
 "       E[+|-] get lease. +/-: expect lease to (not) exist\n"
 "       f  statfs\n"
 "       F  print FID\n"
-"       H[num] create HSM released file with num stripes\n"
 "       G gid get grouplock\n"
 "       g gid put grouplock\n"
+"       H[num] create HSM released file with num stripes\n"
 "       K  link path to filename\n"
 "       L  link\n"
 "       l  symlink filename to path\n"
@@ -89,6 +90,8 @@ char usage[] =
 "       N  rename filename to path\n"
 "       o  open(O_RDONLY)\n"
 "       O  open(O_CREAT|O_RDWR)\n"
+"       p  print return value of last command\n"
+"       Q  open filename (should be dir), stat first entry to init statahead"
 "       r[num] read [optional length]\n"
 "       R  reference entire mmap-ed region\n"
 "       s  stat\n"
@@ -104,33 +107,34 @@ char usage[] =
 "       W  write entire mmap-ed region\n"
 "       y  fsync\n"
 "       Y  fdatasync\n"
-"       z[num] seek [optional position, default 0]\n"
+"       z[num] lseek(SEEK_SET) [optional offset, default 0]\n"
+"       Z[num] lseek(SEEK_CUR) [optional offset, default 0]\n"
 "       _  wait for signal\n";
 
 void usr1_handler(int unused)
 {
-        int saved_errno = errno;
+       int saved_errno = errno;
 
-        /*
-         * signal(7): POSIX.1-2004 ...requires an implementation to guarantee
-         * that the following functions can be safely called inside a signal
-         * handler:
-         *            sem_post()
-         */
-        sem_post(&sem);
+       /*
+        * signal(7): POSIX.1-2004 ...requires an implementation to guarantee
+        * that the following functions can be safely called inside a signal
+        * handler:
+        *            sem_post()
+        */
+       sem_post(&sem);
 
-        errno = saved_errno;
+       errno = saved_errno;
 }
 
 static const char *
 pop_arg(int argc, char *argv[])
 {
-        static int cur_arg = 3;
+       static int cur_arg = 3;
 
-        if (cur_arg >= argc)
-                return NULL;
+       if (cur_arg >= argc)
+               return NULL;
 
-        return argv[cur_arg++];
+       return argv[cur_arg++];
 }
 
 struct flag_mapping {
@@ -163,90 +167,131 @@ struct flag_mapping {
 
 int get_flags(char *data, int *rflags)
 {
-        char *cloned_flags;
-        char *tmp;
-        int flag_set = 0;
-        int flags = 0;
-        int size = 0;
-
-        cloned_flags = strdup(data);
-        if (cloned_flags == NULL) {
-                fprintf(stderr, "Insufficient memory.\n");
-                exit(-1);
-        }
-
-        for (tmp = strtok(cloned_flags, ":"); tmp;
-             tmp = strtok(NULL, ":")) {
-                int i;
-
-                size = tmp - cloned_flags;
-                for (i = 0; flag_table[i].flag != -1; i++) {
-                        if (!strcmp(tmp, flag_table[i].string)){
-                                flags |= flag_table[i].flag;
-                                size += strlen(flag_table[i].string);
-                                flag_set = 1;
-                                break;
-                        }
-                }
-        }
-        free(cloned_flags);
-
-        if (!flag_set) {
-                *rflags = O_RDONLY;
-                return 0;
-        }
-
-        *rflags = flags;
-        return size;
+       char *cloned_flags;
+       char *tmp;
+       int flag_set = 0;
+       int flags = 0;
+       int size = 0;
+
+       cloned_flags = strdup(data);
+       if (!cloned_flags) {
+               fprintf(stderr, "Insufficient memory.\n");
+               exit(-1);
+       }
+
+       for (tmp = strtok(cloned_flags, ":"); tmp;
+            tmp = strtok(NULL, ":")) {
+               int i;
+
+               size = tmp - cloned_flags;
+               for (i = 0; flag_table[i].flag != -1; i++) {
+                       if (!strcmp(tmp, flag_table[i].string)) {
+                               flags |= flag_table[i].flag;
+                               size += strlen(flag_table[i].string);
+                               flag_set = 1;
+                               break;
+                       }
+               }
+       }
+       free(cloned_flags);
+
+       if (!flag_set) {
+               *rflags = O_RDONLY;
+               return 0;
+       }
+
+       *rflags = flags;
+       return size;
+}
+
+static int statahead(char *dname)
+{
+       DIR *d;
+       struct dirent *dent;
+       struct stat st;
+       char *buf;
+       int rc;
+
+       rc = 0;
+       d = opendir(dname);
+       if (!d)
+               return errno;
+       dent = readdir(d);
+       if (!dent) {
+               rc = errno;
+               goto out_closedir;
+       }
+       if (asprintf(&buf, "%s/%s", dname, dent->d_name) == -1) {
+               rc = errno;
+               goto out_closedir;
+       }
+       if (stat(buf, &st))
+               rc = errno;
+       free(buf);
+out_closedir:
+       closedir(d);
+       return rc;
 }
 
 #define POP_ARG() (pop_arg(argc, argv))
 
 int main(int argc, char **argv)
 {
-       char                    *fname, *commands;
-       const char              *newfile;
-       const char              *oldpath;
-       struct stat              st;
-       struct statfs            stfs;
-       size_t                   mmap_len = 0, i;
-       unsigned char           *mmap_ptr = NULL, junk = 0;
-       int                      rc, len, fd = -1;
-       int                      flags;
-       int                      save_errno;
-       int                      verbose = 0;
-       int                      gid = 0;
-       struct lu_fid            fid;
-       struct timespec          ts;
-       struct lov_user_md_v3    lum;
-
-        if (argc < 3) {
-                fprintf(stderr, usage, argv[0]);
-                exit(1);
-        }
-
-        memset(&st, 0, sizeof(st));
-        sem_init(&sem, 0, 0);
-        /* use sigaction instead of signal to avoid SA_ONESHOT semantics */
-        sigaction(SIGUSR1, &(const struct sigaction){.sa_handler = &usr1_handler},
-                  NULL);
-
-        fname = argv[1];
-
-        for (commands = argv[2]; *commands; commands++) {
-                switch (*commands) {
-                case '_':
-                        if (verbose) {
-                                printf("PAUSING\n");
-                                fflush(stdout);
-                        }
-                       len = atoi(commands+1);
+       char *fname, *commands;
+       const char *newfile;
+       const char *oldpath;
+       struct stat st;
+       struct statfs stfs;
+       size_t mmap_len = 0, i;
+       unsigned char *mmap_ptr = NULL, junk = 1;
+       int len, fd = -1;
+       int flags;
+       int save_errno;
+       int verbose = 0;
+       int gid = 0;
+       struct lu_fid fid;
+       struct timespec ts;
+       struct lov_user_md_v3 lum;
+       char *xattr_buf = NULL;
+       size_t xattr_buf_size = 0;
+       long long rc = 0;
+       long long last_rc;
+
+       if (argc < 3) {
+               fprintf(stderr, usage, argv[0]);
+               exit(1);
+       }
+
+       memset(&st, 0, sizeof(st));
+       sem_init(&sem, 0, 0);
+       /* use sigaction instead of signal to avoid SA_ONESHOT semantics */
+       sigaction(SIGUSR1,
+                 &(const struct sigaction){.sa_handler = &usr1_handler}, NULL);
+
+       fname = argv[1];
+
+       for (commands = argv[2]; *commands; commands++) {
+               /*
+                * XXX Most commands return 0 or we exit so we only
+                * update rc where really needed.
+                */
+               last_rc = rc;
+               rc = 0;
+
+               switch (*commands) {
+               case '_':
+                       if (verbose) {
+                               printf("PAUSING\n");
+                               fflush(stdout);
+                       }
+                       len = atoi(commands + 1);
                        if (len <= 0)
                                len = 3600; /* 1 hour */
                        ts.tv_sec = time(NULL) + len;
                        ts.tv_nsec = 0;
-                        while (sem_timedwait(&sem, &ts) < 0 && errno == EINTR);
-                        break;
+                       while (sem_timedwait(&sem, &ts) < 0 && errno == EINTR)
+                               ;
+                       break;
                case 'A':
                        if (fsetxattr(fd, XATTR, "multiop", 8, 0)) {
                                save_errno = errno;
@@ -255,20 +300,33 @@ int main(int argc, char **argv)
                        }
                        break;
                case 'a':
-                       if (fgetxattr(fd, XATTR, NULL, 0) == -1) {
+                       len = atoi(commands + 1);
+                       if (xattr_buf_size < len) {
+                               xattr_buf = realloc(xattr_buf, len);
+                               if (!xattr_buf) {
+                                       save_errno = errno;
+                                       perror("allocating xattr buffer\n");
+                                       exit(save_errno);
+                               }
+
+                               xattr_buf_size = len;
+                       }
+
+                       rc = fgetxattr(fd, XATTR, xattr_buf, len);
+                       if (rc < 0) {
                                save_errno = errno;
                                perror("fgetxattr");
                                exit(save_errno);
                        }
                        break;
-                case 'c':
-                        if (close(fd) == -1) {
-                                save_errno = errno;
-                                perror("close");
-                                exit(save_errno);
-                        }
-                        fd = -1;
-                        break;
+               case 'c':
+                       if (close(fd) == -1) {
+                               save_errno = errno;
+                               perror("close");
+                               exit(save_errno);
+                       }
+                       fd = -1;
+                       break;
                case 'B':
                        lum = (struct lov_user_md_v3) {
                                .lmm_magic = LOV_USER_MAGIC_V3,
@@ -281,31 +339,33 @@ int main(int argc, char **argv)
                                exit(save_errno);
                        }
                        break;
-                case 'C':
-                        len = atoi(commands+1);
-                        fd = llapi_file_open(fname, O_CREAT | O_WRONLY, 0644,
-                                             0, 0, len, 0);
-                        if (fd == -1) {
-                                save_errno = errno;
-                                perror("create stripe file");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'd':
-                        if (mkdir(fname, 0755) == -1) {
-                                save_errno = errno;
-                                perror("mkdir(0755)");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'D':
-                        fd = open(fname, O_DIRECTORY);
-                        if (fd == -1) {
-                                save_errno = errno;
-                                perror("open(O_DIRECTORY)");
-                                exit(save_errno);
-                        }
-                        break;
+               case 'C':
+                       len = atoi(commands + 1);
+                       fd = llapi_file_open(fname, O_CREAT | O_WRONLY, 0644,
+                                            0, 0, len, 0);
+                       if (fd == -1) {
+                               save_errno = errno;
+                               perror("create stripe file");
+                               exit(save_errno);
+                       }
+                       rc = fd;
+                       break;
+               case 'd':
+                       if (mkdir(fname, 0755) == -1) {
+                               save_errno = errno;
+                               perror("mkdir(0755)");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'D':
+                       fd = open(fname, O_DIRECTORY);
+                       if (fd == -1) {
+                               save_errno = errno;
+                               perror("open(O_DIRECTORY)");
+                               exit(save_errno);
+                       }
+                       rc = fd;
+                       break;
                case 'e':
                        commands++;
                        switch (*commands) {
@@ -330,11 +390,12 @@ int main(int argc, char **argv)
                        /* F_UNLCK, interpret return code */
                        if (rc > 0) {
                                const char *str = "unknown";
+
                                if (rc == LL_LEASE_RDLCK)
                                        str = "read";
                                else if (rc == LL_LEASE_WRLCK)
                                        str = "write";
-                               fprintf(stdout, "%s lease(%d) released.\n",
+                               fprintf(stdout, "%s lease(%lld) released.\n",
                                        str, rc);
                        } else if (rc == 0) {
                                fprintf(stdout, "lease already broken.\n");
@@ -353,7 +414,7 @@ int main(int argc, char **argv)
                                        str = "read";
                                else if (rc == LL_LEASE_WRLCK)
                                        str = "write";
-                               fprintf(stdout, "%s lease(%d) has applied.\n",
+                               fprintf(stdout, "%s lease(%lld) has applied.\n",
                                        str, rc);
                                if (*commands == '-')
                                        errx(-1, "expect lease to not exist");
@@ -376,37 +437,39 @@ int main(int argc, char **argv)
                                rc = llapi_fd2fid(fd, &fid);
                        if (rc != 0)
                                fprintf(stderr,
-                                       "llapi_path/fd2fid() on %d, rc=%d\n",
+                                       "llapi_path/fd2fid() on %d, rc=%lld\n",
                                        fd, rc);
                        else
                                printf(DFID"\n", PFID(&fid));
+                       fflush(stdout);
+                       break;
+               case 'G':
+                       gid = atoi(commands + 1);
+                       if (ioctl(fd, LL_IOC_GROUP_LOCK, gid) == -1) {
+                               save_errno = errno;
+                               perror("ioctl(GROUP_LOCK)");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'g':
+                       gid = atoi(commands + 1);
+                       if (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1) {
+                               save_errno = errno;
+                               perror("ioctl(GROUP_UNLOCK)");
+                               exit(save_errno);
+                       }
                        break;
-                case 'G':
-                        gid = atoi(commands+1);
-                        if (ioctl(fd, LL_IOC_GROUP_LOCK, gid) == -1) {
-                                save_errno = errno;
-                                perror("ioctl(GROUP_LOCK)");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'g':
-                        gid = atoi(commands+1);
-                        if (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1) {
-                                save_errno = errno;
-                                perror("ioctl(GROUP_UNLOCK)");
-                                exit(save_errno);
-                        }
-                        break;
                case 'H':
-                       len = atoi(commands+1);
-                       fd = llapi_file_open(fname, O_CREAT | O_WRONLY,
-                               0644, 0, 0, len,
-                               LOV_PATTERN_RAID0 | LOV_PATTERN_F_RELEASED);
+                       len = atoi(commands + 1);
+                       fd = llapi_file_open(fname, O_CREAT | O_WRONLY, 0644,
+                                            0, 0, len, LOV_PATTERN_RAID0 |
+                                            LOV_PATTERN_F_RELEASED);
                        if (fd == -1) {
                                save_errno = errno;
                                perror("create stripe file");
                                exit(save_errno);
                        }
+                       rc = fd;
                        break;
                case 'j':
                        if (flock(fd, LOCK_EX) == -1)
@@ -414,7 +477,7 @@ int main(int argc, char **argv)
                        break;
                case 'K':
                        oldpath = POP_ARG();
-                       if (oldpath == NULL)
+                       if (!oldpath)
                                oldpath = fname;
 
                        if (link(oldpath, fname)) {
@@ -423,19 +486,19 @@ int main(int argc, char **argv)
                                exit(save_errno);
                        }
                        break;
-                case 'l':
-                        newfile = POP_ARG();
-                        if (!newfile)
-                                newfile = fname;
-                        if (symlink(fname, newfile)) {
-                                save_errno = errno;
-                                perror("symlink()");
-                                exit(save_errno);
-                        }
-                        break;
+               case 'l':
+                       newfile = POP_ARG();
+                       if (!newfile)
+                               newfile = fname;
+                       if (symlink(fname, newfile)) {
+                               save_errno = errno;
+                               perror("symlink()");
+                               exit(save_errno);
+                       }
+                       break;
                case 'L':
                        newfile = POP_ARG();
-                       if (newfile == NULL)
+                       if (!newfile)
                                newfile = fname;
 
                        if (link(fname, newfile)) {
@@ -444,31 +507,31 @@ int main(int argc, char **argv)
                                exit(save_errno);
                        }
                        break;
-                case 'm':
-                        if (mknod(fname, S_IFREG | 0644, 0) == -1) {
-                                save_errno = errno;
-                                perror("mknod(S_IFREG|0644, 0)");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'M':
-                        if (st.st_size == 0) {
-                                fprintf(stderr, "mmap without preceeding stat, or on"
-                                        " zero length file.\n");
-                                exit(-1);
-                        }
-                        mmap_len = st.st_size;
-                        mmap_ptr = mmap(NULL, mmap_len, PROT_WRITE | PROT_READ,
-                                        MAP_SHARED, fd, 0);
-                        if (mmap_ptr == MAP_FAILED) {
-                                save_errno = errno;
-                                perror("mmap");
-                                exit(save_errno);
-                        }
-                        break;
+               case 'm':
+                       if (mknod(fname, S_IFREG | 0644, 0) == -1) {
+                               save_errno = errno;
+                               perror("mknod(S_IFREG|0644, 0)");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'M':
+                       if (st.st_size == 0) {
+                               fprintf(stderr,
+                                       "mmap without preceeding stat, or on zero length file.\n");
+                               exit(-1);
+                       }
+                       mmap_len = st.st_size;
+                       mmap_ptr = mmap(NULL, mmap_len, PROT_WRITE | PROT_READ,
+                                       MAP_SHARED, fd, 0);
+                       if (mmap_ptr == MAP_FAILED) {
+                               save_errno = errno;
+                               perror("mmap");
+                               exit(save_errno);
+                       }
+                       break;
                case 'n':
                        oldpath = POP_ARG();
-                       if (oldpath == NULL)
+                       if (!oldpath)
                                oldpath = fname;
 
                        if (rename(oldpath, fname) < 0) {
@@ -477,45 +540,58 @@ int main(int argc, char **argv)
                                exit(save_errno);
                        }
                        break;
-                case 'N':
-                        newfile = POP_ARG();
-                        if (!newfile)
-                                newfile = fname;
-                        if (rename (fname, newfile)) {
-                                save_errno = errno;
-                                perror("rename()");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'O':
-                        fd = open(fname, O_CREAT|O_RDWR, 0644);
-                        if (fd == -1) {
-                                save_errno = errno;
-                                perror("open(O_RDWR|O_CREAT)");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'o':
-                        len = get_flags(commands+1, &flags);
-                        commands += len;
-                        if (flags & O_CREAT)
-                                fd = open(fname, flags, 0666);
-                        else
-                                fd = open(fname, flags);
-                        if (fd == -1) {
-                                save_errno = errno;
-                                perror("open");
-                                exit(save_errno);
-                        }
-                        break;
+               case 'N':
+                       newfile = POP_ARG();
+                       if (!newfile)
+                               newfile = fname;
+                       if (rename(fname, newfile)) {
+                               save_errno = errno;
+                               perror("rename()");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'O':
+                       fd = open(fname, O_CREAT | O_RDWR, 0644);
+                       if (fd == -1) {
+                               save_errno = errno;
+                               perror("open(O_RDWR|O_CREAT)");
+                               exit(save_errno);
+                       }
+                       rc = fd;
+                       break;
+               case 'o':
+                       len = get_flags(commands + 1, &flags);
+                       commands += len;
+                       if (flags & O_CREAT)
+                               fd = open(fname, flags, 0666);
+                       else
+                               fd = open(fname, flags);
+                       if (fd == -1) {
+                               save_errno = errno;
+                               perror("open");
+                               exit(save_errno);
+                       }
+                       rc = fd;
+                       break;
+               case 'p':
+                       printf("%lld\n", last_rc);
+                       break;
+               case 'Q':
+                       save_errno = statahead(fname);
+                       if (save_errno) {
+                               perror("statahead");
+                               exit(save_errno);
+                       }
+                       break;
                case 'r':
-                       len = atoi(commands+1);
+                       len = atoi(commands + 1);
                        if (len <= 0)
                                len = 1;
                        if (bufsize < len) {
                                void *tmp;
+
                                tmp = realloc(buf, len + ALIGN_LEN);
-                               if (tmp == NULL) {
+                               if (!tmp) {
                                        free(buf);
                                        save_errno = errno;
                                        perror("allocating buf for read\n");
@@ -534,84 +610,89 @@ int main(int argc, char **argv)
                                        exit(save_errno);
                                }
                                if (rc < len) {
-                                       fprintf(stderr, "short read: %u/%u\n",
+                                       fprintf(stderr, "short read: %lld/%u\n",
                                                rc, len);
                                        if (rc == 0)
                                                exit(ENODATA);
                                }
                                len -= rc;
                                if (verbose >= 2)
-                                       printf("%.*s\n", rc, buf_align);
-                       }
-                       break;
-                case 'R':
-                        for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
-                                junk += mmap_ptr[i];
-                        break;
-                case 's':
-                        if (stat(fname, &st) == -1) {
-                                save_errno = errno;
-                                perror("stat");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'S':
-                        if (fstat(fd, &st) == -1) {
-                                save_errno = errno;
-                                perror("fstat");
-                                exit(save_errno);
-                        }
-                        break;
-                case 't':
-                        if (fchmod(fd, 0) == -1) {
-                                save_errno = errno;
-                                perror("fchmod");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'T':
-                        len = atoi(commands+1);
-                        if (ftruncate(fd, len) == -1) {
-                                save_errno = errno;
-                                printf("ftruncate (%d,%d)\n", fd, len);
-                                perror("ftruncate");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'u':
-                        if (unlink(fname) == -1) {
-                                save_errno = errno;
-                                perror("unlink");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'U':
-                        if (munmap(mmap_ptr, mmap_len)) {
-                                save_errno = errno;
-                                perror("munmap");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'v':
-                        verbose++;
-                        break;
+                                       printf("%.*s\n", (int)rc, buf_align);
+                       }
+                       break;
+               case 'R':
+                       for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
+                               junk += mmap_ptr[i];
+                       break;
+               case 's':
+                       if (stat(fname, &st) == -1) {
+                               save_errno = errno;
+                               perror("stat");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'S':
+                       if (fstat(fd, &st) == -1) {
+                               save_errno = errno;
+                               perror("fstat");
+                               exit(save_errno);
+                       }
+                       break;
+               case 't':
+                       if (fchmod(fd, 0) == -1) {
+                               save_errno = errno;
+                               perror("fchmod");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'T':
+                       len = atoi(commands + 1);
+                       if (ftruncate(fd, len) == -1) {
+                               save_errno = errno;
+                               printf("ftruncate (%d,%d)\n", fd, len);
+                               perror("ftruncate");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'u':
+                       if (unlink(fname) == -1) {
+                               save_errno = errno;
+                               perror("unlink");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'U':
+                       if (munmap(mmap_ptr, mmap_len)) {
+                               save_errno = errno;
+                               perror("munmap");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'v':
+                       verbose++;
+                       break;
                case 'V':
                        len = get_flags(commands + 1, &flags);
                        commands += len;
-                       fd = llapi_create_volatile(fname, flags);
+                       len = -1; /* mdt index */
+                       if (commands[1] >= '0' && commands[1] <= '9')
+                               len = atoi(commands + 1);
+                       fd = llapi_create_volatile_idx(fname, len, flags);
                        if (fd < 0) {
                                perror("llapi_create_volatile");
                                exit(fd);
                        }
+                       rc = fd;
                        break;
                case 'w':
-                       len = atoi(commands+1);
+                       len = atoi(commands + 1);
                        if (len <= 0)
                                len = 1;
                        if (bufsize < len) {
                                void *tmp;
+
                                tmp = realloc(buf, len + ALIGN_LEN);
-                               if (tmp == NULL) {
+                               if (!tmp) {
                                        free(buf);
                                        save_errno = errno;
                                        perror("allocating buf for write\n");
@@ -631,7 +712,8 @@ int main(int argc, char **argv)
                                        exit(save_errno);
                                }
                                if (rc < len)
-                                       fprintf(stderr, "short write: %u/%u\n",
+                                       fprintf(stderr,
+                                               "short write: %lld/%u\n",
                                                rc, len);
                                len -= rc;
                        }
@@ -645,8 +727,9 @@ int main(int argc, char **argv)
 
                        rc = llapi_get_data_version(fd, &dv, 0);
                        if (rc) {
-                               fprintf(stderr, "cannot get file data version"
-                                       " %d\n", rc);
+                               fprintf(stderr,
+                                       "cannot get file data version %lld\n",
+                                       rc);
                                exit(-rc);
                        }
                        printf("dataversion is %ju\n", (uintmax_t)dv);
@@ -657,56 +740,77 @@ int main(int argc, char **argv)
 
                        rc = llapi_get_ost_layout_version(fd, &layout_version);
                        if (rc) {
-                               fprintf(stderr, "cannot get ost layout version"
-                                       " %d\n", rc);
+                               fprintf(stderr,
+                                       "cannot get ost layout version %lld\n",
+                                       rc);
                                exit(-rc);
                        }
                        printf("ostlayoutversion: %u\n", layout_version);
                        break;
                }
-                case 'y':
-                        if (fsync(fd) == -1) {
-                                save_errno = errno;
-                                perror("fsync");
-                                exit(save_errno);
-                        }
-                        break;
-                case 'Y':
+               case 'y':
+                       if (fsync(fd) == -1) {
+                               save_errno = errno;
+                               perror("fsync");
+                               exit(save_errno);
+                       }
+                       break;
+               case 'Y':
                        if (fdatasync(fd) == -1) {
                                save_errno = errno;
                                perror("fdatasync");
                                exit(save_errno);
                        }
                        break;
-                case 'z':
-                        len = atoi(commands+1);
-                        if (lseek(fd, len, SEEK_SET) == -1) {
-                                save_errno = errno;
-                                perror("lseek");
-                                exit(save_errno);
-                        }
-                        break;
+               case 'z': {
+                       off_t off;
+
+                       len = atoi(commands + 1);
+                       off = lseek(fd, len, SEEK_SET);
+                       if (off == (off_t)-1) {
+                               save_errno = errno;
+                               perror("lseek");
+                               exit(save_errno);
+                       }
+
+                       rc = off;
+                       break;
+               }
+               case 'Z': {
+                       off_t off;
+
+                       len = atoi(commands + 1);
+                       off = lseek(fd, len, SEEK_CUR);
+                       if (off == (off_t)-1) {
+                               save_errno = errno;
+                               perror("lseek");
+                               exit(save_errno);
+                       }
+
+                       rc = off;
+                       break;
+               }
                case '-':
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                        break;
-                default:
-                        fprintf(stderr, "unknown command \"%c\"\n", *commands);
-                        fprintf(stderr, usage, argv[0]);
-                        exit(1);
-                }
-        }
-
-        if (buf)
-                free(buf);
-
-        return 0;
+               case '0':
+               case '1':
+               case '2':
+               case '3':
+               case '4':
+               case '5':
+               case '6':
+               case '7':
+               case '8':
+               case '9':
+                       break;
+               default:
+                       fprintf(stderr, "unknown command \"%c\"\n", *commands);
+                       fprintf(stderr, usage, argv[0]);
+                       exit(1);
+               }
+       }
+
+       if (buf)
+               free(buf);
+
+       return 0;
 }