Whamcloud - gitweb
LU-2714 hsm: limit MDT-side allocations for HSM RPCs
[fs/lustre-release.git] / lustre / utils / lfs.c
index 4e4228a..8fef145 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 /* For dirname() */
 #include <libgen.h>
 
-#include <lnet/api-support.h>
 #include <lnet/lnetctl.h>
 
 #include <liblustre.h>
-#include <lustre/lustre_idl.h>
-#include <lustre/liblustreapi.h>
-#include <lustre/lustre_user.h>
-#include <lustre_quota.h>
+#include <lustre/lustreapi.h>
 
 #include <libcfs/libcfsutil.h>
 #include "obdctl.h"
 
-unsigned int libcfs_subsystem_debug = 0;
-
 /* all functions */
 static int lfs_setstripe(int argc, char **argv);
 static int lfs_find(int argc, char **argv);
 static int lfs_getstripe(int argc, char **argv);
+static int lfs_getdirstripe(int argc, char **argv);
+static int lfs_setdirstripe(int argc, char **argv);
+static int lfs_rmentry(int argc, char **argv);
 static int lfs_osts(int argc, char **argv);
+static int lfs_mdts(int argc, char **argv);
 static int lfs_df(int argc, char **argv);
+static int lfs_getname(int argc, char **argv);
 static int lfs_check(int argc, char **argv);
-static int lfs_catinfo(int argc, char **argv);
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotachown(int argc, char **argv);
 static int lfs_quotacheck(int argc, char **argv);
 static int lfs_quotaon(int argc, char **argv);
 static int lfs_quotaoff(int argc, char **argv);
 static int lfs_setquota(int argc, char **argv);
 static int lfs_quota(int argc, char **argv);
-static int lfs_quotainv(int argc, char **argv);
 #endif
 static int lfs_flushctx(int argc, char **argv);
 static int lfs_join(int argc, char **argv);
@@ -110,6 +106,17 @@ static int lfs_changelog(int argc, char **argv);
 static int lfs_changelog_clear(int argc, char **argv);
 static int lfs_fid2path(int argc, char **argv);
 static int lfs_path2fid(int argc, char **argv);
+static int lfs_data_version(int argc, char **argv);
+static int lfs_hsm_state(int argc, char **argv);
+static int lfs_hsm_set(int argc, char **argv);
+static int lfs_hsm_clear(int argc, char **argv);
+static int lfs_hsm_action(int argc, char **argv);
+static int lfs_hsm_archive(int argc, char **argv);
+static int lfs_hsm_restore(int argc, char **argv);
+static int lfs_hsm_release(int argc, char **argv);
+static int lfs_hsm_remove(int argc, char **argv);
+static int lfs_hsm_cancel(int argc, char **argv);
+static int lfs_swap_layouts(int argc, char **argv);
 
 /* all avaialable commands */
 command_t cmdlist[] = {
@@ -117,74 +124,99 @@ command_t cmdlist[] = {
          "Create a new file with a specific striping pattern or\n"
          "set the default striping pattern on an existing directory or\n"
          "delete the default striping pattern from an existing directory\n"
-         "usage: setstripe [--size|-s stripe_size] [--offset|-o start_ost]\n"
-         "                 [--count|-c stripe_count] [--pool|-p <pool>]\n"
-         "                 <dir|filename>\n"
-         "       or \n"
-         "       setstripe -d <dir>   (to delete default striping)\n"
+         "usage: setstripe [--stripe-count|-c <stripe_count>]\n"
+         "                 [--stripe-index|-i <start_ost_idx>]\n"
+         "                 [--stripe-size|-S <stripe_size>]\n"
+         "                 [--pool|-p <pool_name>] <directory|filename>\n"
+         " or\n"
+         "       setstripe -d <directory>   (to delete default striping)\n"
          "\tstripe_size:  Number of bytes on each OST (0 filesystem default)\n"
          "\t              Can be specified with k, m or g (in KB, MB and GB\n"
          "\t              respectively)\n"
-         "\tstart_ost:    OST index of first stripe (-1 filesystem default)\n"
+         "\tstart_ost_idx: OST index of first stripe (-1 default)\n"
          "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"
-         "\tpool:         Name of OST pool"},
+         "\tpool_name:    Name of OST pool to use (default none)"},
         {"getstripe", lfs_getstripe, 0,
          "To list the striping info for a given file or files in a\n"
          "directory or recursively for all files in a directory tree.\n"
-         "usage: getstripe [--obd|-O <uuid>] [--quiet | -q] [--verbose | -v]\n"
-         "                 [--count | -c ] [--size | -s ] [--index | -i ]\n"
-         "                 [--offset | -o ] [--pool | -p ]\n"
-         "                 [--recursive | -r] <dir|file> ..."},
+         "usage: getstripe [--ost|-O <uuid>] [--quiet | -q] [--verbose | -v]\n"
+         "                 [--stripe-count|-c] [--stripe-index|-i]\n"
+         "                 [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
+         "                 [--mdt-index|-M] [--recursive|-r] [--raw|-R]\n"
+         "                 <directory|filename> ..."},
+       {"setdirstripe", lfs_setdirstripe, 0,
+        "To create a remote directory on a specified MDT.\n"
+        "usage: setdirstripe <--index|-i mdt_index> <dir>\n"
+        "\tmdt_index:    MDT index of first stripe\n"},
+       {"getdirstripe", lfs_getdirstripe, 0,
+        "To list the striping info for a given directory\n"
+        "or recursively for all directories in a directory tree.\n"
+        "usage: getdirstripe [--obd|-O <uuid>] [--quiet|-q] [--verbose|-v]\n"
+        "               [--count|-c ] [--index|-i ] [--raw|-R]\n"
+        "               [--recursive | -r] <dir> ..."},
+       {"mkdir", lfs_setdirstripe, 0,
+        "To create a remote directory on a specified MDT. And this can only\n"
+        "be done on MDT0 by administrator.\n"
+        "usage: mkdir <--index|-i mdt_index> <dir>\n"
+        "\tmdt_index:    MDT index of the remote directory.\n"},
+       {"rm_entry", lfs_rmentry, 0,
+        "To remove the name entry of the remote directory. Note: This\n"
+        "command will only delete the name entry, i.e. the remote directory\n"
+        "will become inaccessable after this command. This can only be done\n"
+        "by the administrator\n"
+        "usage: rm_entry <dir>\n"},
         {"pool_list", lfs_poollist, 0,
          "List pools or pool OSTs\n"
          "usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
         {"find", lfs_find, 0,
-         "To find files that match given parameters recursively in a directory tree.\n"
-         "usage: find <dir|file> ... \n"
-         "     [[!] --atime|-A [+-]N] [[!] --mtime|-M [+-]N] [[!] --ctime|-C [+-]N]\n"
-         "     [--maxdepth|-D N] [[!] --name|-n <pattern>] [--print0|-P]\n"
-         "     [--print|-p] [--obd|-O <uuid[s]>] [[!] --size|-s [+-]N[bkMGTP]]\n"
-         "     [[!] --type|-t <filetype>] [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
-         "     [[!] --uid|-u|--user|-U <uid>|<uname>]\n"
-         "     [[!] --pool <pool>]\n"
-         "\t !: used before an option indicates 'NOT' the requested attribute\n"
-         "\t -: used before an value indicates 'AT MOST' the requested value\n"
-         "\t +: used before an option indicates 'AT LEAST' the requested value\n"},
+         "find files matching given attributes recursively in directory tree.\n"
+         "usage: find <directory|filename> ...\n"
+         "     [[!] --atime|-A [+-]N] [[!] --ctime|-C [+-]N]\n"
+         "     [[!] --mtime|-M [+-]N] [[!] --mdt|-m <uuid|index,...>]\n"
+         "     [--maxdepth|-D N] [[!] --name|-n <pattern>]\n"
+         "     [[!] --ost|-O <uuid|index,...>] [--print|-p] [--print0|-P]\n"
+         "     [[!] --size|-s [+-]N[bkMGTPE]]\n"
+         "     [[!] --stripe-count|-c [+-]<stripes>]\n"
+         "     [[!] --stripe-index|-i <index,...>]\n"
+         "     [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
+         "     [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
+         "     [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
+         "\t !: used before an option indicates 'NOT' requested attribute\n"
+         "\t -: used before a value indicates 'AT MOST' requested value\n"
+         "\t +: used before a value indicates 'AT LEAST' requested value\n"},
         {"check", lfs_check, 0,
          "Display the status of MDS or OSTs (as specified in the command)\n"
          "or all the servers (MDS and OSTs).\n"
          "usage: check <osts|mds|servers>"},
-        {"catinfo", lfs_catinfo, 0,
-         "Show information of specified type logs.\n"
-         "usage: catinfo {keyword} [node name]\n"
-         "\tkeywords are one of followings: config, deletions.\n"
-         "\tnode name must be provided when use keyword config."},
         {"join", lfs_join, 0,
          "join two lustre files into one.\n"
          "obsolete, HEAD does not support it anymore.\n"},
-        {"osts", lfs_osts, 0, "osts"},
+        {"osts", lfs_osts, 0, "list OSTs connected to client "
+         "[for specified path only]\n" "usage: osts [path]"},
+        {"mdts", lfs_mdts, 0, "list MDTs connected to client "
+         "[for specified path only]\n" "usage: mdts [path]"},
         {"df", lfs_df, 0,
          "report filesystem disk space usage or inodes usage"
          "of each MDS and all OSDs or a batch belonging to a specific pool .\n"
-         "Usage: df [-i] [-h] [--pool|-p <fsname>[.<pool>] [path]"},
+         "Usage: df [-i] [-h] [--lazy|-l] [--pool|-p <fsname>[.<pool>] [path]"},
+        {"getname", lfs_getname, 0, "list instances and specified mount points "
+         "[for specified path only]\n"
+         "Usage: getname [-h]|[path ...] "},
 #ifdef HAVE_SYS_QUOTA_H
-        {"quotachown",lfs_quotachown, 0,
-         "Change files' owner or group on the specified filesystem.\n"
-         "usage: quotachown [-i] <filesystem>\n"
-         "\t-i: ignore error if file is not exist\n"},
         {"quotacheck", lfs_quotacheck, 0,
          "Scan the specified filesystem for disk usage, and create,\n"
-         "or update quota files.\n"
+         "or update quota files. Deprecated as of 2.4.0.\n"
          "usage: quotacheck [ -ug ] <filesystem>"},
-        {"quotaon", lfs_quotaon, 0, "Turn filesystem quotas on.\n"
+        {"quotaon", lfs_quotaon, 0, "Turn filesystem"
+         " quotas on. Deprecated as of 2.4.0.\n"
          "usage: quotaon [ -ugf ] <filesystem>"},
-        {"quotaoff", lfs_quotaoff, 0, "Turn filesystem quotas off.\n"
+        {"quotaoff", lfs_quotaoff, 0, "Turn filesystem"
+         " quotas off. Deprecated as of 2.4.0.\n"
          "usage: quotaoff [ -ug ] <filesystem>"},
         {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
          "usage: setquota <-u|-g> <uname>|<uid>|<gname>|<gid>\n"
          "                -b <block-softlimit> -B <block-hardlimit>\n"
          "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
-         "       setquota -t <-u|-g> <block-grace> <inode-grace> <filesystem>\n"
          "       setquota <-u|--user|-g|--group> <uname>|<uid>|<gname>|<gid>\n"
          "                [--block-softlimit <block-softlimit>]\n"
          "                [--block-hardlimit <block-hardlimit>]\n"
@@ -198,11 +230,9 @@ command_t cmdlist[] = {
          "       -i can be used instead of --inode-softlimit/--inode-grace\n"
          "       -I can be used instead of --inode-hardlimit"},
         {"quota", lfs_quota, 0, "Display disk usage and limits.\n"
-         "usage: quota [-v] [-o obd_uuid|-i mdt_idx|-I ost_idx]\n" 
+         "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
          "             [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
-         "       quota [-o obd_uuid|-i mdt_idx|-I ost_idx] -t <-u|-g> <filesystem>"},
-        {"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n"
-         "usage: quotainv [-u|-g] <filesystem>"},
+         "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
 #endif
         {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n"
          "usage: flushctx [-k] [mountpoint...]"},
@@ -240,6 +270,37 @@ command_t cmdlist[] = {
                 /*[--rec <recno>]*/},
         {"path2fid", lfs_path2fid, 0, "Display the fid for a given path.\n"
          "usage: path2fid <path>"},
+        {"data_version", lfs_data_version, 0, "Display file data version for "
+         "a given path.\n" "usage: data_version [-n] <path>"},
+       {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, "
+        "undergoing actions) for given files.\n usage: hsm_state <file> ..."},
+       {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n"
+        "usage: hsm_set [--norelease] [--noarchive] [--dirty] [--exists] "
+        "[--archived] [--lost] <file> ..."},
+       {"hsm_clear", lfs_hsm_clear, 0, "Clear HSM user flag on specified "
+        "files.\n"
+        "usage: hsm_clear [--norelease] [--noarchive] [--dirty] [--exists] "
+        "[--archived] [--lost] <file> ..."},
+       {"hsm_action", lfs_hsm_action, 0, "Display current HSM request for "
+        "given files.\n" "usage: hsm_action <file> ..."},
+       {"hsm_archive", lfs_hsm_archive, 0,
+        "Archive file to external storage.\n"
+        "usage: hsm_archive [--filelist FILELIST] [--data DATA] [--archive NUM] "
+        "<file> ..."},
+       {"hsm_restore", lfs_hsm_restore, 0,
+        "Restore file from external storage.\n"
+        "usage: hsm_restore [--filelist FILELIST] [--data DATA] <file> ..."},
+       {"hsm_release", lfs_hsm_release, 0,
+        "Release files from Lustre.\n"
+        "usage: hsm_release [--filelist FILELIST] [--data DATA] <file> ..."},
+       {"hsm_remove", lfs_hsm_remove, 0,
+        "Remove file copy from external storage.\n"
+        "usage: hsm_remove [--filelist FILELIST] [--data DATA] <file> ..."},
+       {"hsm_cancel", lfs_hsm_cancel, 0,
+        "Cancel requests related to specified files.\n"
+        "usage: hsm_cancel [--filelist FILELIST] [--data DATA] <file> ..."},
+       {"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n"
+        "usage: swap_layouts <path1> <path2>"},
         {"help", Parser_help, 0, "help"},
         {"exit", Parser_quit, 0, "quit"},
         {"quit", Parser_quit, 0, "quit"},
@@ -275,15 +336,49 @@ static int lfs_setstripe(int argc, char **argv)
         char *stripe_off_arg = NULL;
         char *stripe_count_arg = NULL;
         char *pool_name_arg = NULL;
-        unsigned long long size_units;
+        unsigned long long size_units = 1;
 
         struct option long_opts[] = {
-                {"size",        required_argument, 0, 's'},
-                {"count",       required_argument, 0, 'c'},
-                {"index",       required_argument, 0, 'i'},
-                {"offset",      required_argument, 0, 'o'},
-                {"pool",        required_argument, 0, 'p'},
-                {"delete",      no_argument,       0, 'd'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --count option"
+#else
+                /* This formerly implied "stripe-count", but was explicitly
+                 * made "stripe-count" for consistency with other options,
+                 * and to separate it from "mdt-count" when DNE arrives. */
+                {"count",        required_argument, 0, 'c'},
+#endif
+                {"stripe-count", required_argument, 0, 'c'},
+                {"stripe_count", required_argument, 0, 'c'},
+                {"delete",       no_argument,       0, 'd'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --index option"
+#else
+                /* This formerly implied "stripe-index", but was explicitly
+                 * made "stripe-index" for consistency with other options,
+                 * and to separate it from "mdt-index" when DNE arrives. */
+                {"index",        required_argument, 0, 'i'},
+#endif
+                {"stripe-index", required_argument, 0, 'i'},
+                {"stripe_index", required_argument, 0, 'i'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --offset option"
+#else
+                /* This formerly implied "stripe-index", but was confusing
+                 * with "file offset" (which will eventually be needed for
+                 * with different layouts by offset), so deprecate it. */
+                {"offset",       required_argument, 0, 'o'},
+#endif
+                {"pool",         required_argument, 0, 'p'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --size option"
+#else
+                /* This formerly implied "--stripe-size", but was confusing
+                 * with "lfs find --size|-s", which means "file size", so use
+                 * the consistent "--stripe-size|-S" for all commands. */
+                {"size",         required_argument, 0, 's'},
+#endif
+                {"stripe-size",  required_argument, 0, 'S'},
+                {"stripe_size",  required_argument, 0, 'S'},
                 {0, 0, 0, 0}
         };
 
@@ -291,55 +386,74 @@ static int lfs_setstripe(int argc, char **argv)
         st_offset = -1;
         st_count = 0;
 
-#if LUSTRE_VERSION < OBD_OCD_VERSION(2,1,0,0)
+#if LUSTRE_VERSION < OBD_OCD_VERSION(2,4,50,0)
         if (argc == 5 && argv[1][0] != '-' &&
             isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) {
-                fprintf(stderr, "warning: deprecated usage of setstripe "
-                        "positional parameters.  Use -c, -i, -s instead.\n");
-                /* for compatibility with the existing positional parameter
-                 * usage */
-                fname = argv[1];
-                stripe_size_arg = argv[2];
-                stripe_off_arg = argv[3];
-                stripe_count_arg = argv[4];
-                optind = 4;
+                fprintf(stderr, "error: obsolete usage of setstripe "
+                        "positional parameters.  Use -c, -i, -S instead.\n");
+                return CMD_HELP;
         } else
 #else
-#warning "remove obsolete positional parameter code"
+#warning "remove obsolete positional parameter error"
 #endif
         {
                 optind = 0;
-                while ((c = getopt_long(argc, argv, "c:di:o:s:p:",
+                while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:",
                                         long_opts, NULL)) >= 0) {
-                        switch (c) {
-                        case 0:
-                                /* Long options. */
-                                break;
-                        case 'c':
-                                stripe_count_arg = optarg;
-                                break;
-                        case 'd':
-                                /* delete the default striping pattern */
-                                delete = 1;
-                                break;
-                        case 'i':
-                        case 'o':
-                                stripe_off_arg = optarg;
-                                break;
-                        case 's':
-                                stripe_size_arg = optarg;
-                                break;
-                        case 'p':
-                                pool_name_arg = optarg;
-                                break;
-                        case '?':
-                                return CMD_HELP;
-                        default:
-                                fprintf(stderr, "error: %s: option '%s' "
-                                                "unrecognized\n",
-                                                argv[0], argv[optind - 1]);
-                                return CMD_HELP;
-                        }
+                switch (c) {
+                case 0:
+                        /* Long options. */
+                        break;
+                case 'c':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --count option"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                        if (strcmp(argv[optind - 1], "--count") == 0)
+                                fprintf(stderr, "warning: '--count' deprecated"
+                                        ", use '--stripe-count' instead\n");
+#endif
+                        stripe_count_arg = optarg;
+                        break;
+                case 'd':
+                        /* delete the default striping pattern */
+                        delete = 1;
+                        break;
+                case 'o':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0)
+                        fprintf(stderr, "warning: '--offset|-o' deprecated, "
+                                "use '--stripe-index|-i' instead\n");
+#else
+                        if (strcmp(argv[optind - 1], "--offset") == 0)
+                                /* need --stripe-index established first */
+                                fprintf(stderr, "warning: '--offset' deprecated"
+                                        ", use '--index' instead\n");
+#endif
+                case 'i':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --offset and --index options"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                        if (strcmp(argv[optind - 1], "--index") == 0)
+                                fprintf(stderr, "warning: '--index' deprecated"
+                                        ", use '--stripe-index' instead\n");
+#endif
+                        stripe_off_arg = optarg;
+                        break;
+                case 's':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --size option"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                        fprintf(stderr, "warning: '--size|-s' deprecated, "
+                                "use '--stripe-size|-S' instead\n");
+#endif
+                case 'S':
+                        stripe_size_arg = optarg;
+                        break;
+                case 'p':
+                        pool_name_arg = optarg;
+                        break;
+                default:
+                        return CMD_HELP;
+                }
                 }
 
                 fname = argv[optind];
@@ -348,7 +462,7 @@ static int lfs_setstripe(int argc, char **argv)
                     (stripe_size_arg != NULL || stripe_off_arg != NULL ||
                      stripe_count_arg != NULL || pool_name_arg != NULL)) {
                         fprintf(stderr, "error: %s: cannot specify -d with "
-                                        "-s, -c -o or -p options\n",
+                                        "-s, -c, -o, or -p options\n",
                                         argv[0]);
                         return CMD_HELP;
                 }
@@ -364,14 +478,14 @@ static int lfs_setstripe(int argc, char **argv)
         if (stripe_size_arg != NULL) {
                 result = parse_size(stripe_size_arg, &st_size, &size_units, 0);
                 if (result) {
-                        fprintf(stderr, "error: %s: bad size '%s'\n",
+                        fprintf(stderr, "error: %s: bad stripe size '%s'\n",
                                 argv[0], stripe_size_arg);
                         return result;
                 }
         }
         /* get the stripe offset */
         if (stripe_off_arg != NULL) {
-                st_offset = strtoul(stripe_off_arg, &end, 0);
+                st_offset = strtol(stripe_off_arg, &end, 0);
                 if (*end != '\0') {
                         fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
                                 argv[0], stripe_off_arg);
@@ -495,35 +609,35 @@ static int id2name(char **name, unsigned int id, int type)
 #define FIND_POOL_OPT 3
 static int lfs_find(int argc, char **argv)
 {
-        int new_fashion = 1;
         int c, ret;
         time_t t;
-        struct find_param param = { .maxdepth = -1 };
-        char str[1024];
+        struct find_param param = { .maxdepth = -1, .quiet = 1 };
         struct option long_opts[] = {
-                /* New find options. */
-                {"atime",     required_argument, 0, 'A'},
-                {"ctime",     required_argument, 0, 'C'},
-                {"mtime",     required_argument, 0, 'M'},
-                {"maxdepth",  required_argument, 0, 'D'},
-                {"gid",       required_argument, 0, 'g'},
-                {"group",     required_argument, 0, 'G'},
-                {"uid",       required_argument, 0, 'u'},
-                {"user",      required_argument, 0, 'U'},
-                {"name",      required_argument, 0, 'n'},
+                {"atime",        required_argument, 0, 'A'},
+                {"stripe-count", required_argument, 0, 'c'},
+                {"stripe_count", required_argument, 0, 'c'},
+                {"ctime",        required_argument, 0, 'C'},
+                {"maxdepth",     required_argument, 0, 'D'},
+                {"gid",          required_argument, 0, 'g'},
+                {"group",        required_argument, 0, 'G'},
+                {"stripe-index", required_argument, 0, 'i'},
+                {"stripe_index", required_argument, 0, 'i'},
+                {"mdt",          required_argument, 0, 'm'},
+                {"mtime",        required_argument, 0, 'M'},
+                {"name",         required_argument, 0, 'n'},
+     /* reserve {"or",           no_argument,     , 0, 'o'}, to match find(1) */
+                {"obd",          required_argument, 0, 'O'},
+                {"ost",          required_argument, 0, 'O'},
                 /* no short option for pool, p/P already used */
-                {"pool",      required_argument, 0, FIND_POOL_OPT},
-                /* --obd is considered as a new option. */
-                {"obd",       required_argument, 0, 'O'},
-                {"ost",       required_argument, 0, 'O'},
-                {"print",     no_argument,       0, 'P'},
-                {"print0",    no_argument,       0, 'p'},
-                /* Old find options. */
-                {"quiet",     no_argument,       0, 'q'},
-                {"recursive", no_argument,       0, 'r'},
-                {"size",      required_argument, 0, 's'},
-                {"type",      required_argument, 0, 't'},
-                {"verbose",   no_argument,       0, 'v'},
+                {"pool",         required_argument, 0, FIND_POOL_OPT},
+                {"print0",       no_argument,       0, 'p'},
+                {"print",        no_argument,       0, 'P'},
+                {"size",         required_argument, 0, 's'},
+                {"stripe-size",  required_argument, 0, 'S'},
+                {"stripe_size",  required_argument, 0, 'S'},
+                {"type",         required_argument, 0, 't'},
+                {"uid",          required_argument, 0, 'u'},
+                {"user",         required_argument, 0, 'U'},
                 {0, 0, 0, 0}
         };
         int pathstart = -1;
@@ -538,7 +652,8 @@ static int lfs_find(int argc, char **argv)
 
         optind = 0;
         /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
-        while ((c = getopt_long_only(argc,argv,"-A:C:D:g:G:M:n:PpO:qrs:t:u:U:v",
+        while ((c = getopt_long_only(argc, argv,
+                                     "-A:c:C:D:g:G:i:m:M:n:O:Ppqrs:S:t:u:U:v",
                                      long_opts, NULL)) >= 0) {
                 xtime = NULL;
                 xsign = NULL;
@@ -556,17 +671,13 @@ static int lfs_find(int argc, char **argv)
                         fprintf(stderr, "err: %s: filename|dirname must either "
                                         "precede options or follow options\n",
                                         argv[0]);
-                        return CMD_HELP;
+                        ret = CMD_HELP;
+                        goto err;
                 }
                 if (!isoption && pathstart == -1)
                         pathstart = optind - 1;
-                if (isoption && pathstart != -1 && pathend == -1) {
+                if (isoption && pathstart != -1 && pathend == -1)
                         pathend = optind - 2;
-                        if ((c == 1 && strcmp(optarg, "!") == 0) ||
-                            c == 'P' || c == 'p' || c == 'O' ||
-                            c == 'q' || c == 'r' || c == 'v')
-                                pathend = optind - 1;
-                }
                 switch (c) {
                 case 0:
                         /* Long options. */
@@ -581,77 +692,89 @@ static int lfs_find(int argc, char **argv)
                 case 'A':
                         xtime = &param.atime;
                         xsign = &param.asign;
+                        param.exclude_atime = !!neg_opt;
+                        /* no break, this falls through to 'C' for ctime */
                 case 'C':
                         if (c == 'C') {
                                 xtime = &param.ctime;
                                 xsign = &param.csign;
+                                param.exclude_ctime = !!neg_opt;
                         }
+                        /* no break, this falls through to 'M' for mtime */
                 case 'M':
                         if (c == 'M') {
                                 xtime = &param.mtime;
                                 xsign = &param.msign;
-                        }
-                        new_fashion = 1;
-                        if (neg_opt) {
-                                if (optarg[0] == '-')
-                                        optarg[0] = '+';
-                                else if (optarg[0] == '+')
-                                        optarg[0] = '-';
-                                else {
-                                        str[0] = '-';
-                                        str[1] = '\0';
-                                        strcat(str, optarg);
-                                        optarg = str;
-                                }
+                                param.exclude_mtime = !!neg_opt;
                         }
                         ret = set_time(&t, xtime, optarg);
-                        if (ret == INT_MAX)
-                                return -1;
+                        if (ret == INT_MAX) {
+                                ret = -1;
+                                goto err;
+                        }
                         if (ret)
                                 *xsign = ret;
                         break;
+                case 'c':
+                        if (optarg[0] == '+') {
+                                param.stripecount_sign = -1;
+                                optarg++;
+                        } else if (optarg[0] == '-') {
+                                param.stripecount_sign =  1;
+                                optarg++;
+                        }
+
+                        param.stripecount = strtoul(optarg, &endptr, 0);
+                        if (*endptr != '\0') {
+                                fprintf(stderr,"error: bad stripe_count '%s'\n",
+                                        optarg);
+                                ret = -1;
+                                goto err;
+                        }
+                        param.check_stripecount = 1;
+                        param.exclude_stripecount = !!neg_opt;
+                        break;
                 case 'D':
-                        new_fashion = 1;
                         param.maxdepth = strtol(optarg, 0, 0);
                         break;
                 case 'g':
                 case 'G':
-                        new_fashion = 1;
                         ret = name2id(&param.gid, optarg, GROUP);
                         if (ret) {
                                 param.gid = strtoul(optarg, &endptr, 10);
                                 if (*endptr != '\0') {
                                         fprintf(stderr, "Group/GID: %s cannot "
                                                 "be found.\n", optarg);
-                                        return -1;
+                                        ret = -1;
+                                        goto err;
                                 }
-                        }           
+                        }
                         param.exclude_gid = !!neg_opt;
                         param.check_gid = 1;
                         break;
                 case 'u':
                 case 'U':
-                        new_fashion = 1;
                         ret = name2id(&param.uid, optarg, USER);
                         if (ret) {
                                 param.uid = strtoul(optarg, &endptr, 10);
                                 if (*endptr != '\0') {
                                         fprintf(stderr, "User/UID: %s cannot "
                                                 "be found.\n", optarg);
-                                        return -1;
+                                        ret = -1;
+                                        goto err;
                                 }
                         }
                         param.exclude_uid = !!neg_opt;
                         param.check_uid = 1;
                         break;
                 case FIND_POOL_OPT:
-                        new_fashion = 1;
                         if (strlen(optarg) > LOV_MAXPOOLNAME) {
                                 fprintf(stderr,
                                         "Pool name %s is too long"
                                         " (max is %d)\n", optarg,
                                         LOV_MAXPOOLNAME);
-                                return -1;
+                                ret = -1;
+                                goto err;
                         }
                         /* we do check for empty pool because empty pool
                          * is used to find V1 lov attributes */
@@ -661,57 +784,114 @@ static int lfs_find(int argc, char **argv)
                         param.check_pool = 1;
                         break;
                 case 'n':
-                        new_fashion = 1;
                         param.pattern = (char *)optarg;
                         param.exclude_pattern = !!neg_opt;
                         break;
+                case 'm':
+                case 'i':
                 case 'O': {
                         char *buf, *token, *next, *p;
-                        int len;
-
-                        len = strlen((char *)optarg);
-                        buf = malloc(len+1);
-                        if (buf == NULL)
-                                return -ENOMEM;
-                        strcpy(buf, (char *)optarg);
-
-                        if (param.num_alloc_obds == 0) {
-                                param.obduuid = malloc(FIND_MAX_OSTS *
-                                                       sizeof(struct obd_uuid));
-                                if (param.obduuid == NULL)
-                                        return -ENOMEM;
-                                param.num_alloc_obds = INIT_ALLOC_NUM_OSTS;
+                        int len = 1;
+                        void *tmp;
+
+                        buf = strdup(optarg);
+                        if (buf == NULL) {
+                                ret = -ENOMEM;
+                                goto err;
                         }
 
+                        param.exclude_obd = !!neg_opt;
+
+                        token = buf;
+                        while (token && *token) {
+                                token = strchr(token, ',');
+                                if (token) {
+                                        len++;
+                                        token++;
+                                }
+                        }
+                        if (c == 'm') {
+                                param.exclude_mdt = !!neg_opt;
+                                param.num_alloc_mdts += len;
+                                tmp = realloc(param.mdtuuid,
+                                              param.num_alloc_mdts *
+                                              sizeof(*param.mdtuuid));
+                                if (tmp == NULL)
+                                        GOTO(err_free, ret = -ENOMEM);
+                                param.mdtuuid = tmp;
+                        } else {
+                                param.exclude_obd = !!neg_opt;
+                                param.num_alloc_obds += len;
+                                tmp = realloc(param.obduuid,
+                                              param.num_alloc_obds *
+                                              sizeof(*param.obduuid));
+                                if (tmp == NULL)
+                                        GOTO(err_free, ret = -ENOMEM);
+                                param.obduuid = tmp;
+                        }
                         for (token = buf; token && *token; token = next) {
+                                char *uuid;
+                                if (c == 'm')
+                                        uuid =
+                                          param.mdtuuid[param.num_mdts++].uuid;
+                                else
+                                        uuid =
+                                          param.obduuid[param.num_obds++].uuid;
                                 p = strchr(token, ',');
                                 next = 0;
                                 if (p) {
                                         *p = 0;
                                         next = p+1;
                                 }
-                                strcpy((char *)&param.obduuid[param.num_obds++].uuid,
-                                       token);
+                                strcpy((char *)uuid, token);
                         }
-
+err_free:
                         if (buf)
                                 free(buf);
                         break;
                 }
                 case 'p':
-                        new_fashion = 1;
                         param.zeroend = 1;
                         break;
                 case 'P':
                         break;
-                case 'q':
-                        new_fashion = 0;
-                        param.quiet++;
-                        param.verbose = 0;
+                case 's':
+                        if (optarg[0] == '+') {
+                                param.size_sign = -1;
+                                optarg++;
+                        } else if (optarg[0] == '-') {
+                                param.size_sign =  1;
+                                optarg++;
+                        }
+
+                        ret = parse_size(optarg, &param.size,
+                                         &param.size_units, 0);
+                        if (ret) {
+                                fprintf(stderr, "error: bad file size '%s'\n",
+                                        optarg);
+                                goto err;
+                        }
+                        param.check_size = 1;
+                        param.exclude_size = !!neg_opt;
                         break;
-                case 'r':
-                        new_fashion = 0;
-                        param.recursive = 1;
+                case 'S':
+                        if (optarg[0] == '+') {
+                                param.stripesize_sign = -1;
+                                optarg++;
+                        } else if (optarg[0] == '-') {
+                                param.stripesize_sign =  1;
+                                optarg++;
+                        }
+
+                        ret = parse_size(optarg, &param.stripesize,
+                                         &param.stripesize_units, 0);
+                        if (ret) {
+                                fprintf(stderr, "error: bad stripe_size '%s'\n",
+                                        optarg);
+                                goto err;
+                        }
+                        param.check_stripesize = 1;
+                        param.exclude_stripesize = !!neg_opt;
                         break;
                 case 't':
                         param.exclude_type = !!neg_opt;
@@ -728,190 +908,380 @@ static int lfs_find(int argc, char **argv)
 #endif
                         default: fprintf(stderr, "error: %s: bad type '%s'\n",
                                          argv[0], optarg);
-                                 return CMD_HELP;
+                                 ret = CMD_HELP;
+                                 goto err;
                         };
                         break;
-                case 's':
-                        if (neg_opt) {
-                                if (optarg[0] == '-')
-                                        optarg[0] = '+';
-                                else if (optarg[0] == '+')
-                                        optarg[0] = '-';
-                                else {
-                                        str[0] = '-';
-                                        str[1] = '\0';
-                                        strcat(str, optarg);
-                                        optarg = str;
-                                }
-                        }
-                        if (optarg[0] == '+')
-                                param.size_sign = -1;
-                        else if (optarg[0] == '-')
-                                param.size_sign = +1;
-
-                        if (param.size_sign)
-                                optarg++;
-                        ret = parse_size(optarg, &param.size,
-                                         &param.size_units, 0);
-                        if (ret) {
-                                fprintf(stderr,"error: bad size '%s'\n",
-                                        optarg);
-                                return ret;
-                        }
-                        break;
-                case 'v':
-                        new_fashion = 0;
-                        param.verbose++;
-                        param.quiet = 0;
-                        break;
-                case '?':
-                        return CMD_HELP;
                 default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
-                        return CMD_HELP;
+                        ret = CMD_HELP;
+                        goto err;
                 };
         }
 
         if (pathstart == -1) {
                 fprintf(stderr, "error: %s: no filename|pathname\n",
                         argv[0]);
-                return CMD_HELP;
+                ret = CMD_HELP;
+                goto err;
         } else if (pathend == -1) {
                 /* no options */
                 pathend = argc;
         }
 
-        if (new_fashion) {
-                param.quiet = 1;
-        } else {
-                static int deprecated_warning;
-                if (!deprecated_warning) {
-                        fprintf(stderr, "lfs find: -q, -r, -v options "
-                                "deprecated.  Use 'lfs getstripe' instead.\n");
-                        deprecated_warning = 1;
-                }
-                if (!param.recursive && param.maxdepth == -1)
-                        param.maxdepth = 1;
-        }
-
         do {
-                if (new_fashion)
-                        ret = llapi_find(argv[pathstart], &param);
-                else
-                        ret = llapi_getstripe(argv[pathstart], &param);
+                ret = llapi_find(argv[pathstart], &param);
         } while (++pathstart < pathend && !ret);
 
         if (ret)
                 fprintf(stderr, "error: %s failed for %s.\n",
                         argv[0], argv[optind - 1]);
-
+err:
         if (param.obduuid && param.num_alloc_obds)
                 free(param.obduuid);
 
+        if (param.mdtuuid && param.num_alloc_mdts)
+                free(param.mdtuuid);
+
         return ret;
 }
 
-static int lfs_getstripe(int argc, char **argv)
+static int lfs_getstripe_internal(int argc, char **argv,
+                                 struct find_param *param)
 {
         struct option long_opts[] = {
-                {"obd", 1, 0, 'O'},
-                {"quiet", 0, 0, 'q'},
-                {"recursive", 0, 0, 'r'},
-                {"count", 0, 0, 'c'},
-                {"size", 0, 0, 's'},
-                {"index", 0, 0, 'i'},
-                {"offset", 0, 0, 'o'},
-                {"pool", 0, 0, 'p'},
-                {"verbose", 0, 0, 'v'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --count option"
+#else
+                /* This formerly implied "stripe-count", but was explicitly
+                 * made "stripe-count" for consistency with other options,
+                 * and to separate it from "mdt-count" when DNE arrives. */
+                {"count",        no_argument,       0, 'c'},
+#endif
+                {"stripe-count", no_argument,       0, 'c'},
+                {"stripe_count", no_argument,       0, 'c'},
+                {"directory",    no_argument,       0, 'd'},
+                {"generation",   no_argument,       0, 'g'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --index option"
+#else
+                /* This formerly implied "stripe-index", but was explicitly
+                 * made "stripe-index" for consistency with other options,
+                 * and to separate it from "mdt-index" when DNE arrives. */
+                {"index",        no_argument,       0, 'i'},
+#endif
+                {"stripe-index", no_argument,       0, 'i'},
+                {"stripe_index", no_argument,       0, 'i'},
+                {"mdt-index",    no_argument,       0, 'M'},
+                {"mdt_index",    no_argument,       0, 'M'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --offset option"
+#else
+                /* This formerly implied "stripe-index", but was confusing
+                 * with "file offset" (which will eventually be needed for
+                 * with different layouts by offset), so deprecate it. */
+                {"offset",       no_argument,       0, 'o'},
+#endif
+                {"obd",          required_argument, 0, 'O'},
+                {"ost",          required_argument, 0, 'O'},
+                {"pool",         no_argument,       0, 'p'},
+                {"quiet",        no_argument,       0, 'q'},
+                {"recursive",    no_argument,       0, 'r'},
+                {"raw",          no_argument,       0, 'R'},
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --size option"
+#else
+                /* This formerly implied "--stripe-size", but was confusing
+                 * with "lfs find --size|-s", which means "file size", so use
+                 * the consistent "--stripe-size|-S" for all commands. */
+                {"size",         no_argument,       0, 's'},
+#endif
+                {"stripe-size",  no_argument,       0, 'S'},
+                {"stripe_size",  no_argument,       0, 'S'},
+                {"verbose",      no_argument,       0, 'v'},
                 {0, 0, 0, 0}
         };
-        char short_opts[] = "hO:qrvcsiop";
         int c, rc;
-        struct find_param param = { 0 };
 
-        optind = 0;
-        while ((c = getopt_long(argc, argv, short_opts,
-                                long_opts, NULL)) != -1) {
-                switch (c) {
-                case 'O':
-                        if (param.obduuid) {
-                                fprintf(stderr,
-                                        "error: %s: only one obduuid allowed",
-                                        argv[0]);
-                                return CMD_HELP;
-                        }
-                        param.obduuid = (struct obd_uuid *)optarg;
-                        break;
-                case 'q':
-                        param.quiet++;
-                        break;
-                case 'r':
-                        param.recursive = 1;
-                        break;
-                case 'v':
-                        param.verbose = VERBOSE_ALL | VERBOSE_DETAIL;
-                        param.quiet = 0;
-                        break;
-                case 'c':
-                        param.verbose |= VERBOSE_COUNT;
-                        break;
-                case 's':
-                        param.verbose |= VERBOSE_SIZE;
-                        break;
-                case 'i':
-                case 'o':
-                        param.verbose |= VERBOSE_OFFSET;
-                        break;
-                case 'p':
-                        param.verbose |= VERBOSE_POOL;
-                        break;
-                case '?':
-                        return CMD_HELP;
-                default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
-                        return CMD_HELP;
-                }
-        }
-
-        if (optind >= argc)
-                return CMD_HELP;
-
-        param.maxdepth = param.recursive ? -1 : 1;
-
-        do {
-                rc = llapi_getstripe(argv[optind], &param);
-        } while (++optind < argc && !rc);
-
-        if (rc)
-                fprintf(stderr, "error: %s failed for %s.\n",
-                        argv[0], argv[optind - 1]);
-        return rc;
+       param->maxdepth = 1;
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsSv",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'O':
+                       if (param->obduuid) {
+                               fprintf(stderr,
+                                       "error: %s: only one obduuid allowed",
+                                       argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->obduuid = (struct obd_uuid *)optarg;
+                       break;
+               case 'q':
+                       param->quiet++;
+                       break;
+               case 'd':
+                       param->maxdepth = 0;
+                       break;
+               case 'r':
+                       param->recursive = 1;
+                       break;
+               case 'v':
+                       param->verbose = VERBOSE_ALL | VERBOSE_DETAIL;
+                       break;
+               case 'c':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --count option"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                       if (strcmp(argv[optind - 1], "--count") == 0)
+                               fprintf(stderr, "warning: '--count' deprecated,"
+                                       " use '--stripe-count' instead\n");
+#endif
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_COUNT;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 's':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --size option"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                       fprintf(stderr, "warning: '--size|-s' deprecated, "
+                               "use '--stripe-size|-S' instead\n");
+#endif
+               case 'S':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_SIZE;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'o':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0)
+                       fprintf(stderr, "warning: '--offset|-o' deprecated, "
+                               "use '--stripe-index|-i' instead\n");
+#else
+                       if (strcmp(argv[optind - 1], "--offset") == 0)
+                               /* need --stripe-index established first */
+                               fprintf(stderr, "warning: '--offset' deprecated"
+                                       ", use '--index' instead\n");
+#endif
+               case 'i':
+#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
+#warning "remove deprecated --offset and --index options"
+#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
+                       if (strcmp(argv[optind - 1], "--index") == 0)
+                               fprintf(stderr, "warning: '--index' deprecated"
+                                       ", use '--stripe-index' instead\n");
+#endif
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_OFFSET;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'p':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_POOL;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'g':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_GENERATION;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'M':
+                       if (!(param->verbose & VERBOSE_DETAIL))
+                               param->maxdepth = 0;
+                       param->verbose |= VERBOSE_MDTINDEX;
+                       break;
+               case 'R':
+                       param->raw = 1;
+                       break;
+               default:
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind >= argc)
+               return CMD_HELP;
+
+       if (param->recursive)
+               param->maxdepth = -1;
+
+       if (!param->verbose)
+               param->verbose = VERBOSE_ALL;
+       if (param->quiet)
+               param->verbose = VERBOSE_OBJID;
+
+       do {
+               rc = llapi_getstripe(argv[optind], param);
+       } while (++optind < argc && !rc);
+
+       if (rc)
+               fprintf(stderr, "error: %s failed for %s.\n",
+                       argv[0], argv[optind - 1]);
+       return rc;
 }
 
-static int lfs_osts(int argc, char **argv)
+static int lfs_tgts(int argc, char **argv)
 {
-        char mntdir[PATH_MAX] = {'\0'};
+        char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
         struct find_param param;
         int index = 0, rc=0;
 
-        if (argc != 1)
+        if (argc > 2)
                 return CMD_HELP;
 
-        while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) {
+        if (argc == 2 && !realpath(argv[1], path)) {
+                rc = -errno;
+                fprintf(stderr, "error: invalid path '%s': %s\n",
+                        argv[1], strerror(-rc));
+                return rc;
+        }
+
+        while (!llapi_search_mounts(path, index++, mntdir, NULL)) {
+                /* Check if we have a mount point */
+                if (mntdir[0] == '\0')
+                        continue;
+
                 memset(&param, 0, sizeof(param));
-                rc = llapi_getstripe(mntdir, &param);
+                if (!strcmp(argv[0], "mdts"))
+                        param.get_lmv = 1;
+
+                rc = llapi_ostlist(mntdir, &param);
                 if (rc) {
                         fprintf(stderr, "error: %s: failed on %s\n",
                                 argv[0], mntdir);
                 }
+                if (path[0] != '\0')
+                        break;
                 memset(mntdir, 0, PATH_MAX);
         }
 
         return rc;
 }
 
+static int lfs_getstripe(int argc, char **argv)
+{
+       struct find_param param = { 0 };
+       return lfs_getstripe_internal(argc, argv, &param);
+}
+
+/* functions */
+static int lfs_getdirstripe(int argc, char **argv)
+{
+       struct find_param param = { 0 };
+
+       param.get_lmv = 1;
+       return lfs_getstripe_internal(argc, argv, &param);
+}
+
+/* functions */
+static int lfs_setdirstripe(int argc, char **argv)
+{
+       char *dname;
+       int result;
+       int  st_offset, st_count;
+       char *end;
+       int c;
+       char *stripe_off_arg = NULL;
+       int  flags = 0;
+
+       struct option long_opts[] = {
+               {"index",    required_argument, 0, 'i'},
+               {0, 0, 0, 0}
+       };
+
+       st_offset = -1;
+       st_count = 1;
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "i:o",
+                               long_opts, NULL)) >= 0) {
+               switch (c) {
+               case 0:
+                       /* Long options. */
+                       break;
+               case 'i':
+                       stripe_off_arg = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' "
+                                       "unrecognized\n",
+                                       argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind == argc) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       dname = argv[optind];
+       if (stripe_off_arg == NULL) {
+               fprintf(stderr, "error: %s: missing stripe_off.\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+       /* get the stripe offset */
+       st_offset = strtoul(stripe_off_arg, &end, 0);
+       if (*end != '\0') {
+               fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
+                       argv[0], stripe_off_arg);
+               return CMD_HELP;
+       }
+       do {
+               result = llapi_dir_create_pool(dname, flags, st_offset,
+                                              st_count, 0, NULL);
+               if (result) {
+                       fprintf(stderr, "error: %s: create stripe dir '%s' "
+                               "failed\n", argv[0], dname);
+                       break;
+               }
+               dname = argv[++optind];
+       } while (dname != NULL);
+
+       return result;
+}
+
+/* functions */
+static int lfs_rmentry(int argc, char **argv)
+{
+       char *dname;
+       int   index;
+       int   result = 0;
+
+       if (argc <= 1) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       index = 1;
+       dname = argv[index];
+       while (dname != NULL) {
+               result = llapi_direntry_remove(dname);
+               if (result) {
+                       fprintf(stderr, "error: %s: remove dir entry '%s' "
+                               "failed\n", argv[0], dname);
+                       break;
+               }
+               dname = argv[++index];
+       }
+       return result;
+}
+
+static int lfs_osts(int argc, char **argv)
+{
+        return lfs_tgts(argc, argv);
+}
+
+static int lfs_mdts(int argc, char **argv)
+{
+        return lfs_tgts(argc, argv);
+}
+
 #define COOK(value)                                                     \
 ({                                                                      \
         int radix = 0;                                                  \
@@ -922,12 +1292,11 @@ static int lfs_osts(int argc, char **argv)
         radix;                                                          \
 })
 #define UUF     "%-20s"
-#define CSF     "%9s"
-#define CDF     "%9llu"
-#define HSF     "%8s"
-#define HDF     "%6.1f"
-#define RSF     "%5s"
-#define RDF     "%4d%%"
+#define CSF     "%11s"
+#define CDF     "%11llu"
+#define HDF     "%8.1f%c"
+#define RSF     "%4s"
+#define RDF     "%3d%%"
 
 static int showdf(char *mntdir, struct obd_statfs *stat,
                   char *uuid, int ishow, int cooked,
@@ -957,8 +1326,8 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                         total = (stat->os_blocks * stat->os_bsize) >> shift;
                 }
 
-                if (total > 0)
-                        ratio = (double)used / (double)total;
+                if ((used + avail) > 0)
+                        ratio = (double)used / (double)(used + avail);
 
                 if (cooked) {
                         int i;
@@ -967,21 +1336,21 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                         cook_val = (double)total;
                         i = COOK(cook_val);
                         if (i > 0)
-                                sprintf(tbuf, HDF"%c", cook_val, suffix[i - 1]);
+                                sprintf(tbuf, HDF, cook_val, suffix[i - 1]);
                         else
                                 sprintf(tbuf, CDF, total);
 
                         cook_val = (double)used;
                         i = COOK(cook_val);
                         if (i > 0)
-                                sprintf(ubuf, HDF"%c", cook_val, suffix[i - 1]);
+                                sprintf(ubuf, HDF, cook_val, suffix[i - 1]);
                         else
                                 sprintf(ubuf, CDF, used);
 
                         cook_val = (double)avail;
                         i = COOK(cook_val);
                         if (i > 0)
-                                sprintf(abuf, HDF"%c", cook_val, suffix[i - 1]);
+                                sprintf(abuf, HDF, cook_val, suffix[i - 1]);
                         else
                                 sprintf(abuf, CDF, avail);
                 } else {
@@ -990,7 +1359,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                         sprintf(abuf, CDF, avail);
                 }
 
-                sprintf(rbuf, RDF, (int)(ratio * 100));
+                sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
                 printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
                        uuid, tbuf, ubuf, abuf, rbuf, mntdir);
                 if (type)
@@ -1010,12 +1379,23 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
         return 0;
 }
 
-static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
+struct ll_stat_type {
+        int   st_op;
+        char *st_name;
+};
+
+static int mntdf(char *mntdir, char *fsname, char *pool, int ishow,
+               int cooked, int lazy)
 {
         struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
         struct obd_uuid uuid_buf;
         char *poolname = NULL;
+        struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
+                                        { LL_STATFS_LOV, "OST" },
+                                        { 0, NULL } };
+        struct ll_stat_type *tp;
         __u32 index;
+        __u32 type;
         int rc;
 
         if (pool) {
@@ -1039,85 +1419,71 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
                        "UUID", cooked ? "bytes" : "1K-blocks",
                        "Used", "Available", "Use%", "Mounted on");
 
-        for (index = 0; ; index++) {
-                memset(&stat_buf, 0, sizeof(struct obd_statfs));
-                memset(&uuid_buf, 0, sizeof(struct obd_uuid));
-                rc = llapi_obd_statfs(mntdir, LL_STATFS_MDC, index,
-                                      &stat_buf, &uuid_buf);
-                if (rc == -ENODEV)
-                        break;
-
-                if (rc == -EAGAIN)
-                        continue;
-
-                if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO ||
-                    rc == -ENODATA || rc == 0) {
-                        showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
-                               ishow, cooked, "MDT", index, rc);
-                } else {
-                        fprintf(stderr,
-                                "error: llapi_obd_statfs(%s): %s (%d)\n",
-                                obd_uuid2str(&uuid_buf), strerror(-rc), rc);
-                        return rc;
-                }
-                if (rc == 0) {
-                        sum.os_ffree += stat_buf.os_ffree;
-                        sum.os_files += stat_buf.os_files;
-                }
-        }
-
-        for (index = 0; ; index++) {
-                memset(&stat_buf, 0, sizeof(struct obd_statfs));
-                memset(&uuid_buf, 0, sizeof(struct obd_uuid));
-                rc = llapi_obd_statfs(mntdir, LL_STATFS_LOV, index,
-                                      &stat_buf, &uuid_buf);
-                if (rc == -ENODEV)
-                        break;
-
-                if (rc == -EAGAIN)
-                        continue;
+        for (tp = types; tp->st_name != NULL; tp++) {
+                for (index = 0; ; index++) {
+                        memset(&stat_buf, 0, sizeof(struct obd_statfs));
+                        memset(&uuid_buf, 0, sizeof(struct obd_uuid));
+                       type = lazy ? tp->st_op | LL_STATFS_NODELAY : tp->st_op;
+                       rc = llapi_obd_statfs(mntdir, type, index,
+                                              &stat_buf, &uuid_buf);
+                        if (rc == -ENODEV)
+                                break;
 
-                if (llapi_search_ost(fsname, poolname,
-                                     obd_uuid2str(&uuid_buf)) != 1)
-                        continue;
+                        if (poolname && tp->st_op == LL_STATFS_LOV &&
+                            llapi_search_ost(fsname, poolname,
+                                             obd_uuid2str(&uuid_buf)) != 1)
+                                continue;
 
-                if (rc == -ENOTCONN || rc == -ETIMEDOUT || rc == -EIO ||
-                    rc == -ENODATA || rc == 0) {
+                        /* the llapi_obd_statfs() call may have returned with
+                         * an error, but if it filled in uuid_buf we will at
+                         * lease use that to print out a message for that OBD.
+                         * If we didn't get anything in the uuid_buf, then fill
+                         * it in so that we can print an error message. */
+                        if (uuid_buf.uuid[0] == '\0')
+                                sprintf(uuid_buf.uuid, "%s%04x",
+                                        tp->st_name, index);
                         showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
-                               ishow, cooked, "OST", index, rc);
-                } else {
-                        fprintf(stderr,
-                                "error: llapi_obd_statfs failed: %s (%d)\n",
-                                strerror(-rc), rc);
-                        return rc;
-                }
-                if (rc == 0) {
-                        sum.os_blocks += stat_buf.os_blocks * stat_buf.os_bsize;
-                        sum.os_bfree  += stat_buf.os_bfree * stat_buf.os_bsize;
-                        sum.os_bavail += stat_buf.os_bavail * stat_buf.os_bsize;
+                               ishow, cooked, tp->st_name, index, rc);
+
+                        if (rc == 0) {
+                                if (tp->st_op == LL_STATFS_LMV) {
+                                        sum.os_ffree += stat_buf.os_ffree;
+                                        sum.os_files += stat_buf.os_files;
+                                } else /* if (tp->st_op == LL_STATFS_LOV) */ {
+                                        sum.os_blocks += stat_buf.os_blocks *
+                                                stat_buf.os_bsize;
+                                        sum.os_bfree  += stat_buf.os_bfree *
+                                                stat_buf.os_bsize;
+                                        sum.os_bavail += stat_buf.os_bavail *
+                                                stat_buf.os_bsize;
+                                }
+                        } else if (rc == -EINVAL || rc == -EFAULT) {
+                                break;
+                        }
                 }
         }
 
         printf("\n");
         showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0);
-
+        printf("\n");
         return 0;
 }
 
 static int lfs_df(int argc, char **argv)
 {
-        char *path = NULL;
-        char *mntdir = NULL;
+        char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
         int ishow = 0, cooked = 0;
-        int c, rc = 0;
-        char fsname[PATH_MAX], *pool_name = NULL;
+       int lazy = 0;
+        int c, rc = 0, index = 0;
+        char fsname[PATH_MAX] = "", *pool_name = NULL;
         struct option long_opts[] = {
                 {"pool", required_argument, 0, 'p'},
+                {"lazy", 0, 0, 'l'},
                 {0, 0, 0, 0}
         };
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, "ihp:", long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'i':
                         ishow = 1;
@@ -1125,6 +1491,8 @@ static int lfs_df(int argc, char **argv)
                 case 'h':
                         cooked = 1;
                         break;
+                case 'l':
+                        lazy = 1;
                 case 'p':
                         pool_name = optarg;
                         break;
@@ -1132,44 +1500,65 @@ static int lfs_df(int argc, char **argv)
                         return CMD_HELP;
                 }
         }
-        if (optind < argc )
-                path = argv[optind];
+        if (optind < argc && !realpath(argv[optind], path)) {
+                rc = -errno;
+                fprintf(stderr, "error: invalid path '%s': %s\n",
+                        argv[optind], strerror(-rc));
+                return rc;
+        }
+
+        while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+                /* Check if we have a mount point */
+                if (mntdir[0] == '\0')
+                        continue;
 
-        if ((mntdir = malloc(PATH_MAX)) == NULL) {
-                fprintf(stderr, "error: cannot allocate %d bytes\n",
-                        PATH_MAX);
-                return -ENOMEM;
+               rc = mntdf(mntdir, fsname, pool_name, ishow, cooked, lazy);
+                if (rc || path[0] != '\0')
+                        break;
+                fsname[0] = '\0'; /* avoid matching in next loop */
+                mntdir[0] = '\0'; /* avoid matching in next loop */
         }
-        memset(mntdir, 0, PATH_MAX);
 
-        if (path) {
-                char rpath[PATH_MAX] = {'\0'};
+        return rc;
+}
 
-                if (!realpath(path, rpath)) {
-                        rc = -errno;
-                        fprintf(stderr, "error: invalid path '%s': %s\n",
-                                        path, strerror(-rc));
-                } else {
-                        rc = llapi_search_mounts(rpath, 0, mntdir, fsname);
-                        if (rc == 0 && mntdir[0] != '\0') {
-                                rc = mntdf(mntdir, fsname, pool_name,
-                                           ishow, cooked);
-                                printf("\n");
+static int lfs_getname(int argc, char **argv)
+{
+        char mntdir[PATH_MAX] = "", path[PATH_MAX] = "", fsname[PATH_MAX] = "";
+        int rc = 0, index = 0, c;
+        char buf[sizeof(struct obd_uuid)];
+
+        optind = 0;
+        while ((c = getopt(argc, argv, "h")) != -1)
+                return CMD_HELP;
+
+        if (optind == argc) { /* no paths specified, get all paths. */
+                while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+                        rc = llapi_getname(mntdir, buf, sizeof(buf));
+                        if (rc < 0) {
+                                fprintf(stderr,
+                                        "cannot get name for `%s': %s\n",
+                                        mntdir, strerror(-rc));
+                                break;
                         }
-                }
-        } else {
-                int index = 0;
 
-                while (llapi_search_mounts(NULL, index++, mntdir, fsname)==0) {
-                        rc = mntdf(mntdir, fsname, pool_name,
-                                   ishow, cooked);
-                        if (rc)
+                        printf("%s %s\n", buf, mntdir);
+
+                        path[0] = fsname[0] = mntdir[0] = 0;
+                }
+        } else { /* paths specified, only attempt to search these. */
+                for (; optind < argc; optind++) {
+                        rc = llapi_getname(argv[optind], buf, sizeof(buf));
+                        if (rc < 0) {
+                                fprintf(stderr,
+                                        "cannot get name for `%s': %s\n",
+                                        argv[optind], strerror(-rc));
                                 break;
-                        printf("\n");
+                        }
+
+                        printf("%s %s\n", buf, argv[optind]);
                 }
         }
-
-        free(mntdir);
         return rc;
 }
 
@@ -1219,31 +1608,6 @@ static int lfs_check(int argc, char **argv)
 
 }
 
-static int lfs_catinfo(int argc, char **argv)
-{
-        char mntdir[PATH_MAX] = {'\0'};
-        int rc;
-
-        if (argc < 2 || (!strcmp(argv[1],"config") && argc < 3))
-                return CMD_HELP;
-
-        if (strcmp(argv[1], "config") && strcmp(argv[1], "deletions"))
-                return CMD_HELP;
-
-        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
-        if (rc == 0 && mntdir[0] != '\0') {
-                if (argc == 3)
-                        rc = llapi_catinfo(mntdir, argv[1], argv[2]);
-                else
-                        rc = llapi_catinfo(mntdir, argv[1], NULL);
-        } else {
-                fprintf(stderr, "no lustre_lite mounted.\n");
-                rc = -1;
-        }
-
-        return rc;
-}
-
 static int lfs_join(int argc, char **argv)
 {
         fprintf(stderr, "join two lustre files into one.\n"
@@ -1252,32 +1616,6 @@ static int lfs_join(int argc, char **argv)
 }
 
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotachown(int argc, char **argv)
-{
-
-        int c,rc;
-        int flag = 0;
-
-        optind = 0;
-        while ((c = getopt(argc, argv, "i")) != -1) {
-                switch (c) {
-                case 'i':
-                        flag++;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-        if (optind == argc)
-                return CMD_HELP;
-        rc = llapi_quotachown(argv[optind], flag);
-        if(rc)
-                fprintf(stderr,"error: change file owner/group failed.\n");
-        return rc;
-}
-
 static int lfs_quotacheck(int argc, char **argv)
 {
         int c, check_type = 0;
@@ -1290,7 +1628,7 @@ static int lfs_quotacheck(int argc, char **argv)
         memset(&qchk, 0, sizeof(qchk));
 
         optind = 0;
-        while ((c = getopt(argc, argv, "ug")) != -1) {
+        while ((c = getopt(argc, argv, "gu")) != -1) {
                 switch (c) {
                 case 'u':
                         check_type |= 0x01;
@@ -1316,8 +1654,15 @@ static int lfs_quotacheck(int argc, char **argv)
         mnt = argv[optind];
 
         rc = llapi_quotacheck(mnt, check_type);
-        if (rc) {
-                fprintf(stderr, "quotacheck failed: %s\n", strerror(errno));
+       if (rc == -EOPNOTSUPP) {
+               fprintf(stderr, "error: quotacheck not supported by the quota "
+                       "master.\nPlease note that quotacheck is deprecated as "
+                       "of lustre 2.4.0 since space accounting is always "
+                       "enabled.\nFilesystems not formatted with 2.4 utils or "
+                       "beyond can be upgraded with tunefs.lustre --quota.\n");
+               return rc;
+       } else if (rc) {
+                fprintf(stderr, "quotacheck failed: %s\n", strerror(-rc));
                 return rc;
         }
 
@@ -1326,7 +1671,7 @@ static int lfs_quotacheck(int argc, char **argv)
                 if (*obd_type)
                         fprintf(stderr, "%s %s ", obd_type,
                                 obd_uuid2str(&qchk.obd_uuid));
-                fprintf(stderr, "quota check failed: %s\n", strerror(errno));
+                fprintf(stderr, "quota check failed: %s\n", strerror(-rc));
                 return rc;
         }
 
@@ -1334,12 +1679,12 @@ static int lfs_quotacheck(int argc, char **argv)
         qctl.qc_cmd = LUSTRE_Q_QUOTAON;
         qctl.qc_type = check_type;
         rc = llapi_quotactl(mnt, &qctl);
-        if (rc && errno != EALREADY) {
+        if (rc && rc != -EALREADY) {
                 if (*obd_type)
                         fprintf(stderr, "%s %s ", (char *)qctl.obd_type,
                                 obd_uuid2str(&qctl.obd_uuid));
                 fprintf(stderr, "%s turn on quota failed: %s\n",
-                        argv[0], strerror(errno));
+                        argv[0], strerror(-rc));
                 return rc;
         }
 
@@ -1358,7 +1703,7 @@ static int lfs_quotaon(int argc, char **argv)
         qctl.qc_cmd = LUSTRE_Q_QUOTAON;
 
         optind = 0;
-        while ((c = getopt(argc, argv, "ugf")) != -1) {
+        while ((c = getopt(argc, argv, "fgu")) != -1) {
                 switch (c) {
                 case 'u':
                         qctl.qc_type |= 0x01;
@@ -1388,12 +1733,18 @@ static int lfs_quotaon(int argc, char **argv)
 
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
-                if (errno == EALREADY) {
-                        fprintf(stderr, "\n%s quotas are enabled already.\n",
-                                qctl.qc_type == 0x02 ? "user/group" :
-                                (qctl.qc_type == 0x00 ? "user" : "group"));
+                if (rc == -EOPNOTSUPP) {
+                        fprintf(stderr, "error: quotaon not supported by the "
+                                "quota master.\nPlease note that quotaon/off is"
+                                " deprecated as of lustre 2.4.0.\nQuota "
+                                "enforcement should now be enabled on the MGS "
+                                "via:\nmgs# lctl conf_param ${FSNAME}.quota."
+                                "<ost|mdt>=<u|g|ug>\n(ost for block quota, mdt "
+                                "for inode quota, u for user and g for group"
+                                "\n");
+                } else if (rc == -EALREADY) {
                         rc = 0;
-                } else if (errno == ENOENT) {
+                } else if (rc == -ENOENT) {
                         fprintf(stderr, "error: cannot find quota database, "
                                         "make sure you have run quotacheck\n");
                 } else {
@@ -1401,7 +1752,7 @@ static int lfs_quotaon(int argc, char **argv)
                                 fprintf(stderr, "%s %s ", obd_type,
                                         obd_uuid2str(&qctl.obd_uuid));
                         fprintf(stderr, "%s failed: %s\n", argv[0],
-                                strerror(errno));
+                                strerror(-rc));
                 }
         }
 
@@ -1420,7 +1771,7 @@ static int lfs_quotaoff(int argc, char **argv)
         qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
 
         optind = 0;
-        while ((c = getopt(argc, argv, "ug")) != -1) {
+        while ((c = getopt(argc, argv, "gu")) != -1) {
                 switch (c) {
                 case 'u':
                         qctl.qc_type |= 0x01;
@@ -1447,71 +1798,27 @@ static int lfs_quotaoff(int argc, char **argv)
 
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
-                if (errno == EALREADY) {
-                        fprintf(stderr, "\n%s quotas are disabled already.\n",
-                                qctl.qc_type == 0x02 ? "user/group" :
-                                (qctl.qc_type == 0x00 ? "user" : "group"));
+                if (rc == -EOPNOTSUPP) {
+                        fprintf(stderr, "error: quotaoff not supported by the "
+                                "quota master.\nPlease note that quotaon/off is"
+                                " deprecated as of lustre 2.4.0.\nQuota "
+                                "enforcement can be disabled on the MGS via:\n"
+                                "mgs# lctl conf_param ${FSNAME}.quota.<ost|mdt>"
+                                "=\"\"\n");
+                } else if (rc == -EALREADY) {
                         rc = 0;
                 } else {
                         if (*obd_type)
                                 fprintf(stderr, "%s %s ", obd_type,
                                         obd_uuid2str(&qctl.obd_uuid));
                         fprintf(stderr, "quotaoff failed: %s\n",
-                                strerror(errno));
+                                strerror(-rc));
                 }
         }
 
         return rc;
 }
 
-static int lfs_quotainv(int argc, char **argv)
-{
-        int c;
-        char *mnt;
-        struct if_quotactl qctl;
-        int rc;
-
-        memset(&qctl, 0, sizeof(qctl));
-        qctl.qc_cmd = LUSTRE_Q_INVALIDATE;
-
-        optind = 0;
-        while ((c = getopt(argc, argv, "ugf")) != -1) {
-                switch (c) {
-                case 'u':
-                        qctl.qc_type |= 0x01;
-                        break;
-                case 'g':
-                        qctl.qc_type |= 0x02;
-                        break;
-                case 'f':
-                        qctl.qc_cmd = LUSTRE_Q_FINVALIDATE;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-
-        if (qctl.qc_type)
-                qctl.qc_type--;
-        else /* by default, invalidate quota for both user & group */
-                qctl.qc_type = 0x02;
-
-        if (argc == optind)
-                return CMD_HELP;
-
-        mnt = argv[optind];
-
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc) {
-                fprintf(stderr, "quotainv failed: %s\n", strerror(errno));
-                return rc;
-        }
-
-        return 0;
-}
-
 #define ARG2INT(nr, str, msg)                                           \
 do {                                                                    \
         char *endp;                                                     \
@@ -1531,8 +1838,8 @@ do {                                                                    \
  *        2. specifiers may be encountered multiple times (2s3s is 5 seconds)
  *        3. empty integer value is interpreted as 0
  */
-
-static unsigned long str2sec(const char* timestr) {
+static unsigned long str2sec(const char* timestr)
+{
         const char spec[] = "smhdw";
         const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
         unsigned long val = 0;
@@ -1581,9 +1888,9 @@ error:
         return ULONG_MAX;
 }
 
-#define ARG2ULL(nr, str, defscale)                                      \
+#define ARG2ULL(nr, str, def_units)                                     \
 do {                                                                    \
-        unsigned long long limit, units = 0;                            \
+        unsigned long long limit, units = def_units;                    \
         int rc;                                                         \
                                                                         \
         rc = parse_size(str, &limit, &units, 1);                        \
@@ -1591,7 +1898,7 @@ do {                                                                    \
                 fprintf(stderr, "error: bad limit value %s\n", str);    \
                 return CMD_HELP;                                        \
         }                                                               \
-        nr = ((units == 0) ? (defscale) : 1) * limit;                   \
+        nr = limit;                                                     \
 } while (0)
 
 static inline int has_times_option(int argc, char **argv)
@@ -1613,11 +1920,11 @@ int lfs_setquota_times(int argc, char **argv)
         struct obd_dqblk *dqb = &qctl.qc_dqblk;
         struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
         struct option long_opts[] = {
-                {"user",            no_argument,       0, 'u'},
-                {"group",           no_argument,       0, 'g'},
                 {"block-grace",     required_argument, 0, 'b'},
+                {"group",           no_argument,       0, 'g'},
                 {"inode-grace",     required_argument, 0, 'i'},
                 {"times",           no_argument,       0, 't'},
+                {"user",            no_argument,       0, 'u'},
                 {0, 0, 0, 0}
         };
 
@@ -1626,7 +1933,7 @@ int lfs_setquota_times(int argc, char **argv)
         qctl.qc_type = UGQUOTA;
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, "ugb:i:t", long_opts, NULL)) != -1) {
+        while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'u':
                 case 'g':
@@ -1676,7 +1983,7 @@ int lfs_setquota_times(int argc, char **argv)
                 if (*obd_type)
                         fprintf(stderr, "%s %s ", obd_type,
                                 obd_uuid2str(&qctl.obd_uuid));
-                fprintf(stderr, "setquota failed: %s\n", strerror(errno));
+                fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
                 return rc;
         }
 
@@ -1695,12 +2002,12 @@ int lfs_setquota(int argc, char **argv)
         char *mnt, *obd_type = (char *)qctl.obd_type;
         struct obd_dqblk *dqb = &qctl.qc_dqblk;
         struct option long_opts[] = {
-                {"user",            required_argument, 0, 'u'},
-                {"group",           required_argument, 0, 'g'},
                 {"block-softlimit", required_argument, 0, 'b'},
                 {"block-hardlimit", required_argument, 0, 'B'},
+                {"group",           required_argument, 0, 'g'},
                 {"inode-softlimit", required_argument, 0, 'i'},
                 {"inode-hardlimit", required_argument, 0, 'I'},
+                {"user",            required_argument, 0, 'u'},
                 {0, 0, 0, 0}
         };
         unsigned limit_mask = 0;
@@ -1716,7 +2023,7 @@ int lfs_setquota(int argc, char **argv)
                                  * isn't reinitialized from command line */
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, "u:g:b:B:i:I:", long_opts, NULL)) != -1) {
+        while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'u':
                 case 'g':
@@ -1732,7 +2039,7 @@ int lfs_setquota(int argc, char **argv)
                                 qctl.qc_id = strtoul(optarg, &endptr, 10);
                                 if (*endptr != '\0') {
                                         fprintf(stderr, "error: can't find id "
-                                                "for name %s\n", optarg); 
+                                                "for name %s\n", optarg);
                                         return CMD_HELP;
                                 }
                         }
@@ -1788,7 +2095,7 @@ int lfs_setquota(int argc, char **argv)
                 if (rc < 0) {
                         fprintf(stderr, "error: setquota failed while retrieving"
                                         " current quota settings (%s)\n",
-                                        strerror(errno));
+                                        strerror(-rc));
                         return rc;
                 }
 
@@ -1821,7 +2128,7 @@ int lfs_setquota(int argc, char **argv)
                 if (*obd_type)
                         fprintf(stderr, "%s %s ", obd_type,
                                 obd_uuid2str(&qctl.obd_uuid));
-                fprintf(stderr, "setquota failed: %s\n", strerror(errno));
+                fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
                 return rc;
         }
 
@@ -1838,7 +2145,6 @@ static inline char *type2name(int check_type)
                 return "unknown";
 }
 
-
 /* Converts seconds value into format string
  * result is returned in buf
  * Notes:
@@ -1846,12 +2152,12 @@ static inline char *type2name(int check_type)
  *        2. zero fields are not filled (except for p. 3): 5d1s
  *        3. zero seconds value is presented as "0s"
  */
-static void sec2str(time_t seconds, char *buf)
+static char * __sec2str(time_t seconds, char *buf)
 {
         const char spec[] = "smhdw";
         const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
         unsigned long c;
-        chartail = buf;
+        char *tail = buf;
         int i;
 
         for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) {
@@ -1862,8 +2168,24 @@ static void sec2str(time_t seconds, char *buf)
 
                 seconds %= mult[i];
         }
+
+        return tail;
 }
 
+static void sec2str(time_t seconds, char *buf, int rc)
+{
+        char *tail = buf;
+
+        if (rc)
+                *tail++ = '[';
+
+        tail = __sec2str(seconds, tail);
+
+        if (rc && tail - buf < 39) {
+                *tail++ = ']';
+                *tail++ = 0;
+        }
+}
 
 static void diff2str(time_t seconds, char *buf, time_t now)
 {
@@ -1875,7 +2197,7 @@ static void diff2str(time_t seconds, char *buf, time_t now)
                 strcpy(buf, "none");
                 return;
         }
-        sec2str(seconds - now, buf);
+        __sec2str(seconds - now, buf);
 }
 
 static void print_quota_title(char *name, struct if_quotactl *qctl)
@@ -1902,8 +2224,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                 if (dqb->dqb_bhardlimit &&
                     toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
                         bover = 1;
-                } else if (dqb->dqb_bsoftlimit &&
-                           toqb(dqb->dqb_curspace) >= dqb->dqb_bsoftlimit) {
+                } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
                         if (dqb->dqb_btime > now) {
                                 bover = 2;
                         } else {
@@ -1914,8 +2235,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                 if (dqb->dqb_ihardlimit &&
                     dqb->dqb_curinodes >= dqb->dqb_ihardlimit) {
                         iover = 1;
-                } else if (dqb->dqb_isoftlimit &&
-                           dqb->dqb_curinodes >= dqb->dqb_isoftlimit) {
+                } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) {
                         if (dqb->dqb_btime > now) {
                                 iover = 2;
                         } else {
@@ -1937,7 +2257,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
 
                         if (bover)
                                 diff2str(dqb->dqb_btime, timebuf, now);
-                        if (rc == -1 && errno == EREMOTEIO)
+                        if (rc == -EREMOTEIO)
                                 sprintf(numbuf[0], LPU64"*",
                                         toqb(dqb->dqb_curspace));
                         else
@@ -1950,12 +2270,12 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                                         ? LPU64 : "["LPU64"]",
                                         dqb->dqb_bsoftlimit);
                         else
-                                sprintf(numbuf[1], "%s", "");
+                                sprintf(numbuf[1], "%s", "-");
                         sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS)
                                 ? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit);
                         printf(" %7s%c %6s %7s %7s",
                                numbuf[0], bover ? '*' : ' ', numbuf[1],
-                               numbuf[2], bover > 1 ? timebuf : "");
+                               numbuf[2], bover > 1 ? timebuf : "-");
 
                         if (iover)
                                 diff2str(dqb->dqb_itime, timebuf, now);
@@ -1967,13 +2287,15 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                                         ? LPU64 : "["LPU64"]",
                                         dqb->dqb_isoftlimit);
                         else
-                                sprintf(numbuf[1], "%s", "");
+                                sprintf(numbuf[1], "%s", "-");
                         sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
                                 LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
                         if (type != QC_OSTIDX)
                                 printf(" %7s%c %6s %7s %7s",
                                        numbuf[0], iover ? '*' : ' ', numbuf[1],
-                                       numbuf[2], iover > 1 ? timebuf : "");
+                                       numbuf[2], iover > 1 ? timebuf : "-");
+                        else
+                                printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
                         printf("\n");
                 }
         } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
@@ -1981,8 +2303,8 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                 char bgtimebuf[40];
                 char igtimebuf[40];
 
-                sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf);
-                sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf);
+                sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc);
+                sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc);
                 printf("Block grace time: %s; Inode grace time: %s\n",
                        bgtimebuf, igtimebuf);
         }
@@ -1996,7 +2318,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt)
         rc = llapi_get_obd_count(mnt, &count, is_mdt);
         if (rc) {
                 fprintf(stderr, "can not get %s count: %s\n",
-                        is_mdt ? "mdt": "ost", strerror(errno));
+                        is_mdt ? "mdt": "ost", strerror(-rc));
                 return rc;
         }
 
@@ -2005,7 +2327,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt)
                 rc = llapi_quotactl(mnt, qctl);
                 if (rc) {
                         /* It is remote client case. */
-                        if (errno == EOPNOTSUPP) {
+                        if (-rc == EOPNOTSUPP) {
                                 rc = 0;
                                 goto out;
                         }
@@ -2033,12 +2355,13 @@ static int lfs_quota(int argc, char **argv)
                                     .qc_type = UGQUOTA };
         char *obd_type = (char *)qctl.obd_type;
         char *obd_uuid = (char *)qctl.obd_uuid.uuid;
-        int rc, rc1 = 0, rc2 = 0, rc3 = 0, verbose = 0, pass = 0;
+        int rc, rc1 = 0, rc2 = 0, rc3 = 0,
+            verbose = 0, pass = 0, quiet = 0, inacc;
         char *endptr;
         __u32 valid = QC_GENERAL, idx = 0;
 
         optind = 0;
-        while ((c = getopt(argc, argv, "ugto:i:I:v")) != -1) {
+        while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) {
                 switch (c) {
                 case 'u':
                         if (qctl.qc_type != UGQUOTA) {
@@ -2072,6 +2395,9 @@ static int lfs_quota(int argc, char **argv)
                 case 'v':
                         verbose = 1;
                         break;
+                case 'q':
+                        quiet = 1;
+                        break;
                 default:
                         fprintf(stderr, "error: %s: option '-%c' "
                                         "unrecognized\n", argv[0], c);
@@ -2122,23 +2448,38 @@ ug_output:
                 return CMD_HELP;
         }
 
-        if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA)
-                print_quota_title(name, &qctl);
-
         mnt = argv[optind];
 
         rc1 = llapi_quotactl(mnt, &qctl);
-        if (rc1 == -1 && errno == EALREADY) {
-                fprintf(stderr, "\n%s quotas are not enabled.\n",
-                        qctl.qc_type == USRQUOTA ? "user" : "group");
-                goto out;
+        if (rc1 < 0) {
+                switch (rc1) {
+                case -ESRCH:
+                        fprintf(stderr, "%s quotas are not enabled.\n",
+                                qctl.qc_type == USRQUOTA ? "user" : "group");
+                        goto out;
+                case -EPERM:
+                        fprintf(stderr, "Permission denied.\n");
+                case -ENOENT:
+                        /* We already got a "No such file..." message. */
+                        goto out;
+                default:
+                        fprintf(stderr, "Unexpected quotactl error: %s\n",
+                                strerror(-rc1));
+                }
         }
+
+        if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
+                print_quota_title(name, &qctl);
+
         if (rc1 && *obd_type)
                 fprintf(stderr, "%s %s ", obd_type, obd_uuid);
 
         if (qctl.qc_valid != QC_GENERAL)
                 mnt = "";
 
+        inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
+                ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE));
+
         print_quota(mnt, &qctl, QC_GENERAL, rc1);
 
         if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) {
@@ -2146,7 +2487,7 @@ ug_output:
                 rc3 = print_obd_quota(mnt, &qctl, 0);
         }
 
-        if (rc1 || rc2 || rc3)
+        if (rc1 || rc2 || rc3 || inacc)
                 printf("Some errors happened when getting quota info. "
                        "Some devices may be not working or deactivated. "
                        "The data in \"[]\" is inaccurate.\n");
@@ -2155,7 +2496,7 @@ out:
         if (pass == 1)
                 goto ug_output;
 
-        return 0;
+        return rc1;
 }
 #endif /* HAVE_SYS_QUOTA_H! */
 
@@ -2182,7 +2523,7 @@ static int flushctx_ioctl(char *mp)
 static int lfs_flushctx(int argc, char **argv)
 {
         int     kdestroy = 0, c;
-        FILE   *proc;
+       FILE   *proc = NULL;
         char    procline[PATH_MAX], *line;
         int     rc = 0;
 
@@ -2225,7 +2566,8 @@ static int lfs_flushctx(int argc, char **argv)
                                 fprintf(stderr, "%s: unexpected format in "
                                                 "/proc/mounts\n",
                                         argv[0]);
-                                return -1;
+                               rc = -1;
+                               goto out;
                         }
 
                         if (strcmp(fs, "lustre") != 0)
@@ -2247,6 +2589,9 @@ static int lfs_flushctx(int argc, char **argv)
                 }
         }
 
+out:
+       if (proc != NULL)
+               fclose(proc);
         return rc;
 }
 
@@ -2287,7 +2632,7 @@ static int lfs_ls(int argc, char **argv)
 static int lfs_changelog(int argc, char **argv)
 {
         void *changelog_priv;
-        struct changelog_rec *rec;
+       struct changelog_ext_rec *rec;
         long long startrec = 0, endrec = 0;
         char *mdd;
         struct option long_opts[] = {
@@ -2335,10 +2680,14 @@ static int lfs_changelog(int argc, char **argv)
                 time_t secs;
                 struct tm ts;
 
-                if (endrec && rec->cr_index > endrec)
+                if (endrec && rec->cr_index > endrec) {
+                        llapi_changelog_free(&rec);
                         break;
-                if (rec->cr_index < startrec)
+                }
+                if (rec->cr_index < startrec) {
+                        llapi_changelog_free(&rec);
                         continue;
+                }
 
                 secs = rec->cr_time >> 30;
                 gmtime_r(&secs, &ts);
@@ -2347,14 +2696,18 @@ static int lfs_changelog(int argc, char **argv)
                        changelog_type2str(rec->cr_type),
                        ts.tm_hour, ts.tm_min, ts.tm_sec,
                        (int)(rec->cr_time & ((1<<30) - 1)),
-                       ts.tm_year+1900, ts.tm_mon+1, ts.tm_mday,
+                       ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday,
                        rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
                 if (rec->cr_namelen)
                         /* namespace rec includes parent and filename */
-                        printf(" p="DFID" %.*s\n", PFID(&rec->cr_pfid),
-                               rec->cr_namelen, rec->cr_name);
-                else
-                        printf("\n");
+                       printf(" p="DFID" %.*s", PFID(&rec->cr_pfid),
+                               rec->cr_namelen, rec->cr_name);
+               if (fid_is_sane(&rec->cr_sfid))
+                       printf(" s="DFID" sp="DFID" %.*s",
+                               PFID(&rec->cr_sfid), PFID(&rec->cr_spfid),
+                               changelog_rec_snamelen(rec),
+                               changelog_rec_sname(rec));
+               printf("\n");
 
                 llapi_changelog_free(&rec);
         }
@@ -2442,9 +2795,15 @@ static int lfs_fid2path(int argc, char **argv)
                 }
 
                 if (printcur)
-                        fprintf(stdout, "%lld %s\n", rectmp, path);
-                else
-                        fprintf(stdout, "%s\n", path);
+                        fprintf(stdout, "%lld ", rectmp);
+                if (device[0] == '/') {
+                        fprintf(stdout, "%s", device);
+                        if (device[strlen(device) - 1] != '/')
+                                fprintf(stdout, "/");
+                } else if (path[0] == '\0') {
+                        fprintf(stdout, "/");
+                }
+                fprintf(stdout, "%s\n", path);
 
                 if (linkno >= 0)
                         /* specified linkno */
@@ -2480,6 +2839,485 @@ static int lfs_path2fid(int argc, char **argv)
         return 0;
 }
 
+static int lfs_data_version(int argc, char **argv)
+{
+        char *path;
+        __u64 data_version;
+        int fd;
+        int rc;
+        int c;
+        int nolock = 0;
+
+        if (argc < 2)
+                return CMD_HELP;
+
+        optind = 0;
+        while ((c = getopt(argc, argv, "n")) != -1) {
+                switch (c) {
+                case 'n':
+                        nolock = LL_DV_NOFLUSH;
+                        break;
+                default:
+                        return CMD_HELP;
+                }
+        }
+        if (optind == argc)
+                return CMD_HELP;
+
+        path = argv[optind];
+        fd = open(path, O_RDONLY);
+        if (fd < 0) {
+                fprintf(stderr, "can't open %s: %s\n", path,
+                        strerror(errno));
+                return errno;
+        }
+
+        rc = llapi_get_data_version(fd, &data_version, nolock);
+        if (rc) {
+                fprintf(stderr, "can't get version for %s: %s\n", path,
+                        strerror(errno = -rc));
+       } else
+               printf(LPU64 "\n", data_version);
+
+       close(fd);
+
+       return rc;
+}
+
+static int lfs_hsm_state(int argc, char **argv)
+{
+       int rc;
+       int i = 1;
+       char *path;
+       struct hsm_user_state hus;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       do {
+               path = argv[i];
+
+               rc = llapi_hsm_state_get(path, &hus);
+               if (rc) {
+                       fprintf(stderr, "can't get hsm state for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+
+               /* Display path name and status flags */
+               printf("%s: (0x%08x)", path, hus.hus_states);
+
+               if (hus.hus_states & HS_RELEASED)
+                       printf(" released");
+               if (hus.hus_states & HS_EXISTS)
+                       printf(" exists");
+               if (hus.hus_states & HS_DIRTY)
+                       printf(" dirty");
+               if (hus.hus_states & HS_ARCHIVED)
+                       printf(" archived");
+               /* Display user-settable flags */
+               if (hus.hus_states & HS_NORELEASE)
+                       printf(" never_release");
+               if (hus.hus_states & HS_NOARCHIVE)
+                       printf(" never_archive");
+               if (hus.hus_states & HS_LOST)
+                       printf(" lost_from_hsm");
+
+               if (hus.hus_archive_id != 0)
+                       printf(", archive_id:%d", hus.hus_archive_id);
+               printf("\n");
+
+       } while (++i < argc);
+
+       return 0;
+}
+
+#define LFS_HSM_SET   0
+#define LFS_HSM_CLEAR 1
+
+/**
+ * Generic function to set or clear HSM flags.
+ * Used by hsm_set and hsm_clear.
+ *
+ * @mode  if LFS_HSM_SET, set the flags, if LFS_HSM_CLEAR, clear the flags.
+ */
+static int lfs_hsm_change_flags(int argc, char **argv, int mode)
+{
+       struct option long_opts[] = {
+               {"lost", 0, 0, 'l'},
+               {"norelease", 0, 0, 'r'},
+               {"noarchive", 0, 0, 'a'},
+               {"archived", 0, 0, 'A'},
+               {"dirty", 0, 0, 'd'},
+               {"exists", 0, 0, 'e'},
+               {0, 0, 0, 0}
+       };
+       char short_opts[] = "lraAde";
+       __u64 mask = 0;
+       int c, rc;
+       char *path;
+
+       if (argc < 3)
+               return CMD_HELP;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'l':
+                       mask |= HS_LOST;
+                       break;
+               case 'a':
+                       mask |= HS_NOARCHIVE;
+                       break;
+               case 'A':
+                       mask |= HS_ARCHIVED;
+                       break;
+               case 'r':
+                       mask |= HS_NORELEASE;
+                       break;
+               case 'd':
+                       mask |= HS_DIRTY;
+                       break;
+               case 'e':
+                       mask |= HS_EXISTS;
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       /* User should have specified a flag */
+       if (mask == 0)
+               return CMD_HELP;
+
+       while (optind < argc) {
+
+               path = argv[optind];
+
+               /* If mode == 0, this means we apply the mask. */
+               if (mode == LFS_HSM_SET)
+                       rc = llapi_hsm_state_set(path, mask, 0, 0);
+               else
+                       rc = llapi_hsm_state_set(path, 0, mask, 0);
+
+               if (rc != 0) {
+                       fprintf(stderr, "Can't change hsm flags for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+               optind++;
+       }
+
+       return 0;
+}
+
+static int lfs_hsm_action(int argc, char **argv)
+{
+       int                              rc;
+       int                              i = 1;
+       char                            *path;
+       struct hsm_current_action        hca;
+       struct hsm_extent                he;
+       enum hsm_user_action             hua;
+       enum hsm_progress_states         hps;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       do {
+               path = argv[i];
+
+               rc = llapi_hsm_current_action(path, &hca);
+               if (rc) {
+                       fprintf(stderr, "can't get hsm action for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+               he = hca.hca_location;
+               hua = hca.hca_action;
+               hps = hca.hca_state;
+
+               printf("%s: %s", path, hsm_user_action2name(hua));
+
+               /* Skip file without action */
+               if (hca.hca_action == HUA_NONE) {
+                       printf("\n");
+                       continue;
+               }
+
+               printf(" %s ", hsm_progress_state2name(hps));
+
+               if ((hps == HPS_RUNNING) &&
+                   (hua == HUA_ARCHIVE || hua == HUA_RESTORE))
+                       printf("("LPX64 " bytes moved)\n", he.length);
+               else if ((he.offset + he.length) == OBD_OBJECT_EOF)
+                       printf("(from "LPX64 " to EOF)\n", he.offset);
+               else
+                       printf("(from "LPX64 " to "LPX64")\n",
+                              he.offset, he.offset + he.length);
+
+       } while (++i < argc);
+
+       return 0;
+}
+
+static int lfs_hsm_set(int argc, char **argv)
+{
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_SET);
+}
+
+static int lfs_hsm_clear(int argc, char **argv)
+{
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_CLEAR);
+}
+
+/**
+ * Check file state and return its fid, to be used by lfs_hsm_request().
+ *
+ * \param[in]     file      Path to file to check
+ * \param[in,out] fid       Pointer to allocated lu_fid struct.
+ * \param[in,out] last_dev  Pointer to last device id used.
+ *
+ * \return 0 on success.
+ */
+static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid,
+                               dev_t *last_dev)
+{
+       struct stat     st;
+       int             rc;
+
+       rc = lstat(file, &st);
+       if (rc) {
+               fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno));
+               return -errno;
+       }
+       /* A request should be ... */
+       if (*last_dev != st.st_dev && *last_dev != 0) {
+               fprintf(stderr, "All files should be "
+                       "on the same filesystem: %s\n", file);
+               return -EINVAL;
+       }
+       *last_dev = st.st_dev;
+
+       rc = llapi_path2fid(file, fid);
+       if (rc) {
+               fprintf(stderr, "Cannot read FID of %s: %s\n",
+                       file, strerror(-rc));
+               return rc;
+       }
+       return 0;
+}
+
+static int lfs_hsm_request(int argc, char **argv, int action)
+{
+       struct option            long_opts[] = {
+               {"filelist", 1, 0, 'l'},
+               {"data", 1, 0, 'D'},
+               {"archive", 1, 0, 'a'},
+               {0, 0, 0, 0}
+       };
+       dev_t                    last_dev = 0;
+       char                     short_opts[] = "l:D:a:";
+       struct hsm_user_request *hur, *oldhur;
+       int                      c, i;
+       size_t                   len;
+       int                      nbfile;
+       char                    *line = NULL;
+       char                    *filelist = NULL;
+       char                     fullpath[PATH_MAX];
+       char                    *opaque = NULL;
+       int                      opaque_len = 0;
+       int                      archive_id = 0;
+       FILE                    *fp;
+       int                      nbfile_alloc = 0;
+       char                     some_file[PATH_MAX+1] = "";
+       int                      rc;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'l':
+                       filelist = optarg;
+                       break;
+               case 'D':
+                       opaque = optarg;
+                       break;
+               case 'a':
+                       if (action != HUA_ARCHIVE) {
+                               fprintf(stderr,
+                                       "error: -a is supported only "
+                                       "when archiving\n");
+                               return CMD_HELP;
+                       }
+                       archive_id = atoi(optarg);
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       /* All remaining args are files, so we have at least nbfile */
+       nbfile = argc - optind;
+
+       if ((nbfile == 0) && (filelist == NULL))
+               return CMD_HELP;
+
+       if (opaque != NULL)
+               opaque_len = strlen(opaque);
+
+       /* Alloc the request structure with enough place to store all files
+        * from command line. */
+       hur = llapi_hsm_user_request_alloc(nbfile, opaque_len);
+       if (hur == NULL) {
+               fprintf(stderr, "Cannot create the request: %s\n",
+                       strerror(errno));
+               return errno;
+       }
+       nbfile_alloc = nbfile;
+
+       hur->hur_request.hr_action = action;
+       hur->hur_request.hr_archive_id = archive_id;
+       hur->hur_request.hr_flags = 0;
+
+       /* All remaining args are files, add them */
+       if (nbfile != 0)
+               strcpy(some_file, argv[optind]);
+
+       for (i = 0; i < nbfile; i++) {
+               hur->hur_user_item[i].hui_extent.length = -1;
+               rc = lfs_hsm_prepare_file(argv[optind + i],
+                                         &hur->hur_user_item[i].hui_fid,
+                                         &last_dev);
+               hur->hur_request.hr_itemcount++;
+               if (rc)
+                       goto out_free;
+       }
+
+       /* from here stop using nb_file, use hur->hur_request.hr_itemcount */
+
+       /* If a filelist was specified, read the filelist from it. */
+       if (filelist != NULL) {
+               fp = fopen(filelist, "r");
+               if (fp == NULL) {
+                       fprintf(stderr, "Cannot read the file list %s: %s\n",
+                               filelist, strerror(errno));
+                       rc = -errno;
+                       goto out_free;
+               }
+
+               while ((rc = getline(&line, &len, fp)) != -1) {
+                       struct hsm_user_item *hui;
+
+                       /* If allocated buffer was too small, gets something
+                        * bigger */
+                       if (nbfile_alloc <= hur->hur_request.hr_itemcount) {
+                               nbfile_alloc = nbfile_alloc * 2 + 1;
+                               oldhur = hur;
+                               hur = llapi_hsm_user_request_alloc(nbfile_alloc,
+                                                                  opaque_len);
+                               if (hur == NULL) {
+                                       fprintf(stderr, "Cannot allocate "
+                                               "the request: %s\n",
+                                               strerror(errno));
+                                       hur = oldhur;
+                                       rc = -errno;
+                                       goto out_free;
+                               }
+                               memcpy(hur, oldhur, hur_len(oldhur));
+                               free(oldhur);
+                       }
+
+                       /* Chop CR */
+                       if (line[strlen(line) - 1] == '\n')
+                               line[strlen(line) - 1] = '\0';
+
+                       hui =
+                            &hur->hur_user_item[hur->hur_request.hr_itemcount];
+                       hui->hui_extent.length = -1;
+                       rc = lfs_hsm_prepare_file(line, &hui->hui_fid,
+                                                 &last_dev);
+                       hur->hur_request.hr_itemcount++;
+                       if (rc)
+                               goto out_free;
+
+                       if ((some_file[0] == '\0') &&
+                           (strlen(line) < sizeof(some_file)))
+                               strcpy(some_file, line);
+               }
+
+               rc = fclose(fp);
+               if (line)
+                       free(line);
+       }
+
+       /* If a --data was used, add it to the request */
+       hur->hur_request.hr_data_len = opaque_len;
+       if (opaque != NULL)
+               memcpy(hur_data(hur), opaque, opaque_len);
+
+       /* Send the HSM request */
+       if (realpath(some_file, fullpath) == NULL) {
+               fprintf(stderr, "Could not find path '%s': %s\n",
+                       some_file, strerror(errno));
+       }
+       rc = llapi_hsm_request(fullpath, hur);
+       if (rc) {
+               fprintf(stderr, "Cannot send HSM request (use of %s): %s\n",
+                       some_file, strerror(-rc));
+               goto out_free;
+       }
+
+out_free:
+       free(hur);
+       return rc;
+}
+
+static int lfs_hsm_archive(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_ARCHIVE);
+}
+
+static int lfs_hsm_restore(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RESTORE);
+}
+
+static int lfs_hsm_release(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RELEASE);
+}
+
+static int lfs_hsm_remove(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_REMOVE);
+}
+
+static int lfs_hsm_cancel(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_CANCEL);
+}
+
+static int lfs_swap_layouts(int argc, char **argv)
+{
+       if (argc != 3)
+               return CMD_HELP;
+
+       return llapi_swap_layouts(argv[1], argv[2]);
+}
+
 int main(int argc, char **argv)
 {
         int rc;
@@ -2489,8 +3327,6 @@ int main(int argc, char **argv)
         ptl_initialize(argc, argv);
         if (obd_initialize(argc, argv) < 0)
                 exit(2);
-        if (dbg_initialize(argc, argv) < 0)
-                exit(3);
 
         Parser_init("lfs > ", cmdlist);