Whamcloud - gitweb
LU-11367 som: integrate LSOM with lfs find
[fs/lustre-release.git] / lustre / utils / lfs.c
index cc0738b..0a11a7b 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/xattr.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <time.h>
 #include <ctype.h>
 #include <zlib.h>
+#include <libgen.h>
+#include <asm/byteorder.h>
 #include "lfs_project.h"
 
 #include <libcfs/util/string.h>
@@ -72,6 +75,7 @@
 #include <linux/lustre/lustre_ver.h>
 #include <linux/lustre/lustre_param.h>
 #include <linux/lnet/nidstr.h>
+#include <cyaml.h>
 
 #ifndef ARRAY_SIZE
 # define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
@@ -94,8 +98,6 @@ static int lfs_quota(int argc, char **argv);
 static int lfs_project(int argc, char **argv);
 #endif
 static int lfs_flushctx(int argc, char **argv);
-static int lfs_cp(int argc, char **argv);
-static int lfs_ls(int argc, char **argv);
 static int lfs_poollist(int argc, char **argv);
 static int lfs_changelog(int argc, char **argv);
 static int lfs_changelog_clear(int argc, char **argv);
@@ -114,35 +116,48 @@ static int lfs_hsm_cancel(int argc, char **argv);
 static int lfs_swap_layouts(int argc, char **argv);
 static int lfs_mv(int argc, char **argv);
 static int lfs_ladvise(int argc, char **argv);
+static int lfs_getsom(int argc, char **argv);
+static int lfs_heat_get(int argc, char **argv);
+static int lfs_heat_set(int argc, char **argv);
 static int lfs_mirror(int argc, char **argv);
 static int lfs_mirror_list_commands(int argc, char **argv);
 static int lfs_list_commands(int argc, char **argv);
 static inline int lfs_mirror_resync(int argc, char **argv);
 static inline int lfs_mirror_verify(int argc, char **argv);
+static inline int lfs_mirror_read(int argc, char **argv);
+static inline int lfs_mirror_write(int argc, char **argv);
+static inline int lfs_mirror_copy(int argc, char **argv);
 
 enum setstripe_origin {
        SO_SETSTRIPE,
        SO_MIGRATE,
+       SO_MIGRATE_MDT,
        SO_MIRROR_CREATE,
-       SO_MIRROR_EXTEND
+       SO_MIRROR_EXTEND,
+       SO_MIRROR_SPLIT,
 };
-static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc);
+static int lfs_setstripe_internal(int argc, char **argv,
+                                 enum setstripe_origin opc);
 
 static inline int lfs_setstripe(int argc, char **argv)
 {
-       return lfs_setstripe0(argc, argv, SO_SETSTRIPE);
+       return lfs_setstripe_internal(argc, argv, SO_SETSTRIPE);
 }
 static inline int lfs_setstripe_migrate(int argc, char **argv)
 {
-       return lfs_setstripe0(argc, argv, SO_MIGRATE);
+       return lfs_setstripe_internal(argc, argv, SO_MIGRATE);
 }
 static inline int lfs_mirror_create(int argc, char **argv)
 {
-       return lfs_setstripe0(argc, argv, SO_MIRROR_CREATE);
+       return lfs_setstripe_internal(argc, argv, SO_MIRROR_CREATE);
 }
 static inline int lfs_mirror_extend(int argc, char **argv)
 {
-       return lfs_setstripe0(argc, argv, SO_MIRROR_EXTEND);
+       return lfs_setstripe_internal(argc, argv, SO_MIRROR_EXTEND);
+}
+static inline int lfs_mirror_split(int argc, char **argv)
+{
+       return lfs_setstripe_internal(argc, argv, SO_MIRROR_SPLIT);
 }
 
 /* Setstripe and migrate share mostly the same parameters */
@@ -151,9 +166,11 @@ static inline int lfs_mirror_extend(int argc, char **argv)
        "                 [--stripe-count|-c <stripe_count>]\n"         \
        "                 [--stripe-index|-i <start_ost_idx>]\n"        \
        "                 [--stripe-size|-S <stripe_size>]\n"           \
-       "                 [--layout|-L <pattern>]\n"            \
+       "                 [--layout|-L <pattern>]\n"                    \
        "                 [--pool|-p <pool_name>]\n"                    \
-       "                 [--ost|-o <ost_indices>]\n"
+       "                 [--ost|-o <ost_indices>]\n"                   \
+       "                 [--yaml|-y <yaml_template_file>]\n"           \
+       "                 [--copy=<lustre_src>]\n"
 
 #define SSM_HELP_COMMON \
        "\tstripe_count: Number of OSTs to stripe over (0=fs default, -1 all)\n" \
@@ -173,7 +190,13 @@ static inline int lfs_mirror_extend(int argc, char **argv)
        "\tcomp_end:     Extent end of component, start after previous end.\n"\
        "\t              Can be specified with K, M or G (for KB, MB, GB\n" \
        "\t              respectively, -1 for EOF). Must be a multiple of\n"\
-       "\t              stripe_size.\n"
+       "\t              stripe_size.\n"                                      \
+       "\tyaml_template_file:\n"                                             \
+       "\t              YAML layout template file, can't be used with -c,\n" \
+       "\t              -i, -S, -p, -o, or -E arguments.\n"                  \
+       "\tlustre_src:   Lustre file/dir whose layout info is used to set\n"  \
+       "\t              another lustre file or directory, can't used with\n" \
+       "\t              -c, -i, -S, -p, -o, or -E arguments.\n"
 
 #define MIRROR_CREATE_HELP                                                    \
        "\tmirror_count: Number of mirrors to be created with the upcoming\n"  \
@@ -186,7 +209,6 @@ static inline int lfs_mirror_extend(int argc, char **argv)
        "\t              It can be a plain layout or a composite layout.\n"    \
        "\t              If not specified, the stripe options inherited\n"     \
        "\t              from the previous component will be used.\n"          \
-       "\tparent:       Use default stripe options from parent directory\n"   \
        "\tflags:        set flags to the component of the current mirror.\n"  \
        "\t              Only \"prefer\" flag is supported so far.\n"
 
@@ -201,7 +223,7 @@ static inline int lfs_mirror_extend(int argc, char **argv)
 
 #define MIRROR_EXTEND_USAGE                                                   \
        "                 <--mirror-count|-N[mirror_count]>\n"                 \
-       "                 [setstripe options|--parent|-f <victim_file>]\n"     \
+       "                 [setstripe options|-f <victim_file>]\n"              \
        "                 [--no-verify]\n"
 
 #define SETSTRIPE_USAGE                                                        \
@@ -213,26 +235,28 @@ static inline int lfs_mirror_extend(int argc, char **argv)
 
 #define MIGRATE_USAGE                                                  \
        SSM_CMD_COMMON("migrate  ")                                     \
-       "                 [--block|-b]\n"                               \
-       "                 [--non-block|-n]\n"                           \
+       "                 [--block|-b] [--non-block|-n]\n"              \
+       "                 [--non-direct|-D] [--verbose|-v]\n"           \
        "                 <filename>\n"                                 \
        SSM_HELP_COMMON                                                 \
        "\n"                                                            \
        "\tblock:        Block file access during data migration (default)\n" \
        "\tnon-block:    Abort migrations if concurrent access is detected\n" \
-
-#define SETDIRSTRIPE_USAGE                                     \
-       "               [--mdt-count|-c stripe_count>\n"        \
-       "               [--mdt-index|-i mdt_index]\n"           \
-       "               [--mdt-hash|-H mdt_hash]\n"             \
-       "               [--default|-D] [--mode|-m mode] <dir>\n"        \
+       "\tnon-direct:   Do not use direct I/O to copy file contents\n" \
+       "\tverbose:      Print each filename as it is migrated\n"       \
+
+#define SETDIRSTRIPE_USAGE                                             \
+       "               [--mdt-count|-c stripe_count>\n"                \
+       "               [--mdt-hash|-H mdt_hash]\n"                     \
+       "               [--mdt-index|-i mdt_index[,mdt_index,...]\n"    \
+       "               [--default|-D] [--mode|-o mode] <dir>\n"        \
        "\tstripe_count: stripe count of the striped directory\n"       \
        "\tmdt_index: MDT index of first stripe\n"                      \
        "\tmdt_hash:  hash type of the striped directory. mdt types:\n" \
        "       fnv_1a_64 FNV-1a hash algorithm (default)\n"            \
        "       all_char  sum of characters % MDT_COUNT (not recommended)\n" \
        "\tdefault_stripe: set default dirstripe of the directory\n"    \
-       "\tmode: the mode of the directory\n"
+       "\tmode: the file access permission of the directory (octal)\n"
 
 /**
  * command_t mirror_cmdlist - lfs mirror commands.
@@ -242,14 +266,38 @@ command_t mirror_cmdlist[] = {
          .pc_help = "Create a mirrored file.\n"
                "usage: lfs mirror create "
                "<--mirror-count|-N[mirror_count]> "
-               "[setstripe options|--parent] ... <filename|directory>\n"
+               "[setstripe options] ... <filename|directory>\n"
          MIRROR_CREATE_HELP },
        { .pc_name = "extend", .pc_func = lfs_mirror_extend,
          .pc_help = "Extend a mirrored file.\n"
                "usage: lfs mirror extend "
                "<--mirror-count|-N[mirror_count]> [--no-verify] "
-               "[setstripe options|--parent|-f <victim_file>] ... <filename>\n"
+               "[setstripe options|-f <victim_file>] ... <filename>\n"
          MIRROR_EXTEND_HELP },
+       { .pc_name = "split", .pc_func = lfs_mirror_split,
+         .pc_help = "Split a mirrored file.\n"
+       "usage: lfs mirror split <--mirror-id <mirror_id> | \n"
+       "\t             <--component-id|-I <comp_id>> [--destroy|-d] \n"
+       "\t             [-f <new_file>] <mirrored file>\n"
+       "\tmirror_id:   The numerical unique identifier for a mirror. It\n"
+       "\t             can be fetched by lfs getstripe command.\n"
+       "\tcomp_id:     Unique component ID within a mirror.\n"
+       "\tnew_file:    This option indicates the layout of the split\n"
+       "\t             mirror will be stored into. If not specified,\n"
+       "\t             a new file named <mirrored_file>.mirror~<mirror_id>\n"
+       "\t             will be used.\n" },
+       { .pc_name = "read", .pc_func = lfs_mirror_read,
+         .pc_help = "Read the content of a specified mirror of a file.\n"
+               "usage: lfs mirror read <--mirror-id|-N <mirror_id> "
+               "[--outfile|-o <output_file>] <mirrored_file>\n" },
+       { .pc_name = "write", .pc_func = lfs_mirror_write,
+         .pc_help = "Write to a specified mirror of a file.\n"
+               "usage: lfs mirror write <--mirror-id|-N <mirror_id> "
+               "[--inputfile|-i <input_file>] <mirrored_file>\n" },
+       { .pc_name = "copy", .pc_func = lfs_mirror_copy,
+         .pc_help = "Copy a specified mirror to other mirror(s) of a file.\n"
+               "usage: lfs mirror copy <--read-mirror|-i <id0>> "
+               "<--write-mirror|-o <id1,id2>> <mirrored_file>\n" },
        { .pc_name = "resync", .pc_func = lfs_mirror_resync,
          .pc_help = "Resynchronizes out-of-sync mirrored file(s).\n"
                "usage: lfs mirror resync [--only <mirror_id[,...]>] "
@@ -259,7 +307,7 @@ command_t mirror_cmdlist[] = {
                "usage: lfs mirror verify "
                "[--only <mirror_id,mirror_id2[,...]>] "
                "[--verbose|-v] <mirrored_file> [<mirrored_file2> ...]\n"},
-       { .pc_name = "--list-commands", .pc_func = lfs_mirror_list_commands,
+       { .pc_name = "list-commands", .pc_func = lfs_mirror_list_commands,
          .pc_help = "list commands supported by lfs mirror"},
        { .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" },
        { .pc_name = "exit", .pc_func = Parser_quit, .pc_help = "quit" },
@@ -281,6 +329,9 @@ command_t cmdlist[] = {
         "To totally delete the default striping from an existing directory:\n"
         "usage: setstripe -d <directory>\n"
         " or\n"
+        "To create a mirrored file or set s default mirror layout on a directory:\n"
+        "usage: setstripe -N[mirror_count] [STRIPE_OPTIONS] <directory|filename>\n"
+        " or\n"
         "To delete the last component(s) from an existing composite file\n"
         "(note that this will also delete any data in those components):\n"
         "usage: setstripe --component-del [--component-id|-I <comp_id>]\n"
@@ -303,6 +354,8 @@ command_t cmdlist[] = {
         "                 [--component-count]\n"
         "                 [--component-start[=[+-]comp_start]]\n"
         "                 [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n"
+        "                 [[!] --mirror-index=[+-]<index> |\n"
+        "                  [!] --mirror-id=[+-]<id>]\n"
         "                 <directory|filename> ..."},
        {"setdirstripe", lfs_setdirstripe, 0,
         "To create a striped directory on a specified MDT. This can only\n"
@@ -327,40 +380,43 @@ command_t cmdlist[] = {
         "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,
-         "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"
+       {"pool_list", lfs_poollist, 0,
+        "List pools or pool OSTs\n"
+        "usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
+       {"find", lfs_find, 0,
+        "find files matching given attributes recursively in directory tree.\n"
+        "usage: find <directory|filename> ...\n"
+        "     [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n"
+        "     [[!] --mtime|-M [+-]N[smhdwy]] [[!] --blocks|-b N]\n"
+        "     [--maxdepth|-D N] [[!] --mdt-index|--mdt|-m <uuid|index,...>]\n"
+        "     [[!] --name|-n <pattern>] [[!] --ost|-O <uuid|index,...>]\n"
+        "     [--print|-P] [--print0|-0] [[!] --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"
         "     [[!] --projid <projid>]\n"
         "     [[!] --layout|-L released,raid0,mdt]\n"
         "     [[!] --component-count [+-]<comp_cnt>]\n"
         "     [[!] --component-start [+-]N[kMGTPE]]\n"
         "     [[!] --component-end|-E [+-]N[kMGTPE]]\n"
         "     [[!] --component-flags <comp_flags>]\n"
+        "     [[!] --mirror-count|-N [+-]<n>]\n"
+        "     [[!] --mirror-state <[^]state>]\n"
         "     [[!] --mdt-count|-T [+-]<stripes>]\n"
         "     [[!] --mdt-hash|-H <hashtype>\n"
+        "     [[!] --mdt-index|-m <uuid|index,...>]\n"
          "\t !: used before an option indicates 'NOT' requested attribute\n"
          "\t -: used before a value indicates less than requested value\n"
          "\t +: used before a value indicates more than requested value\n"
-        "\tmdt-hash:   hash type of the striped directory.\n"
+        "\thashtype:   hash type of the striped directory.\n"
         "\t            fnv_1a_64 FNV-1a hash algorithm\n"
         "\t            all_char  sum of characters % MDT_COUNT\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>"},
+        "Display the status of MGTs, MDTs or OSTs (as specified in the command)\n"
+        "or all the servers (MGTs, MDTs and OSTs).\n"
+        "usage: check <mgts|osts|mdts|all>"},
         {"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 "
@@ -385,13 +441,25 @@ command_t cmdlist[] = {
         "       setquota [-t] <-u|--user|-g|--group|-p|--projid>\n"
          "                [--block-grace <block-grace>]\n"
          "                [--inode-grace <inode-grace>] <filesystem>\n"
+        "       setquota <-U|-G|-P>\n"
+        "                -b <block-softlimit> -B <block-hardlimit>\n"
+        "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
+        "       setquota <-U|--default-usr|-G|--default-grp|-P|--default-prj>\n"
+        "                [--block-softlimit <block-softlimit>]\n"
+        "                [--block-hardlimit <block-hardlimit>]\n"
+        "                [--inode-softlimit <inode-softlimit>]\n"
+        "                [--inode-hardlimit <inode-hardlimit>] <filesystem>\n"
+        "       setquota <-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>\n"
+        "                <-d|--default>\n"
          "       -b can be used instead of --block-softlimit/--block-grace\n"
          "       -B can be used instead of --block-hardlimit\n"
          "       -i can be used instead of --inode-softlimit/--inode-grace\n"
-        "       -I can be used instead of --inode-hardlimit\n\n"
+        "       -I can be used instead of --inode-hardlimit\n"
+        "       -d can be used instead of --default\n\n"
         "Note: The total quota space will be split into many qunits and\n"
         "      balanced over all server targets, the minimal qunit size is\n"
         "      1M bytes for block space and 1K inodes for inode space.\n\n"
+        "      The maximum quota grace time is 2^48 - 1 seconds.\n\n"
         "      Quota space rebalancing process will stop when this mininum\n"
         "      value is reached. As a result, quota exceeded can be returned\n"
         "      while many targets still have 1MB or 1K inodes of spare\n"
@@ -400,7 +468,8 @@ command_t cmdlist[] = {
         "usage: quota [-q] [-v] [-h] [-o <obd_uuid>|-i <mdt_idx>|-I "
                       "<ost_idx>]\n"
         "             [<-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>] <filesystem>\n"
-        "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g|-p> <filesystem>"},
+        "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g|-p> <filesystem>\n"
+       "        quota [-q] [-v] [h] <-U|-G|-P> <filesystem>"},
        {"project", lfs_project, 0,
         "Change or list project attribute for specified file or directory.\n"
         "usage: project [-d|-r] <file|directory...>\n"
@@ -415,12 +484,6 @@ command_t cmdlist[] = {
 #endif
         {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n"
          "usage: flushctx [-k] [mountpoint...]"},
-        {"cp", lfs_cp, 0,
-         "Remote user copy files and directories.\n"
-         "usage: cp [OPTION]... [-T] SOURCE DEST\n\tcp [OPTION]... SOURCE... DIRECTORY\n\tcp [OPTION]... -t DIRECTORY SOURCE..."},
-        {"ls", lfs_ls, 0,
-         "Remote user list directory contents.\n"
-         "usage: ls [OPTION]... [FILE]..."},
         {"changelog", lfs_changelog, 0,
          "Show the metadata changes on an MDT."
          "\nusage: changelog <mdtname> [startrec [endrec]]"},
@@ -478,9 +541,17 @@ command_t cmdlist[] = {
         "usage: swap_layouts <path1> <path2>"},
        {"migrate", lfs_setstripe_migrate, 0,
         "migrate a directory between MDTs.\n"
-        "usage: migrate --mdt-index <mdt_idx> [--verbose|-v] "
-        "<directory>\n"
-        "\tmdt_idx:      index of the destination MDT\n"
+        "usage: migrate [--mdt-count|-c] <stripe_count>\n"
+        "               [--mdt-hash|-H] <hash_type>\n"
+        "               [--mdt-index|-m] <start_mdt_index>\n"
+        "               [--verbose|-v]\n"
+        "               <directory>\n"
+        "\tmdt:        MDTs to stripe over, if only one MDT is specified\n"
+        "                      it's the MDT index of first stripe\n"
+        "\tmdt_count:  number of MDTs to stripe a directory over\n"
+        "\tmdt_hash:   hash type of the striped directory. mdt types:\n"
+        "                      fnv_1a_64 FNV-1a hash algorithm (default)\n"
+        "                      all_char  sum of characters % MDT_COUNT\n"
         "\n"
         "migrate file objects from one OST "
         "layout\nto another (may be not safe with concurent writes).\n"
@@ -492,14 +563,16 @@ command_t cmdlist[] = {
         "              [--ost|-o] <ost_indices>\n"
         "              [--block|-b]\n"
         "              [--non-block|-n]\n"
+        "              [--non-direct|-D]\n"
         "              <file|directory>\n"
         "\tstripe_count:     number of OSTs to stripe a file over\n"
         "\tstripe_ost_index: index of the first OST to stripe a file over\n"
         "\tstripe_size:      number of bytes to store before moving to the next OST\n"
         "\tpool_name:        name of the predefined pool of OSTs\n"
         "\tost_indices:      OSTs to stripe over, in order\n"
-        "\tblock:            wait for the operation to return before continuing\n"
-        "\tnon-block:        do not wait for the operation to return.\n"},
+        "\tblock:        Block file access during data migration (default)\n"
+        "\tnon-block:    Abort migrations if concurrent access is detected\n"
+        "\tnon-direct:       do not use direct I/O to copy file contents.\n"},
        {"mv", lfs_mv, 0,
         "To move directories between MDTs. This command is deprecated, "
         "use \"migrate\" instead.\n"
@@ -518,7 +591,24 @@ command_t cmdlist[] = {
         "lfs mirror extend - add mirror(s) to an existing file\n"
         "lfs mirror split  - split a mirror from an existing mirrored file\n"
         "lfs mirror resync - resynchronize out-of-sync mirrored file(s)\n"
+        "lfs mirror read   - read a mirror content of a mirrored file\n"
+        "lfs mirror write  - write to a mirror of a mirrored file\n"
+        "lfs mirror copy   - copy a mirror to other mirror(s) of a file\n"
         "lfs mirror verify - verify mirrored file(s)\n"},
+       {"getsom", lfs_getsom, 0, "To list the SOM info for a given file.\n"
+        "usage: getsom [-s] [-b] [-f] <path>\n"
+        "\t-s: Only show the size value of the SOM data for a given file\n"
+        "\t-b: Only show the blocks value of the SOM data for a given file\n"
+        "\t-f: Only show the flags value of the SOM data for a given file\n"},
+       {"heat_get", lfs_heat_get, 0,
+        "To get heat of files.\n"
+        "usage: heat_get <file> ...\n"},
+       {"heat_set", lfs_heat_set, 0,
+        "To set heat flags of files.\n"
+        "usage: heat_set [--clear|-c] [--off|-o] [--on|-O] <file> ...\n"
+        "\t--clear|-c: Clear file heat for given files\n"
+        "\t--off|-o:   Turn off file heat for given files\n"
+        "\t--on|-O:    Turn on file heat for given files\n"},
        {"help", Parser_help, 0, "help"},
        {"exit", Parser_quit, 0, "quit"},
        {"quit", Parser_quit, 0, "quit"},
@@ -545,19 +635,23 @@ static int check_hashtype(const char *hashtype)
 static const char *error_loc = "syserror";
 
 enum {
-       MIGRATION_NONBLOCK      = 1 << 0,
-       MIGRATION_MIRROR        = 1 << 1,
+       MIGRATION_NONBLOCK      = 0x0001,
+       MIGRATION_MIRROR        = 0x0002,
+       MIGRATION_NONDIRECT     = 0x0004,
+       MIGRATION_VERBOSE       = 0x0008,
 };
 
 static int lfs_component_create(char *fname, int open_flags, mode_t open_mode,
                                struct llapi_layout *layout);
 
 static int
-migrate_open_files(const char *name, const struct llapi_stripe_param *param,
+migrate_open_files(const char *name, __u64 migration_flags,
+                  const struct llapi_stripe_param *param,
                   struct llapi_layout *layout, int *fd_src, int *fd_tgt)
 {
        int                      fd = -1;
        int                      fdv = -1;
+       int                      rflags;
        int                      mdt_index;
        int                      random_value;
        char                     parent[PATH_MAX];
@@ -594,7 +688,10 @@ migrate_open_files(const char *name, const struct llapi_stripe_param *param,
        /* open file, direct io */
        /* even if the file is only read, WR mode is nedeed to allow
         * layout swap on fd */
-       fd = open(name, O_RDWR | O_DIRECT);
+       rflags = O_RDWR;
+       if (!(migration_flags & MIGRATION_NONDIRECT))
+               rflags |= O_DIRECT;
+       fd = open(name, rflags);
        if (fd < 0) {
                rc = -errno;
                error_loc = "cannot open source file";
@@ -998,7 +1095,8 @@ static int lfs_migrate(char *name, __u64 migration_flags,
        int fdv = -1;
        int rc;
 
-       rc = migrate_open_files(name, param, layout, &fd, &fdv);
+       rc = migrate_open_files(name, migration_flags, param, layout,
+                               &fd, &fdv);
        if (rc < 0)
                goto out;
 
@@ -1042,6 +1140,9 @@ out:
        if (rc < 0)
                fprintf(stderr, "error: %s: %s: %s: %s\n",
                        progname, name, error_loc, strerror(-rc));
+       else if (migration_flags & MIGRATION_VERBOSE)
+               printf("%s\n", name);
+
        return rc;
 }
 
@@ -1089,6 +1190,30 @@ static int comp_str2flags(char *string, __u32 *flags, __u32 *neg_flags)
        return 0;
 }
 
+static int mirror_str2state(char *string, __u16 *state, __u16 *neg_state)
+{
+       if (string == NULL)
+               return -EINVAL;
+
+       *state = 0;
+       *neg_state = 0;
+
+       if (strncmp(string, "^", 1) == 0) {
+               *neg_state = llapi_layout_string_flags(string + 1);
+               if (*neg_state != 0)
+                       return 0;
+       } else {
+               *state = llapi_layout_string_flags(string);
+               if (*state != 0)
+                       return 0;
+       }
+
+       llapi_printf(LLAPI_MSG_ERROR,
+                    "%s: mirrored file state '%s' not supported\n",
+                    progname, string);
+       return -EINVAL;
+}
+
 /**
  * struct mirror_args - Command-line arguments for mirror(s).
  * @m_count:  Number of mirrors to be created with this layout.
@@ -1173,14 +1298,18 @@ static inline int mirror_sanity_check_one(struct llapi_layout *layout)
 
 /**
  * enum mirror_flags - Flags for extending a mirrored file.
- * @NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s)
+ * @MF_NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s)
  *            in case the victim file(s) contains the same data as the
  *            original mirrored file.
+ * @MF_DESTROY: Indicates to delete the mirror from the mirrored file.
+ * @MF_COMP_ID: specified component id instead of mirror id
  *
  * Flags for extending a mirrored file.
  */
 enum mirror_flags {
-       NO_VERIFY       = 0x1,
+       MF_NO_VERIFY    = 0x1,
+       MF_DESTROY      = 0x2,
+       MF_COMP_ID      = 0x4,
 };
 
 /**
@@ -1250,9 +1379,9 @@ static int mirror_create_sanity_check(const char *fname,
        }
 
        if (has_m_file && has_m_layout) {
-               fprintf(stderr, "error: %s: -f <victim_file> option should not "
-                       "be specified with setstripe options or "
-                       "--parent option\n", progname);
+               fprintf(stderr,
+                       "error: %s: -f <victim_file> option should not be specified with setstripe options\n",
+                       progname);
                return -EINVAL;
        }
 
@@ -1339,7 +1468,7 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list)
                goto error;
        }
 
-       rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0644,
+       rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0666,
                                  layout);
        if (rc >= 0) {
                close(rc);
@@ -1442,7 +1571,7 @@ static int mirror_extend_file(const char *fname, const char *victim_file,
                goto out;
        }
 
-       if (!(mirror_flags & NO_VERIFY)) {
+       if (!(mirror_flags & MF_NO_VERIFY)) {
                ssize_t ret;
                /* mirrors should have the same contents */
                ret = mirror_file_compare(fd, fdv);
@@ -1517,7 +1646,7 @@ static int mirror_extend_layout(char *name, struct llapi_layout *layout)
        int fdv = -1;
        int rc;
 
-       rc = migrate_open_files(name, NULL, layout, &fd, &fdv);
+       rc = migrate_open_files(name, 0, NULL, layout, &fd, &fdv);
        if (rc < 0)
                goto out;
 
@@ -1601,6 +1730,194 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list,
        return rc;
 }
 
+static int find_mirror_id(struct llapi_layout *layout, void *cbdata)
+{
+       uint32_t id;
+       int rc;
+
+       rc = llapi_layout_mirror_id_get(layout, &id);
+       if (rc < 0)
+               return rc;
+
+       if ((__u16)id == *(__u16 *)cbdata)
+               return LLAPI_LAYOUT_ITER_STOP;
+
+       return LLAPI_LAYOUT_ITER_CONT;
+}
+
+static int find_comp_id(struct llapi_layout *layout, void *cbdata)
+{
+       uint32_t id;
+       int rc;
+
+       rc = llapi_layout_comp_id_get(layout, &id);
+       if (rc < 0)
+               return rc;
+
+       if (id == *(__u32 *)cbdata)
+               return LLAPI_LAYOUT_ITER_STOP;
+
+       return LLAPI_LAYOUT_ITER_CONT;
+}
+static int mirror_split(const char *fname, __u32 id,
+                       enum mirror_flags mflags, const char *victim_file)
+{
+       struct llapi_layout *layout;
+       char parent[PATH_MAX];
+       char victim[PATH_MAX];
+       int flags = O_CREAT | O_EXCL | O_LOV_DELAY_CREATE | O_NOFOLLOW;
+       char *ptr;
+       struct ll_ioc_lease *data;
+       uint16_t mirror_count;
+       int mdt_index;
+       int fd, fdv;
+       int rc;
+
+       /* check fname contains mirror with mirror_id/comp_id */
+       layout = llapi_layout_get_by_path(fname, 0);
+       if (!layout) {
+               fprintf(stderr,
+                       "error %s: file '%s' couldn't get layout\n",
+                       progname, fname);
+               return -EINVAL;
+       }
+
+       rc = mirror_sanity_check_one(layout);
+       if (rc)
+               goto free_layout;
+
+       rc = llapi_layout_mirror_count_get(layout, &mirror_count);
+       if (rc) {
+               fprintf(stderr,
+                       "error %s: file '%s' couldn't get mirror count\n",
+                       progname, fname);
+               goto free_layout;
+       }
+       if (mirror_count < 2) {
+               fprintf(stderr,
+                       "error %s: file '%s' has %d component, cannot split\n",
+                       progname, fname, mirror_count);
+               goto free_layout;
+       }
+
+       if (mflags & MF_COMP_ID) {
+               rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
+               id = mirror_id_of(id);
+       } else {
+               rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+       }
+       if (rc < 0) {
+               fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
+                       progname, fname);
+               goto free_layout;
+       } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
+               fprintf(stderr,
+                    "error %s: file '%s' does not contain mirror with id %u\n",
+                       progname, fname, id);
+               goto free_layout;
+       }
+
+       fd = open(fname, O_RDWR);
+       if (fd < 0) {
+               fprintf(stderr,
+                       "error %s: open file '%s' failed: %s\n",
+                       progname, fname, strerror(errno));
+               goto free_layout;
+       }
+
+       /* get victim file directory pathname */
+       if (strlen(fname) > sizeof(parent) - 1) {
+               fprintf(stderr, "error %s: file name of '%s' too long\n",
+                       progname, fname);
+               rc = -ERANGE;
+               goto close_fd;
+       }
+       strncpy(parent, fname, sizeof(parent));
+       ptr = strrchr(parent, '/');
+       if (ptr == NULL) {
+               if (getcwd(parent, sizeof(parent)) == NULL) {
+                       fprintf(stderr, "error %s: getcwd failed: %s\n",
+                               progname, strerror(errno));
+                       rc = -errno;
+                       goto close_fd;
+               }
+       } else {
+               if (ptr == parent)
+                       ptr = parent + 1;
+               *ptr = '\0';
+       }
+
+       rc = llapi_file_fget_mdtidx(fd, &mdt_index);
+       if (rc < 0) {
+               fprintf(stderr, "%s: cannot get MDT index of '%s'\n",
+                       progname, fname);
+               goto close_fd;
+       }
+
+       if (victim_file == NULL) {
+               /* use a temp file to store the splitted layout */
+               if (mflags & MF_DESTROY) {
+                       fdv = llapi_create_volatile_idx(parent, mdt_index,
+                                                       O_LOV_DELAY_CREATE);
+               } else {
+                       snprintf(victim, sizeof(victim), "%s.mirror~%u",
+                                fname, id);
+                       fdv = open(victim, flags, S_IRUSR | S_IWUSR);
+               }
+       } else {
+               /* user specified victim file */
+               fdv = open(victim_file, flags, S_IRUSR | S_IWUSR);
+       }
+
+       if (fdv < 0) {
+               fprintf(stderr,
+                       "error %s: create victim file failed: %s\n",
+                       progname, strerror(errno));
+               goto close_fd;
+       }
+
+       /* get lease lock of fname */
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
+       if (rc < 0) {
+               fprintf(stderr,
+                       "error %s: cannot get lease of file '%s': %d\n",
+                       progname, fname, rc);
+               goto close_victim;
+       }
+
+       /* Atomatically put lease, split layouts and close. */
+       data = malloc(offsetof(typeof(*data), lil_ids[2]));
+       if (!data) {
+               rc = -ENOMEM;
+               goto close_victim;
+       }
+
+       data->lil_mode = LL_LEASE_UNLCK;
+       data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
+       data->lil_count = 2;
+       data->lil_ids[0] = fdv;
+       data->lil_ids[1] = id;
+       rc = llapi_lease_set(fd, data);
+       if (rc <= 0) {
+               if (rc == 0) /* lost lease lock */
+                       rc = -EBUSY;
+               fprintf(stderr,
+                       "error %s: cannot split '%s': %s\n",
+                       progname, fname, strerror(-rc));
+       } else {
+               rc = 0;
+       }
+       free(data);
+
+close_victim:
+       close(fdv);
+close_fd:
+       close(fd);
+free_layout:
+       llapi_layout_free(layout);
+       return rc;
+}
+
 /**
  * Parse a string containing an target index list into an array of integers.
  *
@@ -1691,13 +2008,18 @@ struct lfs_setstripe_args {
        __u32                    lsa_comp_flags;
        __u32                    lsa_comp_neg_flags;
        unsigned long long       lsa_pattern;
+       unsigned int             lsa_mirror_count;
        int                      lsa_nr_tgts;
+       bool                     lsa_first_comp;
        __u32                   *lsa_tgts;
        char                    *lsa_pool_name;
 };
 
 static inline void setstripe_args_init(struct lfs_setstripe_args *lsa)
 {
+       unsigned int mirror_count = lsa->lsa_mirror_count;
+       bool first_comp = lsa->lsa_first_comp;
+
        memset(lsa, 0, sizeof(*lsa));
 
        lsa->lsa_stripe_size = LLAPI_LAYOUT_DEFAULT;
@@ -1705,6 +2027,9 @@ static inline void setstripe_args_init(struct lfs_setstripe_args *lsa)
        lsa->lsa_stripe_off = LLAPI_LAYOUT_DEFAULT;
        lsa->lsa_pattern = LLAPI_LAYOUT_RAID0;
        lsa->lsa_pool_name = NULL;
+
+       lsa->lsa_mirror_count = mirror_count;
+       lsa->lsa_first_comp = first_comp;
 }
 
 /**
@@ -1754,7 +2079,8 @@ static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa)
  * Return: 0 on success or an error code on failure.
  */
 static int comp_args_to_layout(struct llapi_layout **composite,
-                              struct lfs_setstripe_args *lsa)
+                              struct lfs_setstripe_args *lsa,
+                              bool set_extent)
 {
        struct llapi_layout *layout = *composite;
        uint64_t prev_end = 0;
@@ -1780,19 +2106,30 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        return rc;
                }
 
-               rc = llapi_layout_comp_add(layout);
+               if (lsa->lsa_first_comp)
+                       prev_end = 0;
+
+               if (lsa->lsa_first_comp)
+                       rc = llapi_layout_add_first_comp(layout);
+               else
+                       rc = llapi_layout_comp_add(layout);
                if (rc) {
                        fprintf(stderr, "Add component failed. %s\n",
                                strerror(errno));
                        return rc;
                }
        }
+       /* reset lsa_first_comp */
+       lsa->lsa_first_comp = false;
 
-       rc = llapi_layout_comp_extent_set(layout, prev_end, lsa->lsa_comp_end);
-       if (rc) {
-               fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
-                       prev_end, lsa->lsa_comp_end, strerror(errno));
-               return rc;
+       if (set_extent) {
+               rc = llapi_layout_comp_extent_set(layout, prev_end,
+                                                 lsa->lsa_comp_end);
+               if (rc) {
+                       fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
+                               prev_end, lsa->lsa_comp_end, strerror(errno));
+                       return rc;
+               }
        }
 
        /* Data-on-MDT component setting */
@@ -1882,7 +2219,7 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                    lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
                    lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
                    lsa->lsa_nr_tgts != lsa->lsa_stripe_count) {
-                       fprintf(stderr, "stripe_count(%lld) != nr_osts(%d)\n",
+                       fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n",
                                lsa->lsa_stripe_count, lsa->lsa_nr_tgts);
                        return -EINVAL;
                }
@@ -1892,7 +2229,8 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        if (rc)
                                break;
                }
-       } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) {
+       } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT &&
+                  lsa->lsa_stripe_off != -1) {
                rc = llapi_layout_ost_index_set(layout, 0, lsa->lsa_stripe_off);
        }
        if (rc) {
@@ -1904,6 +2242,155 @@ static int comp_args_to_layout(struct llapi_layout **composite,
        return 0;
 }
 
+static int build_component(struct llapi_layout **layout,
+                          struct lfs_setstripe_args *lsa, bool set_extent)
+{
+       int rc;
+
+       rc = comp_args_to_layout(layout, lsa, set_extent);
+       if (rc)
+               return rc;
+
+       if (lsa->lsa_mirror_count > 0) {
+               rc = llapi_layout_mirror_count_set(*layout,
+                                                  lsa->lsa_mirror_count);
+               if (rc)
+                       return rc;
+
+               rc = llapi_layout_flags_set(*layout, LCM_FL_RDONLY);
+               if (rc)
+                       return rc;
+               lsa->lsa_mirror_count = 0;
+       }
+
+       return rc;
+}
+
+static int build_layout_from_yaml_node(struct cYAML *node,
+                                      struct llapi_layout **layout,
+                                      struct lfs_setstripe_args *lsa,
+                                      __u32 *osts)
+{
+       char *string;
+       int rc = 0;
+
+       while (node) {
+               if (node->cy_type == CYAML_TYPE_OBJECT) {
+                       /* go deep to sub blocks */
+                       rc = build_layout_from_yaml_node(node->cy_child, layout,
+                                                        lsa, osts);
+                       if (rc)
+                               return rc;
+               } else {
+                       if (node->cy_string == NULL)
+                               return -EINVAL;
+
+                       string = node->cy_string;
+                       /* skip leading lmm_ if present, to simplify parsing */
+                       if (strncmp(string, "lmm_", 4) == 0)
+                               string += 4;
+
+                       if (node->cy_type == CYAML_TYPE_STRING) {
+                               if (!strcmp(string, "lcme_extent.e_end")) {
+                                       if (!strcmp(node->cy_valuestring, "EOF") ||
+                                           !strcmp(node->cy_valuestring, "eof"))
+                                               lsa->lsa_comp_end = LUSTRE_EOF;
+                               } else if (!strcmp(string, "pool")) {
+                                       lsa->lsa_pool_name = node->cy_valuestring;
+                               } else if (!strcmp(string, "pattern")) {
+                                       if (!strcmp(node->cy_valuestring, "mdt"))
+                                               lsa->lsa_pattern = LLAPI_LAYOUT_MDT;
+                               } else if (!strcmp(string, "lcme_flags")) {
+                                       rc = comp_str2flags(node->cy_valuestring,
+                                                           &lsa->lsa_comp_flags,
+                                                           &lsa->lsa_comp_neg_flags);
+                                       if (rc)
+                                               return rc;
+                                       /* Only template flags have meaning in
+                                        * the layout for a new file
+                                        */
+                                       lsa->lsa_comp_flags &= LCME_TEMPLATE_FLAGS;
+                               }
+                       } else if (node->cy_type == CYAML_TYPE_NUMBER) {
+                               if (!strcmp(string, "lcm_mirror_count")) {
+                                       lsa->lsa_mirror_count = node->cy_valueint;
+                               } else if (!strcmp(string, "lcme_extent.e_start")) {
+                                       if (node->cy_valueint != 0 || *layout != NULL) {
+                                               rc = build_component(layout, lsa, true);
+                                               if (rc)
+                                                       return rc;
+                                       }
+
+                                       if (node->cy_valueint == 0)
+                                               lsa->lsa_first_comp = true;
+
+                                       /* initialize lsa */
+                                       setstripe_args_init(lsa);
+                                       lsa->lsa_tgts = osts;
+                               } else if (!strcmp(string, "lcme_extent.e_end")) {
+                                       if (node->cy_valueint == -1)
+                                               lsa->lsa_comp_end = LUSTRE_EOF;
+                                       else
+                                               lsa->lsa_comp_end = node->cy_valueint;
+                               } else if (!strcmp(string, "stripe_count")) {
+                                       lsa->lsa_stripe_count = node->cy_valueint;
+                               } else if (!strcmp(string, "stripe_size")) {
+                                       lsa->lsa_stripe_size = node->cy_valueint;
+                               } else if (!strcmp(string, "stripe_offset")) {
+                                       lsa->lsa_stripe_off = node->cy_valueint;
+                               } else if (!strcmp(string, "l_ost_idx")) {
+                                       osts[lsa->lsa_nr_tgts] = node->cy_valueint;
+                                       lsa->lsa_nr_tgts++;
+                               }
+                       }
+               }
+               node = node->cy_next;
+       }
+
+       return rc;
+}
+
+static int lfs_comp_create_from_yaml(char *template,
+                                    struct llapi_layout **layout,
+                                    struct lfs_setstripe_args *lsa,
+                                    __u32 *osts)
+{
+       struct cYAML *tree = NULL, *err_rc = NULL;
+       int rc = 0;
+
+       tree = cYAML_build_tree(template, NULL, 0, &err_rc, false);
+       if (!tree) {
+               fprintf(stderr, "%s: cannot parse YAML file %s\n",
+                       progname, template);
+               cYAML_build_error(-EINVAL, -1, "yaml", "from comp yaml",
+                                 "can't parse", &err_rc);
+               cYAML_print_tree2file(stderr, err_rc);
+               cYAML_free_tree(err_rc);
+               rc = -EINVAL;
+               goto err;
+       }
+
+       /* initialize lsa for plain file */
+       setstripe_args_init(lsa);
+       lsa->lsa_tgts = osts;
+
+       rc = build_layout_from_yaml_node(tree, layout, lsa, osts);
+       if (rc) {
+               fprintf(stderr, "%s: cannot build layout from YAML file %s.\n",
+                       progname, template);
+               goto err;
+       } else {
+               rc = build_component(layout, lsa, *layout != NULL);
+       }
+       /* clean clean lsa */
+       setstripe_args_init(lsa);
+
+err:
+       if (tree)
+               cYAML_free_tree(tree);
+       return rc;
+}
+
 /* In 'lfs setstripe --component-add' mode, we need to fetch the extent
  * end of the last component in the existing file, and adjust the
  * first extent start of the components to be added accordingly. */
@@ -2070,33 +2557,37 @@ enum {
        LFS_COMP_DEL_OPT,
        LFS_COMP_SET_OPT,
        LFS_COMP_ADD_OPT,
-       LFS_COMP_USE_PARENT_OPT,
        LFS_COMP_NO_VERIFY_OPT,
        LFS_PROJID_OPT,
        LFS_MIRROR_FLAGS_OPT,
+       LFS_MIRROR_ID_OPT,
+       LFS_MIRROR_STATE_OPT,
+       LFS_LAYOUT_COPY,
+       LFS_MIRROR_INDEX_OPT,
 };
 
 /* functions */
-static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
+static int lfs_setstripe_internal(int argc, char **argv,
+                                 enum setstripe_origin opc)
 {
-       struct lfs_setstripe_args        lsa;
+       struct lfs_setstripe_args        lsa = { 0 };
        struct llapi_stripe_param       *param = NULL;
        struct find_param                migrate_mdt_param = {
                .fp_max_depth = -1,
                .fp_mdt_index = -1,
        };
        char                            *fname;
-       int                              result;
+       int                              result = 0;
        int                              result2 = 0;
        char                            *end;
        int                              c;
        int                              delete = 0;
-       char                            *mdt_idx_arg = NULL;
        unsigned long long               size_units = 1;
        bool                             migrate_mode = false;
+       bool                             migrate_mdt_mode = false;
        bool                             migration_block = false;
        __u64                            migration_flags = 0;
-       __u32                            osts[LOV_MAX_STRIPE_COUNT] = { 0 };
+       __u32                            tgts[LOV_MAX_STRIPE_COUNT] = { 0 };
        int                              comp_del = 0, comp_set = 0;
        int                              comp_add = 0;
        __u32                            comp_id = 0;
@@ -2109,9 +2600,14 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
        struct mirror_args              *mirror_list = NULL;
        struct mirror_args              *new_mirror = NULL;
        struct mirror_args              *last_mirror = NULL;
+       __u16                            mirror_id = 0;
        char                             cmd[PATH_MAX];
+       bool from_yaml = false;
+       bool from_copy = false;
+       char *template = NULL;
 
        struct option long_opts[] = {
+/* find { .val = '0',  .name = "null",         .has_arg = no_argument }, */
 /* find        { .val = 'A',   .name = "atime",        .has_arg = required_argument }*/
        /* --block is only valid in migrate mode */
        { .val = 'b',   .name = "block",        .has_arg = no_argument },
@@ -2133,16 +2629,22 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
        { .val = LFS_COMP_SET_OPT,
                        .name = "component-set",
                                                .has_arg = no_argument},
-       { .val = LFS_COMP_USE_PARENT_OPT,
-                       .name = "parent",       .has_arg = no_argument},
        { .val = LFS_COMP_NO_VERIFY_OPT,
                        .name = "no-verify",    .has_arg = no_argument},
        { .val = LFS_MIRROR_FLAGS_OPT,
                        .name = "flags",        .has_arg = required_argument},
+       { .val = LFS_MIRROR_ID_OPT,
+                       .name = "mirror-id",    .has_arg = required_argument},
+       { .val = LFS_LAYOUT_COPY,
+                       .name = "copy",         .has_arg = required_argument},
        { .val = 'c',   .name = "stripe-count", .has_arg = required_argument},
        { .val = 'c',   .name = "stripe_count", .has_arg = required_argument},
+       { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument},
 /* find        { .val = 'C',   .name = "ctime",        .has_arg = required_argument }*/
        { .val = 'd',   .name = "delete",       .has_arg = no_argument},
+       { .val = 'd',   .name = "destroy",      .has_arg = no_argument},
+       /* --non-direct is only valid in migrate mode */
+       { .val = 'D',   .name = "non-direct",   .has_arg = no_argument },
        { .val = 'E',   .name = "comp-end",     .has_arg = required_argument},
        { .val = 'E',   .name = "component-end",
                                                .has_arg = required_argument},
@@ -2150,7 +2652,8 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
 /* find        { .val = 'F',   .name = "fid",          .has_arg = no_argument }, */
 /* find        { .val = 'g',   .name = "gid",          .has_arg = no_argument }, */
 /* find        { .val = 'G',   .name = "group",        .has_arg = required_argument }*/
-/* dirstripe { .val = 'H', .name = "mdt-hash",  .has_arg = required_argument }*/
+/* find        { .val = 'h',   .name = "help",         .has_arg = no_argument }, */
+       { .val = 'H',   .name = "mdt-hash",     .has_arg = required_argument},
        { .val = 'i',   .name = "stripe-index", .has_arg = required_argument},
        { .val = 'i',   .name = "stripe_index", .has_arg = required_argument},
        { .val = 'I',   .name = "comp-id",      .has_arg = required_argument},
@@ -2180,7 +2683,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
 /* find        { .val = 'U',   .name = "user",         .has_arg = required_argument }*/
        /* --verbose is only valid in migrate mode */
        { .val = 'v',   .name = "verbose",      .has_arg = no_argument},
-/* getstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .val = 'y',   .name = "yaml",         .has_arg = required_argument },
        { .name = NULL } };
 
        setstripe_args_init(&lsa);
@@ -2190,8 +2693,9 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
 
        snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
        progname = cmd;
-       while ((c = getopt_long(argc, argv, "bc:dE:f:i:I:m:N::no:p:L:s:S:v",
-                               long_opts, NULL)) >= 0) {
+       while ((c = getopt_long(argc, argv,
+                               "bc:dDE:f:H:i:I:m:N::no:p:L:s:S:vy:", long_opts,
+                               NULL)) >= 0) {
                switch (c) {
                case 0:
                        /* Long options. */
@@ -2224,17 +2728,17 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                case LFS_COMP_SET_OPT:
                        comp_set = 1;
                        break;
-               case LFS_COMP_USE_PARENT_OPT:
-                       if (!mirror_mode) {
-                               fprintf(stderr, "error: %s: --parent must be "
-                                       "specified with --mirror-count|-N "
-                                       "option\n", progname);
+               case LFS_COMP_NO_VERIFY_OPT:
+                       mirror_flags |= MF_NO_VERIFY;
+                       break;
+               case LFS_MIRROR_ID_OPT:
+                       mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || mirror_id == 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
                                goto usage_error;
                        }
-                       setstripe_args_init(&lsa);
-                       break;
-               case LFS_COMP_NO_VERIFY_OPT:
-                       mirror_flags |= NO_VERIFY;
                        break;
                case LFS_MIRROR_FLAGS_OPT: {
                        __u32 flags;
@@ -2265,6 +2769,10 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                        }
                        break;
                }
+               case LFS_LAYOUT_COPY:
+                       from_copy = true;
+                       template = optarg;
+                       break;
                case 'b':
                        if (!migrate_mode) {
                                fprintf(stderr,
@@ -2289,10 +2797,29 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                case 'd':
                        /* delete the default striping pattern */
                        delete = 1;
+                       if (opc == SO_MIRROR_SPLIT) {
+                               if (has_m_file) {
+                                       fprintf(stderr,
+                                             "%s %s: -d cannot used with -f\n",
+                                               progname, argv[0]);
+                                       goto usage_error;
+                               }
+                               mirror_flags |= MF_DESTROY;
+                       }
+                       break;
+               case 'D':
+                       if (!migrate_mode) {
+                               fprintf(stderr,
+                                       "%s %s: -D|--non-direct is valid "
+                                       "only for migrate command\n",
+                                       progname, argv[0]);
+                               goto usage_error;
+                       }
+                       migration_flags |= MIGRATION_NONDIRECT;
                        break;
                case 'E':
                        if (lsa.lsa_comp_end != 0) {
-                               result = comp_args_to_layout(lpp, &lsa);
+                               result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
                                        fprintf(stderr,
                                                "%s %s: invalid layout\n",
@@ -2317,6 +2844,20 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                                }
                        }
                        break;
+               case 'H':
+                       if (!migrate_mode) {
+                               fprintf(stderr, "--mdt-hash is valid only for migrate command\n");
+                               return CMD_HELP;
+                       }
+
+                       lsa.lsa_pattern = check_hashtype(optarg);
+                       if (lsa.lsa_pattern == 0) {
+                               fprintf(stderr,
+                                       "%s %s: bad stripe hash type '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
                case 'i':
                        lsa.lsa_stripe_off = strtol(optarg, &end, 0);
                        if (*end != '\0') {
@@ -2339,21 +2880,27 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                        }
                        break;
                case 'f':
-                       if (opc != SO_MIRROR_EXTEND) {
+                       if (opc != SO_MIRROR_EXTEND && opc != SO_MIRROR_SPLIT) {
                                fprintf(stderr,
                                        "error: %s: invalid option: %s\n",
                                        progname, argv[optopt + 1]);
                                goto usage_error;
                        }
-                       if (last_mirror == NULL) {
-                               fprintf(stderr, "error: %s: '-N' must exist "
-                                       "in front of '%s'\n",
-                                       progname, argv[optopt + 1]);
-                               goto usage_error;
+                       if (opc == SO_MIRROR_EXTEND) {
+                               if (last_mirror == NULL) {
+                                       fprintf(stderr,
+                               "error: %s: '-N' must exist in front of '%s'\n",
+                                               progname, argv[optopt + 1]);
+                                       goto usage_error;
+                               }
+                               last_mirror->m_file = optarg;
+                               last_mirror->m_count = 1;
+                       } else {
+                               /* mirror split */
+                               if (mirror_list == NULL)
+                                       mirror_list = lfs_mirror_alloc();
+                               mirror_list->m_file = optarg;
                        }
-
-                       last_mirror->m_file = optarg;
-                       last_mirror->m_count = 1;
                        has_m_file = true;
                        break;
                case 'L':
@@ -2383,11 +2930,24 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                case 'm':
                        if (!migrate_mode) {
                                fprintf(stderr,
-                                       "%s %s: -m|--mdt-index valid only for migrate command\n",
+                                       "%s %s: -m|--mdt-index is valid only for migrate command\n",
                                        progname, argv[0]);
                                goto usage_error;
                        }
-                       mdt_idx_arg = optarg;
+                       migrate_mdt_mode = true;
+                       lsa.lsa_nr_tgts = parse_targets(tgts,
+                                               sizeof(tgts) / sizeof(__u32),
+                                               lsa.lsa_nr_tgts, optarg);
+                       if (lsa.lsa_nr_tgts < 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid MDT target(s) '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+
+                       lsa.lsa_tgts = tgts;
+                       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+                               lsa.lsa_stripe_off = tgts[0];
                        break;
                case 'n':
                        if (!migrate_mode) {
@@ -2426,7 +2986,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                                if (lsa.lsa_comp_end == 0)
                                        lsa.lsa_comp_end = LUSTRE_EOF;
 
-                               result = comp_args_to_layout(lpp, &lsa);
+                               result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
                                        lfs_mirror_free(new_mirror);
                                        goto error;
@@ -2446,8 +3006,8 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                                fprintf(stderr, "warning: '--ost-list' is "
                                        "deprecated, use '--ost' instead\n");
 #endif
-                       lsa.lsa_nr_tgts = parse_targets(osts,
-                                               sizeof(osts) / sizeof(__u32),
+                       lsa.lsa_nr_tgts = parse_targets(tgts,
+                                               sizeof(tgts) / sizeof(__u32),
                                                lsa.lsa_nr_tgts, optarg);
                        if (lsa.lsa_nr_tgts < 0) {
                                fprintf(stderr,
@@ -2456,14 +3016,19 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                                goto usage_error;
                        }
 
-                       lsa.lsa_tgts = osts;
+                       lsa.lsa_tgts = tgts;
                        if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
-                               lsa.lsa_stripe_off = osts[0];
+                               lsa.lsa_stripe_off = tgts[0];
                        break;
                case 'p':
                        if (optarg == NULL)
                                goto usage_error;
                        lsa.lsa_pool_name = optarg;
+
+                       if (strlen(lsa.lsa_pool_name) == 0 ||
+                           strncmp(lsa.lsa_pool_name, "none",
+                                   LOV_MAXPOOLNAME) == 0)
+                               lsa.lsa_pool_name = NULL;
                        break;
                case 'S':
                        result = llapi_parse_size(optarg, &lsa.lsa_stripe_size,
@@ -2483,6 +3048,11 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                                goto usage_error;
                        }
                        migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
+                       migration_flags = MIGRATION_VERBOSE;
+                       break;
+               case 'y':
+                       from_yaml = true;
+                       template = optarg;
                        break;
                default:
                        fprintf(stderr, "%s %s: unrecognized option '%s'\n",
@@ -2513,12 +3083,12 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
        }
 
        if (lsa.lsa_comp_end != 0) {
-               result = comp_args_to_layout(lpp, &lsa);
+               result = comp_args_to_layout(lpp, &lsa, true);
                if (result)
                        goto error;
        }
 
-       if (mirror_flags & NO_VERIFY) {
+       if (mirror_flags & MF_NO_VERIFY) {
                if (opc != SO_MIRROR_EXTEND) {
                        fprintf(stderr,
                                "error: %s: --no-verify is valid only for lfs mirror extend command\n",
@@ -2607,11 +3177,19 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                        goto error;
        }
 
-       if (mdt_idx_arg != NULL && optind > 3) {
+       if (from_yaml && from_copy) {
                fprintf(stderr,
-                       "%s %s: option -m cannot be used with other options\n",
-                       progname, argv[0]);
-               goto usage_error;
+                       "%s: can't specify --yaml and --copy together\n",
+                       progname);
+               goto error;
+       }
+
+       if ((from_yaml || from_copy) &&
+           (setstripe_args_specified(&lsa) || layout != NULL)) {
+               fprintf(stderr, "error: %s: can't specify --yaml with "
+                       "-c, -S, -i, -o, -p or -E options.\n",
+                       argv[0]);
+               goto error;
        }
 
        if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) {
@@ -2621,21 +3199,67 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                goto usage_error;
        }
 
-       if (!comp_del && !comp_set && comp_id != 0) {
+       if (!comp_del && !comp_set && (opc != SO_MIRROR_SPLIT) &&
+           comp_id != 0) {
                fprintf(stderr,
-                       "%s %s: option -I can only be used with --component-del\n",
+               "%s %s: option -I can only be used with --component-del or --component-set or lfs mirror split\n",
                        progname, argv[0]);
                goto usage_error;
        }
 
-       if (mdt_idx_arg != NULL) {
+       if (migrate_mdt_mode) {
+               struct lmv_user_md *lmu;
+
                /* initialize migrate mdt parameters */
-               migrate_mdt_param.fp_mdt_index = strtoul(mdt_idx_arg, &end, 0);
-               if (*end != '\0') {
-                       fprintf(stderr, "%s %s: invalid MDT index '%s'\n",
-                               progname, argv[0], mdt_idx_arg);
+               lmu = calloc(1, lmv_user_md_size(lsa.lsa_nr_tgts,
+                                                LMV_USER_MAGIC_SPECIFIC));
+               if (!lmu) {
+                       fprintf(stderr,
+                               "%s %s: cannot allocate memory for lmv_user_md: %s\n",
+                               progname, argv[0], strerror(ENOMEM));
+                       result = -ENOMEM;
+                       goto error;
+               }
+               if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
+                       lmu->lum_stripe_count = lsa.lsa_stripe_count;
+               if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT) {
+                       fprintf(stderr,
+                               "%s %s: migrate should specify MDT index\n",
+                               progname, argv[0]);
+                       free(lmu);
                        goto usage_error;
                }
+               lmu->lum_stripe_offset = lsa.lsa_stripe_off;
+               if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
+                       lmu->lum_hash_type = lsa.lsa_pattern;
+               else
+                       lmu->lum_hash_type = LMV_HASH_TYPE_FNV_1A_64;
+               if (lsa.lsa_pool_name)
+                       strncpy(lmu->lum_pool_name, lsa.lsa_pool_name,
+                               sizeof(lmu->lum_pool_name));
+               if (lsa.lsa_nr_tgts > 1) {
+                       int i;
+
+                       if (lsa.lsa_stripe_count > 0 &&
+                           lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
+                           lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
+                               fprintf(stderr,
+                                       "error: %s: stripe count %lld doesn't match the number of MDTs: %d\n",
+                                       progname, lsa.lsa_stripe_count,
+                                               lsa.lsa_nr_tgts);
+                               free(lmu);
+                               goto usage_error;
+                       }
+
+                       lmu->lum_magic = LMV_USER_MAGIC_SPECIFIC;
+                       lmu->lum_stripe_count = lsa.lsa_nr_tgts;
+                       for (i = 0; i < lsa.lsa_nr_tgts; i++)
+                               lmu->lum_objects[i].lum_mds = lsa.lsa_tgts[i];
+               } else {
+                       lmu->lum_magic = LMV_USER_MAGIC;
+               }
+
+               migrate_mdt_param.fp_lmv_md = lmu;
                migrate_mdt_param.fp_migrate = 1;
        } else if (layout == NULL) {
                /* initialize stripe parameters */
@@ -2678,13 +3302,33 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
 
                        param->lsp_is_specific = true;
                        param->lsp_stripe_count = lsa.lsa_nr_tgts;
-                       memcpy(param->lsp_osts, osts,
-                              sizeof(*osts) * lsa.lsa_nr_tgts);
+                       memcpy(param->lsp_osts, tgts,
+                              sizeof(*tgts) * lsa.lsa_nr_tgts);
+               }
+       }
+
+       if (from_yaml) {
+               /* generate a layout from a YAML template */
+               result = lfs_comp_create_from_yaml(template, &layout,
+                                                  &lsa, tgts);
+               if (result) {
+                       fprintf(stderr, "error: %s: can't create composite "
+                               "layout from template file %s\n",
+                               argv[0], template);
+                       goto error;
+               }
+       } else if (from_copy) {
+               layout = llapi_layout_get_by_path(template, 0);
+               if (layout == NULL) {
+                       fprintf(stderr,
+                           "%s: can't create composite layout from file %s.\n",
+                               progname, template);
+                       goto error;
                }
        }
 
        for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
-               if (mdt_idx_arg != NULL) {
+               if (migrate_mdt_mode) {
                        result = llapi_migrate_mdt(fname, &migrate_mdt_param);
                } else if (migrate_mode) {
                        result = lfs_migrate(fname, migration_flags, param,
@@ -2704,9 +3348,23 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                } else if (opc == SO_MIRROR_EXTEND) {
                        result = mirror_extend(fname, mirror_list,
                                               mirror_flags);
+               } else if (opc == SO_MIRROR_SPLIT) {
+                       if (mirror_id == 0 && comp_id == 0) {
+                               fprintf(stderr,
+                       "%s %s: no mirror id or component id is specified\n",
+                                       progname, argv[0]);
+                               goto usage_error;
+                       }
+                       if (mirror_id != 0)
+                               comp_id = mirror_id;
+                       else
+                               mirror_flags |= MF_COMP_ID;
+                       result = mirror_split(fname, comp_id, mirror_flags,
+                                             has_m_file ? mirror_list->m_file :
+                                             NULL);
                } else if (layout != NULL) {
                        result = lfs_component_create(fname, O_CREAT | O_WRONLY,
-                                                     0644, layout);
+                                                     0666, layout);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -2714,7 +3372,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
                } else {
                        result = llapi_file_open_param(fname,
                                                       O_CREAT | O_WRONLY,
-                                                      0644, param);
+                                                      0666, param);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -2729,6 +3387,7 @@ static int lfs_setstripe0(int argc, char **argv, enum setstripe_origin opc)
        }
 
        free(param);
+       free(migrate_mdt_param.fp_lmv_md);
        llapi_layout_free(layout);
        lfs_mirror_list_free(mirror_list);
        return result2;
@@ -2748,30 +3407,67 @@ static int lfs_poollist(int argc, char **argv)
         return llapi_poollist(argv[1]);
 }
 
-static int set_time(time_t *time, time_t *set, char *str)
+static time_t set_time(struct find_param *param, time_t *time, time_t *set,
+                      char *str)
 {
-        time_t t;
-        int res = 0;
+       long long t = 0;
+       int res = 0;
+       char *endptr = "AD";
+       char *timebuf;
+
+       if (str[0] == '+')
+               res = 1;
+       else if (str[0] == '-')
+               res = -1;
+
+       if (res)
+               str++;
+
+       for (timebuf = str; *endptr && *(endptr + 1); timebuf = endptr + 1) {
+               long long val = strtoll(timebuf, &endptr, 0);
+               int unit = 1;
+
+               switch (*endptr) {
+               case  'y':
+                       unit *= 52; /* 52 weeks + 1 day below */
+               case  'w':      /* fallthrough */
+                       unit *= 7;
+               case '\0': /* days are default unit if none used */
+               case  'd':      /* fallthrough */
+                       unit = (unit + (*endptr == 'y')) * 24;
+               case  'h':      /* fallthrough */
+                       unit *= 60;
+               case  'm':      /* fallthrough */
+                       unit *= 60;
+               case  's':      /* fallthrough */
+                       break;
+                       /* don't need to multiply by 1 for seconds */
+               default:
+                       fprintf(stderr,
+                               "%s find: bad time string '%s': %s\n",
+                               progname, timebuf, strerror(EINVAL));
+                       return LONG_MAX;
+               }
 
-        if (str[0] == '+')
-                res = 1;
-        else if (str[0] == '-')
-                res = -1;
+               if (param->fp_time_margin == 0 ||
+                   (*endptr && unit < param->fp_time_margin))
+                       param->fp_time_margin = unit;
 
-        if (res)
-                str++;
+               t += val * unit;
+       }
+       if (*time < t) {
+               if (res != 0)
+                       str--;
+               fprintf(stderr, "%s find: bad time '%s': too large\n",
+                       progname, str);
+               return LONG_MAX;
+       }
 
-        t = strtol(str, NULL, 0);
-        if (*time < t * 24 * 60 * 60) {
-                if (res)
-                        str--;
-                fprintf(stderr, "Wrong time '%s' is specified.\n", str);
-                return INT_MAX;
-        }
+       *set = *time - t;
 
-        *set = *time - t * 24 * 60 * 60;
-        return res;
+       return res;
 }
+
 static int name2uid(unsigned int *id, const char *name)
 {
        struct passwd *passwd;
@@ -2854,9 +3550,11 @@ static int lfs_find(int argc, char **argv)
        struct find_param param = {
                .fp_max_depth = -1,
                .fp_quiet = 1,
+               .fp_time_margin = 24 * 60 * 60,
        };
         struct option long_opts[] = {
        { .val = 'A',   .name = "atime",        .has_arg = required_argument },
+       { .val = 'b',   .name = "blocks",       .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -2872,6 +3570,8 @@ static int lfs_find(int argc, char **argv)
        { .val = LFS_COMP_START_OPT,
                        .name = "component-start",
                                                .has_arg = required_argument },
+       { .val = LFS_MIRROR_STATE_OPT,
+                       .name = "mirror-state", .has_arg = required_argument },
        { .val = 'c',   .name = "stripe-count", .has_arg = required_argument },
        { .val = 'c',   .name = "stripe_count", .has_arg = required_argument },
        { .val = 'C',   .name = "ctime",        .has_arg = required_argument },
@@ -2893,13 +3593,14 @@ static int lfs_find(int argc, char **argv)
        { .val = 'm',   .name = "mdt_index",    .has_arg = required_argument },
        { .val = 'M',   .name = "mtime",        .has_arg = required_argument },
        { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .val = 'N',   .name = "mirror-count", .has_arg = required_argument },
 /* find        { .val = 'o'    .name = "or", .has_arg = no_argument }, like find(1) */
        { .val = 'O',   .name = "obd",          .has_arg = required_argument },
        { .val = 'O',   .name = "ost",          .has_arg = required_argument },
-       /* no short option for pool, p/P already used */
+       /* no short option for pool yet, can be 'p' after 2.18 */
        { .val = LFS_POOL_OPT,
                        .name = "pool",         .has_arg = required_argument },
-       { .val = 'p',   .name = "print0",       .has_arg = no_argument },
+       { .val = '0',   .name = "print0",       .has_arg = no_argument },
        { .val = 'P',   .name = "print",        .has_arg = no_argument },
        { .val = LFS_PROJID_OPT,
                        .name = "projid",       .has_arg = required_argument },
@@ -2915,6 +3616,7 @@ static int lfs_find(int argc, char **argv)
        { .val = 'U',   .name = "user",         .has_arg = required_argument },
 /* getstripe { .val = 'v', .name = "verbose",  .has_arg = no_argument }, */
 /* getstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .val = 'z',   .name = "lazy",         .has_arg = no_argument },
        { .name = NULL } };
         int pathstart = -1;
         int pathend = -1;
@@ -2928,7 +3630,7 @@ static int lfs_find(int argc, char **argv)
 
        /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
        while ((c = getopt_long_only(argc, argv,
-                       "-A:c:C:D:E:g:G:H:i:L:m:M:n:O:Ppqrs:S:t:T:u:U:v",
+                       "-0A:b:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz",
                        long_opts, NULL)) >= 0) {
                 xtime = NULL;
                 xsign = NULL;
@@ -2982,14 +3684,34 @@ static int lfs_find(int argc, char **argv)
                                xsign = &param.fp_msign;
                                param.fp_exclude_mtime = !!neg_opt;
                        }
-                       rc = set_time(&t, xtime, optarg);
-                       if (rc == INT_MAX) {
+                       rc = set_time(&param, &t, xtime, optarg);
+                       if (rc == LONG_MAX) {
                                ret = -1;
                                goto err;
                        }
                        if (rc)
                                *xsign = rc;
                        break;
+               case 'b':
+                       if (optarg[0] == '+') {
+                               param.fp_blocks_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.fp_blocks_sign =  1;
+                               optarg++;
+                       }
+
+                       param.fp_blocks_units = 1024;
+                       ret = llapi_parse_size(optarg, &param.fp_blocks,
+                                              &param.fp_blocks_units, 0);
+                       if (ret) {
+                               fprintf(stderr, "error: bad blocks '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.fp_check_blocks = 1;
+                       param.fp_exclude_blocks = !!neg_opt;
+                       break;
                case LFS_COMP_COUNT_OPT:
                        if (optarg[0] == '+') {
                                param.fp_comp_count_sign = -1;
@@ -3042,6 +3764,23 @@ static int lfs_find(int argc, char **argv)
                        param.fp_check_comp_start = 1;
                        param.fp_exclude_comp_start = !!neg_opt;
                        break;
+               case LFS_MIRROR_STATE_OPT:
+                       rc = mirror_str2state(optarg, &param.fp_mirror_state,
+                                             &param.fp_mirror_neg_state);
+                       if (rc) {
+                               fprintf(stderr,
+                                       "error: bad mirrored file state '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.fp_check_mirror_state = 1;
+                       if (neg_opt) {
+                               __u16 state = param.fp_mirror_neg_state;
+                               param.fp_mirror_neg_state =
+                                       param.fp_mirror_state;
+                               param.fp_mirror_state = state;
+                       }
+                       break;
                 case 'c':
                         if (optarg[0] == '+') {
                                param.fp_stripe_count_sign = -1;
@@ -3138,26 +3877,29 @@ static int lfs_find(int argc, char **argv)
                        param.fp_exclude_uid = !!neg_opt;
                        param.fp_check_uid = 1;
                         break;
-               case LFS_POOL_OPT:
-                        if (strlen(optarg) > LOV_MAXPOOLNAME) {
-                                fprintf(stderr,
-                                        "Pool name %s is too long"
-                                        " (max is %d)\n", optarg,
-                                        LOV_MAXPOOLNAME);
-                                ret = -1;
-                                goto err;
-                        }
-                        /* we do check for empty pool because empty pool
-                         * is used to find V1 lov attributes */
-                       strncpy(param.fp_poolname, optarg, LOV_MAXPOOLNAME);
-                       param.fp_poolname[LOV_MAXPOOLNAME] = '\0';
-                       param.fp_exclude_pool = !!neg_opt;
-                       param.fp_check_pool = 1;
-                        break;
                 case 'n':
                        param.fp_pattern = (char *)optarg;
                        param.fp_exclude_pattern = !!neg_opt;
                         break;
+               case 'N':
+                       if (optarg[0] == '+') {
+                               param.fp_mirror_count_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.fp_mirror_count_sign =  1;
+                               optarg++;
+                       }
+
+                       param.fp_mirror_count = strtoul(optarg, &endptr, 0);
+                       if (*endptr != '\0') {
+                               fprintf(stderr,
+                                       "error: bad mirror count '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.fp_check_mirror_count = 1;
+                       param.fp_exclude_mirror_count = !!neg_opt;
+                       break;
                 case 'm':
                 case 'i':
                 case 'O': {
@@ -3235,10 +3977,35 @@ err_free:
                                free(buf);
                        break;
                }
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 18, 53, 0)
                case 'p':
+#endif
+               case LFS_POOL_OPT:
+                       if (strlen(optarg) > LOV_MAXPOOLNAME) {
+                               fprintf(stderr,
+                                       "Pool name %s is too long (max %d)\n",
+                                       optarg, LOV_MAXPOOLNAME);
+                               ret = -1;
+                               goto err;
+                       }
+                       /*
+                        * We do check for empty pool because empty pool
+                        * is used to find V1 LOV attributes
+                        */
+                       strncpy(param.fp_poolname, optarg, LOV_MAXPOOLNAME);
+                       param.fp_poolname[LOV_MAXPOOLNAME] = '\0';
+                       param.fp_exclude_pool = !!neg_opt;
+                       param.fp_check_pool = 1;
+                       break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 53, 0)
+               case 'p': /* want this for --pool, to match getstripe/find */
+                       fprintf(stderr,
+                               "warning: -p deprecated, use --print0 or -0\n");
+#endif
+               case '0':
                        param.fp_zero_end = 1;
                        break;
-               case 'P':
+               case 'P': /* we always print, this option is a no-op */
                        break;
                case LFS_PROJID_OPT:
                        rc = name2projid(&param.fp_projid, optarg);
@@ -3343,6 +4110,9 @@ err_free:
                        param.fp_check_mdt_count = 1;
                        param.fp_exclude_mdt_count = !!neg_opt;
                        break;
+               case 'z':
+                       param.fp_lazy = 1;
+                       break;
                 default:
                         ret = CMD_HELP;
                         goto err;
@@ -3383,6 +4153,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
 {
        struct option long_opts[] = {
 /* find        { .val = 'A',   .name = "atime",        .has_arg = required_argument }*/
+/* find        { .val = 'b',   .name = "blocks",       .has_arg = required_argument }*/
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = no_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -3395,6 +4166,10 @@ static int lfs_getstripe_internal(int argc, char **argv,
                        .name = "comp-start",   .has_arg = optional_argument },
        { .val = LFS_COMP_START_OPT,
                .name = "component-start",      .has_arg = optional_argument },
+       { .val = LFS_MIRROR_INDEX_OPT,
+               .name = "mirror-index",         .has_arg = required_argument },
+       { .val = LFS_MIRROR_ID_OPT,
+               .name = "mirror-id",            .has_arg = required_argument },
        { .val = 'c',   .name = "stripe-count", .has_arg = no_argument },
        { .val = 'c',   .name = "stripe_count", .has_arg = no_argument },
 /* find        { .val = 'C',   .name = "ctime",        .has_arg = required_argument }*/
@@ -3416,6 +4191,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
        { .val = 'm',   .name = "mdt_index",    .has_arg = no_argument },
 /* find        { .val = 'M',   .name = "mtime",        .has_arg = required_argument }*/
 /* find        { .val = 'n',   .name = "name",         .has_arg = required_argument }*/
+       { .val = 'N',   .name = "mirror-count", .has_arg = no_argument },
        { .val = 'O',   .name = "obd",          .has_arg = required_argument },
        { .val = 'O',   .name = "ost",          .has_arg = required_argument },
        { .val = 'p',   .name = "pool",         .has_arg = no_argument },
@@ -3433,11 +4209,36 @@ static int lfs_getstripe_internal(int argc, char **argv,
        { .val = 'y',   .name = "yaml",         .has_arg = no_argument },
        { .name = NULL } };
        int c, rc;
+       int neg_opt = 0;
+       int pathstart = -1, pathend = -1;
+       int isoption;
        char *end, *tmp;
 
-       while ((c = getopt_long(argc, argv, "cdDE::FghiI::LmMoO:pqrRsSvy",
-                               long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv,
+                       "-cdDE::FghiI::LmMNoO:pqrRsSvy",
+                       long_opts, NULL)) != -1) {
+               if (neg_opt)
+                       --neg_opt;
+
+               /* '!' is part of option */
+               isoption = (c != 1) || (strcmp(optarg, "!") == 0);
+               if (!isoption && pathend != -1) {
+                       fprintf(stderr,
+                               "error: %s: filename|dirname must either precede options or follow options\n",
+                               argv[0]);
+                       return CMD_HELP;
+               }
+               if (!isoption && pathstart == -1)
+                       pathstart = optind - 1;
+               if (isoption && pathstart != -1 && pathend == -1)
+                       pathend = optind - 2;
+
                switch (c) {
+               case 1:
+                       /* unknown: opt is "!" */
+                       if (strcmp(optarg, "!") == 0)
+                               neg_opt = 2;
+                       break;
                case 'c':
                        if (!(param->fp_verbose & VERBOSE_DETAIL)) {
                                param->fp_verbose |= VERBOSE_COUNT;
@@ -3491,6 +4292,58 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                param->fp_max_depth = 0;
                        }
                        break;
+               case LFS_MIRROR_INDEX_OPT:
+                       if (optarg[0] == '+') {
+                               param->fp_mirror_index_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param->fp_mirror_index_sign = 1;
+                               optarg++;
+                       }
+
+                       param->fp_mirror_index = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || (param->fp_mirror_index == 0 &&
+                           param->fp_mirror_index_sign == 0 && neg_opt == 0)) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror index '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       if (param->fp_mirror_id != 0) {
+                               fprintf(stderr,
+                                       "%s %s: can't specify both mirror index and mirror ID\n",
+                                       progname, argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->fp_check_mirror_index = 1;
+                       param->fp_exclude_mirror_index = !!neg_opt;
+                       break;
+               case LFS_MIRROR_ID_OPT:
+                       if (optarg[0] == '+') {
+                               param->fp_mirror_id_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param->fp_mirror_id_sign = 1;
+                               optarg++;
+                       }
+
+                       param->fp_mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || (param->fp_mirror_id == 0 &&
+                           param->fp_mirror_id_sign == 0 && neg_opt == 0)) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       if (param->fp_mirror_index != 0) {
+                               fprintf(stderr,
+                                       "%s %s: can't specify both mirror index and mirror ID\n",
+                                       progname, argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->fp_check_mirror_id = 1;
+                       param->fp_exclude_mirror_id = !!neg_opt;
+                       break;
                case 'd':
                        param->fp_max_depth = 0;
                        break;
@@ -3543,7 +4396,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
                        break;
                case 'i':
                        if (!(param->fp_verbose & VERBOSE_DETAIL)) {
-                               param->fp_verbose |= VERBOSE_OFFSET;
+                               param->fp_verbose |= VERBOSE_STRIPE_OFFSET;
                                param->fp_max_depth = 0;
                        }
                        break;
@@ -3566,7 +4419,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
                        break;
                case 'L':
                        if (!(param->fp_verbose & VERBOSE_DETAIL)) {
-                               param->fp_verbose |= VERBOSE_LAYOUT;
+                               param->fp_verbose |= VERBOSE_PATTERN;
                                param->fp_max_depth = 0;
                        }
                        break;
@@ -3580,6 +4433,12 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                param->fp_max_depth = 0;
                        param->fp_verbose |= VERBOSE_MDTINDEX;
                        break;
+               case 'N':
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_MIRROR_COUNT;
+                               param->fp_max_depth = 0;
+                       }
+                       break;
                case 'O':
                        if (param->fp_obd_uuid) {
                                fprintf(stderr,
@@ -3606,7 +4465,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
                        break;
                case 'S':
                        if (!(param->fp_verbose & VERBOSE_DETAIL)) {
-                               param->fp_verbose |= VERBOSE_SIZE;
+                               param->fp_verbose |= VERBOSE_STRIPE_SIZE;
                                param->fp_max_depth = 0;
                        }
                        break;
@@ -3621,7 +4480,16 @@ static int lfs_getstripe_internal(int argc, char **argv,
                }
        }
 
-       if (optind >= argc)
+       if (pathstart == -1) {
+               fprintf(stderr, "error: %s: no filename|pathname\n",
+                               argv[0]);
+               return CMD_HELP;
+       } else if (pathend == -1) {
+               /* no options */
+               pathend = argc;
+       }
+
+       if (pathend > argc)
                return CMD_HELP;
 
        if (param->fp_recursive)
@@ -3635,8 +4503,8 @@ static int lfs_getstripe_internal(int argc, char **argv,
                param->fp_verbose = VERBOSE_OBJID;
 
        do {
-               rc = llapi_getstripe(argv[optind], param);
-       } while (++optind < argc && !rc);
+               rc = llapi_getstripe(argv[pathstart], param);
+       } while (++pathstart < pathend && !rc);
 
        if (rc)
                fprintf(stderr, "error: %s failed for %s.\n",
@@ -3722,7 +4590,7 @@ static int lfs_getdirstripe(int argc, char **argv)
                        break;
                case 'i':
                case 'm':
-                       param.fp_verbose |= VERBOSE_OFFSET;
+                       param.fp_verbose |= VERBOSE_STRIPE_OFFSET;
                        break;
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
                case 't':
@@ -3771,333 +4639,54 @@ static int lfs_getdirstripe(int argc, char **argv)
        return rc;
 }
 
-/* functions */
-static int lfs_setdirstripe(int argc, char **argv)
-{
-       char                    *dname;
-       int                     result;
-       struct lfs_setstripe_args        lsa;
-       struct llapi_stripe_param       *param = NULL;
-       __u32                   mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
-       char                    *end;
-       int                     c;
-       char                    *mode_opt = NULL;
-       bool                    default_stripe = false;
-       mode_t                  mode = S_IRWXU | S_IRWXG | S_IRWXO;
-       mode_t                  previous_mode = 0;
-       bool                    delete = false;
+enum mntdf_flags {
+       MNTDF_INODES    = 0x0001,
+       MNTDF_COOKED    = 0x0002,
+       MNTDF_LAZY      = 0x0004,
+       MNTDF_VERBOSE   = 0x0008,
+       MNTDF_SHOW      = 0x0010,
+};
 
-       struct option long_opts[] = {
-       { .val = 'c',   .name = "count",        .has_arg = required_argument },
-       { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument },
-       { .val = 'd',   .name = "delete",       .has_arg = no_argument },
-       { .val = 'D',   .name = "default",      .has_arg = no_argument },
-       { .val = 'D',   .name = "default_stripe", .has_arg = no_argument },
-       { .val = 'H',   .name = "mdt-hash",     .has_arg = required_argument },
-       { .val = 'i',   .name = "mdt-index",    .has_arg = required_argument },
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       { .val = 'i',   .name = "index",        .has_arg = required_argument },
-#endif
-       { .val = 'o',   .name = "mode",         .has_arg = required_argument },
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       { .val = 't',   .name = "hash-type",    .has_arg = required_argument },
-#endif
-       { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
-       { .name = NULL } };
+#define COOK(value)                                            \
+({                                                             \
+       int radix = 0;                                          \
+       while (value > 1024) {                                  \
+               value /= 1024;                                  \
+               radix++;                                        \
+       }                                                       \
+       radix;                                                  \
+})
+#define UUF     "%-20s"
+#define CSF     "%11s"
+#define CDF     "%11llu"
+#define HDF     "%8.1f%c"
+#define RSF     "%4s"
+#define RDF     "%3d%%"
 
-       setstripe_args_init(&lsa);
+static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes)
+{
+       double avail, used, ratio = 0;
 
-       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts,
-                               NULL)) >= 0) {
-               switch (c) {
-               case 0:
-                       /* Long options. */
-                       break;
-               case 'c':
-               case 'T':
-                       lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
-                       if (*end != '\0') {
-                               fprintf(stderr,
-                                       "%s %s: invalid stripe count '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'd':
-                       delete = true;
-                       default_stripe = true;
-                       break;
-               case 'D':
-                       default_stripe = true;
-                       break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-               case 't':
-                       fprintf(stderr, "warning: '--hash-type' and '-t' "
-                             "deprecated, use '--mdt-hash' or '-H' instead\n");
-#endif
-               case 'H':
-                       lsa.lsa_pattern = check_hashtype(optarg);
-                       if (lsa.lsa_pattern == 0) {
-                               fprintf(stderr,
-                                       "%s %s: bad stripe hash type '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'i':
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-                       if (strcmp(argv[optind - 1], "--index") == 0)
-                               fprintf(stderr,
-                                       "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
-                                       progname, argv[0]);
-#endif
-                       lsa.lsa_nr_tgts = parse_targets(mdts,
-                                               sizeof(mdts) / sizeof(__u32),
-                                               lsa.lsa_nr_tgts, optarg);
-                       if (lsa.lsa_nr_tgts < 0) {
-                               fprintf(stderr,
-                                       "%s %s: invalid MDT target(s) '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
+       if (inodes) {
+               avail = st->os_ffree;
+               used = st->os_files - st->os_ffree;
+       } else {
+               avail = st->os_bavail;
+               used = st->os_blocks - st->os_bfree;
+       }
+       if (avail + used > 0)
+               ratio = used / (used + avail) * 100;
 
-                       lsa.lsa_tgts = mdts;
-                       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
-                               lsa.lsa_stripe_off = mdts[0];
-                       break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
-               case 'm':
-                       fprintf(stderr, "warning: '-m' is deprecated, "
-                               "use '--mode' or '-o' instead\n");
-#endif
-               case 'o':
-                       mode_opt = optarg;
-                       break;
-               default:
-                       fprintf(stderr, "%s %s: unrecognized option '%s'\n",
-                               progname, argv[0], argv[optind - 1]);
-                       return CMD_HELP;
-               }
-       }
-
-       if (optind == argc) {
-               fprintf(stderr, "%s %s: DIR must be specified\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
-           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) {
-               fprintf(stderr,
-                       "%s %s: stripe offset and count must be specified\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (delete &&
-           (lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT ||
-            lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)) {
-               fprintf(stderr,
-                       "%s %s: cannot specify -d with -c or -i options\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (mode_opt != NULL) {
-               mode = strtoul(mode_opt, &end, 8);
-               if (*end != '\0') {
-                       fprintf(stderr,
-                               "%s %s: bad MODE '%s'\n",
-                               progname, argv[0], mode_opt);
-                       return CMD_HELP;
-               }
-               previous_mode = umask(0);
-       }
-
-       /* initialize stripe parameters */
-       param = calloc(1, offsetof(typeof(*param), lsp_osts[lsa.lsa_nr_tgts]));
-       if (param == NULL) {
-               fprintf(stderr,
-                       "%s %s: cannot allocate memory for parameters: %s\n",
-                       progname, argv[0], strerror(ENOMEM));
-               return CMD_HELP;
-       }
-
-       if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
-               param->lsp_stripe_count = lsa.lsa_stripe_count;
-       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
-               param->lsp_stripe_offset = -1;
-       else
-               param->lsp_stripe_offset = lsa.lsa_stripe_off;
-       if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
-               param->lsp_stripe_pattern = lsa.lsa_pattern;
-       else
-               param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64;
-       param->lsp_pool = lsa.lsa_pool_name;
-       param->lsp_is_specific = false;
-       if (lsa.lsa_nr_tgts > 1) {
-               if (lsa.lsa_stripe_count > 0 &&
-                   lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
-                   lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
-                       fprintf(stderr, "error: %s: stripe count %lld doesn't "
-                               "match the number of MDTs: %d\n",
-                               argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts);
-                       free(param);
-                       return CMD_HELP;
-               }
-
-               param->lsp_is_specific = true;
-               param->lsp_stripe_count = lsa.lsa_nr_tgts;
-               memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts);
-       }
-
-       dname = argv[optind];
-       do {
-               if (default_stripe)
-                       result = llapi_dir_set_default_lmv(dname, param);
-               else
-                       result = llapi_dir_create_param(dname, mode, param);
-
-               if (result) {
-                       fprintf(stderr,
-                               "%s setdirstripe: cannot create stripe dir '%s': %s\n",
-                               progname, dname, strerror(-result));
-                       break;
-               }
-               dname = argv[++optind];
-       } while (dname != NULL);
-
-       if (mode_opt != NULL)
-               umask(previous_mode);
-
-       free(param);
-       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_mv(int argc, char **argv)
-{
-       struct  find_param param = {
-               .fp_max_depth = -1,
-               .fp_mdt_index = -1,
-       };
-       char   *end;
-       int     c;
-       int     rc = 0;
-       struct option long_opts[] = {
-       { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
-       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
-       { .name = NULL } };
-
-       while ((c = getopt_long(argc, argv, "m:M:v", long_opts, NULL)) != -1) {
-               switch (c) {
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-               case 'M':
-                       fprintf(stderr, "warning: '-M' deprecated"
-                               ", use '--mdt-index' or '-m' instead\n");
-#endif
-               case 'm':
-                       param.fp_mdt_index = strtoul(optarg, &end, 0);
-                       if (*end != '\0') {
-                               fprintf(stderr, "%s: invalid MDT index'%s'\n",
-                                       argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'v':
-                       param.fp_verbose = VERBOSE_DETAIL;
-                       break;
-               default:
-                       fprintf(stderr, "error: %s: unrecognized option '%s'\n",
-                               argv[0], argv[optind - 1]);
-                       return CMD_HELP;
-               }
-       }
-
-       if (param.fp_mdt_index == -1) {
-               fprintf(stderr, "%s: MDT index must be specified\n", argv[0]);
-               return CMD_HELP;
-       }
-
-       if (optind >= argc) {
-               fprintf(stderr, "%s: missing operand path\n", argv[0]);
-               return CMD_HELP;
-       }
-
-       param.fp_migrate = 1;
-       rc = llapi_migrate_mdt(argv[optind], &param);
-       if (rc != 0)
-               fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n",
-                       argv[0], argv[optind], param.fp_mdt_index,
-                       strerror(-rc));
-       return rc;
-}
-
-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);
+       /* Round up to match df(1) usage percentage */
+       return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio;
 }
 
-#define COOK(value)                                                     \
-({                                                                      \
-        int radix = 0;                                                  \
-        while (value > 1024) {                                          \
-                value /= 1024;                                          \
-                radix++;                                                \
-        }                                                               \
-        radix;                                                          \
-})
-#define UUF     "%-20s"
-#define CSF     "%11s"
-#define CDF     "%11llu"
-#define HDF     "%8.1f%c"
-#define RSF     "%4s"
-#define RDF     "%3d%%"
-
-enum mntdf_flags {
-       MNTDF_INODES    = 0x0001,
-       MNTDF_COOKED    = 0x0002,
-       MNTDF_LAZY      = 0x0004,
-       MNTDF_VERBOSE   = 0x0008,
-};
-
 static int showdf(char *mntdir, struct obd_statfs *stat,
                  char *uuid, enum mntdf_flags flags,
                  char *type, int index, int rc)
 {
        long long avail, used, total;
-       double ratio = 0;
+       int ratio = 0;
        char *suffix = "KMGTPEZY";
        /* Note if we have >2^64 bytes/fs these buffers will need to be grown */
        char tbuf[3 * sizeof(__u64)];
@@ -4123,8 +4712,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        total = (stat->os_blocks * stat->os_bsize) >> shift;
                }
 
-               if ((used + avail) > 0)
-                       ratio = (double)used / (double)(used + avail);
+               ratio = obd_statfs_ratio(stat, flags & MNTDF_INODES);
 
                if (flags & MNTDF_COOKED) {
                        int i;
@@ -4159,7 +4747,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        snprintf(abuf, sizeof(tbuf), CDF, avail);
                }
 
-               sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
+               sprintf(rbuf, RDF, ratio);
                printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
                       uuid, tbuf, ubuf, abuf, rbuf, mntdir);
                if (type)
@@ -4198,11 +4786,24 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
 }
 
 struct ll_stat_type {
-        int   st_op;
-        char *st_name;
+       int   st_op;
+       char *st_name;
+};
+
+#define LL_STATFS_MAX  LOV_MAX_STRIPE_COUNT
+
+struct ll_statfs_data {
+       int                     sd_index;
+       struct obd_statfs       sd_st;
+};
+
+struct ll_statfs_buf {
+       int                     sb_count;
+       struct ll_statfs_data   sb_buf[LL_STATFS_MAX];
 };
 
-static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
+static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
+                int ops, struct ll_statfs_buf *lsb)
 {
        struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
        struct obd_uuid uuid_buf;
@@ -4239,16 +4840,24 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                return rc;
        }
 
-       if (flags & MNTDF_INODES)
-               printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
-                      "UUID", "Inodes", "IUsed", "IFree",
-                      "IUse%", "Mounted on");
-       else
-               printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
-                      "UUID", flags & MNTDF_COOKED ? "bytes" : "1K-blocks",
-                      "Used", "Available", "Use%", "Mounted on");
+       if (flags & MNTDF_SHOW) {
+               if (flags & MNTDF_INODES)
+                       printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
+                              "UUID", "Inodes", "IUsed", "IFree",
+                              "IUse%", "Mounted on");
+               else
+                       printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
+                              "UUID",
+                              flags & MNTDF_COOKED ? "bytes" : "1K-blocks",
+                              "Used", "Available", "Use%", "Mounted on");
+       }
 
        for (tp = types; tp->st_name != NULL; tp++) {
+               bool have_ost = false;
+
+               if (!(tp->st_op & ops))
+                       continue;
+
                for (index = 0; ; index++) {
                        memset(&stat_buf, 0, sizeof(struct obd_statfs));
                        memset(&uuid_buf, 0, sizeof(struct obd_uuid));
@@ -4267,6 +4876,20 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                                rc = rc2;
                        }
 
+                       /* If we have OSTs then don't report MDT block counts.
+                        * For MDT-only filesystems the expectation is that all
+                        * layouts have a DoM component.  For filesystems with
+                        * OSTs, files are not necessarily going to store data
+                        * on MDTs, and MDT space is limited to a fraction of
+                        * OST space, so don't include it in the summary.
+                        */
+                       if (tp->st_op == LL_STATFS_LOV && !have_ost) {
+                               have_ost = true;
+                               sum.os_blocks = 0;
+                               sum.os_bfree = 0;
+                               sum.os_bavail = 0;
+                       }
+
                        if (poolname && tp->st_op == LL_STATFS_LOV &&
                            llapi_search_ost(fsname, poolname,
                                             obd_uuid2str(&uuid_buf)) != 1)
@@ -4280,23 +4903,31 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                        if (uuid_buf.uuid[0] == '\0')
                                snprintf(uuid_buf.uuid, sizeof(uuid_buf.uuid),
                                         "%s%04x", tp->st_name, index);
-                       showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
-                              flags, tp->st_name, index, rc2);
-
-                       if (rc2 == 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;
-                                       ost_ffree += stat_buf.os_ffree;
-                               }
+                       if (!rc && lsb) {
+                               lsb->sb_buf[lsb->sb_count].sd_index = index;
+                               lsb->sb_buf[lsb->sb_count].sd_st = stat_buf;
+                               lsb->sb_count++;
+                       }
+                       if (flags & MNTDF_SHOW)
+                               showdf(mntdir, &stat_buf,
+                                      obd_uuid2str(&uuid_buf), flags,
+                                      tp->st_name, index, rc2);
+
+                       if (rc2)
+                               continue;
+
+                       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) */ {
+                               ost_ffree += stat_buf.os_ffree;
                        }
+                       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;
                }
        }
 
@@ -4310,1514 +4941,2585 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
                sum.os_ffree = ost_ffree;
        }
-       printf("\n");
-       showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0);
-       printf("\n");
+       if (flags & MNTDF_SHOW) {
+               printf("\n");
+               showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0);
+               printf("\n");
+       }
 
        return rc;
 }
 
-static int lfs_df(int argc, char **argv)
+static int ll_statfs_data_comp(const void *sd1, const void *sd2)
 {
-       char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
-       enum mntdf_flags flags = 0;
-       int c, rc = 0, index = 0;
-       char fsname[PATH_MAX] = "", *pool_name = NULL;
-       struct option long_opts[] = {
-       { .val = 'h',   .name = "human-readable",
-                                               .has_arg = no_argument },
-       { .val = 'i',   .name = "inodes",       .has_arg = no_argument },
-       { .val = 'l',   .name = "lazy",         .has_arg = no_argument },
-       { .val = 'p',   .name = "pool",         .has_arg = required_argument },
-       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
-       { .name = NULL} };
+       const struct obd_statfs *st1 = &((const struct ll_statfs_data *)sd1)->
+                                               sd_st;
+       const struct obd_statfs *st2 = &((const struct ll_statfs_data *)sd2)->
+                                               sd_st;
+       int r1 = obd_statfs_ratio(st1, false);
+       int r2 = obd_statfs_ratio(st2, false);
+       int64_t result = r1 - r2;
+
+       /* if both space usage are above 90, compare free inodes */
+       if (r1 > 90 && r2 > 90)
+               result = st2->os_ffree - st1->os_ffree;
+
+       if (result < 0)
+               return -1;
+       else if (result == 0)
+               return 0;
+       else
+               return 1;
+}
 
-       while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) {
-               switch (c) {
-               case 'h':
-                       flags |= MNTDF_COOKED;
-                       break;
-               case 'i':
-                       flags |= MNTDF_INODES;
-                       break;
-               case 'l':
-                       flags |= MNTDF_LAZY;
-                       break;
-               case 'p':
-                       pool_name = optarg;
-                       break;
-               case 'v':
-                       flags |= MNTDF_VERBOSE;
-                       break;
-               default:
-                       return CMD_HELP;
-               }
-       }
-       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;
-
-               rc = mntdf(mntdir, fsname, pool_name, flags);
-               if (rc || path[0] != '\0')
-                       break;
-               fsname[0] = '\0'; /* avoid matching in next loop */
-               mntdir[0] = '\0'; /* avoid matching in next loop */
-       }
-
-       return rc;
-}
-
-static int lfs_getname(int argc, char **argv)
+/* functions */
+static int lfs_setdirstripe(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)];
-
-        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;
-                        }
+       char                    *dname;
+       int                     result;
+       struct lfs_setstripe_args        lsa = { 0 };
+       struct llapi_stripe_param       *param = NULL;
+       __u32                   mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
+       char                    *end;
+       int                     c;
+       char                    *mode_opt = NULL;
+       bool                    default_stripe = false;
+       mode_t                  mode = S_IRWXU | S_IRWXG | S_IRWXO;
+       mode_t                  previous_mode = 0;
+       bool                    delete = false;
+       struct ll_statfs_buf    *lsb = NULL;
+       char                    mntdir[PATH_MAX] = "";
+       bool                    auto_distributed = false;
 
-                        printf("%s %s\n", buf, mntdir);
+       struct option long_opts[] = {
+       { .val = 'c',   .name = "count",        .has_arg = required_argument },
+       { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument },
+       { .val = 'd',   .name = "delete",       .has_arg = no_argument },
+       { .val = 'D',   .name = "default",      .has_arg = no_argument },
+       { .val = 'D',   .name = "default_stripe", .has_arg = no_argument },
+       { .val = 'H',   .name = "mdt-hash",     .has_arg = required_argument },
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 17, 53, 0)
+       { .val = 'i',   .name = "mdt-index",    .has_arg = required_argument },
+       { .val = 'i',   .name = "mdt",          .has_arg = required_argument },
+#else
+       { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
+       { .val = 'm',   .name = "mdt",          .has_arg = required_argument },
+#endif
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+       { .val = 'i',   .name = "index",        .has_arg = required_argument },
+#endif
+       { .val = 'o',   .name = "mode",         .has_arg = required_argument },
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+       { .val = 't',   .name = "hash-type",    .has_arg = required_argument },
+#endif
+       { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
+/* setstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .name = NULL } };
 
-                        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;
-                        }
+       setstripe_args_init(&lsa);
 
-                        printf("%s %s\n", buf, argv[optind]);
-                }
-        }
-        return rc;
-}
+       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts,
+                               NULL)) >= 0) {
+               switch (c) {
+               case 0:
+                       /* Long options. */
+                       break;
+               case 'c':
+               case 'T':
+                       lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
+                       if (*end != '\0') {
+                               fprintf(stderr,
+                                       "%s %s: invalid stripe count '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'd':
+                       delete = true;
+                       default_stripe = true;
+                       break;
+               case 'D':
+                       default_stripe = true;
+                       break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+               case 't':
+                       fprintf(stderr, "warning: '--hash-type' and '-t' "
+                             "deprecated, use '--mdt-hash' or '-H' instead\n");
+#endif
+               case 'H':
+                       lsa.lsa_pattern = check_hashtype(optarg);
+                       if (lsa.lsa_pattern == 0) {
+                               fprintf(stderr,
+                                       "%s %s: bad stripe hash type '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'i':
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 17, 53, 0)
+               case 'm':
+#endif
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+                       if (strcmp(argv[optind - 1], "--index") == 0)
+                               fprintf(stderr,
+                                       "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
+                                       progname, argv[0]);
+#endif
+                       lsa.lsa_nr_tgts = parse_targets(mdts,
+                                               sizeof(mdts) / sizeof(__u32),
+                                               lsa.lsa_nr_tgts, optarg);
+                       if (lsa.lsa_nr_tgts < 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid MDT target(s) '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
 
-static int lfs_check(int argc, char **argv)
-{
-        int rc;
-        char mntdir[PATH_MAX] = {'\0'};
-        int num_types = 1;
-        char *obd_types[2];
-        char obd_type1[4];
-        char obd_type2[4];
+                       lsa.lsa_tgts = mdts;
+                       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+                               lsa.lsa_stripe_off = mdts[0];
+                       break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 15, 53, 0)
+               case 'm':
+                       fprintf(stderr, "warning: '-m' is deprecated, "
+                               "use '--mode' or '-o' instead\n");
+#endif
+               case 'o':
+                       mode_opt = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "%s %s: unrecognized option '%s'\n",
+                               progname, argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
 
-       if (argc != 2) {
-               fprintf(stderr, "%s check: server type must be specified\n",
-                       progname);
+       if (optind == argc) {
+               fprintf(stderr, "%s %s: DIR must be specified\n",
+                       progname, argv[0]);
                return CMD_HELP;
        }
 
-        obd_types[0] = obd_type1;
-        obd_types[1] = obd_type2;
-
-        if (strcmp(argv[1], "osts") == 0) {
-                strcpy(obd_types[0], "osc");
-        } else if (strcmp(argv[1], "mds") == 0) {
-                strcpy(obd_types[0], "mdc");
-        } else if (strcmp(argv[1], "servers") == 0) {
-                num_types = 2;
-                strcpy(obd_types[0], "osc");
-                strcpy(obd_types[1], "mdc");
-       } else {
-               fprintf(stderr, "%s check: unrecognized option '%s'\n",
-                       progname, argv[1]);
+       if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
+           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) {
+               fprintf(stderr,
+                       "%s %s: stripe offset and count must be specified\n",
+                       progname, argv[0]);
                return CMD_HELP;
        }
 
-        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
-       if (rc < 0 || mntdir[0] == '\0') {
+       if (delete &&
+           (lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT ||
+            lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)) {
                fprintf(stderr,
-                       "%s check: cannot find mounted Lustre filesystem: %s\n",
-                       progname, (rc < 0) ? strerror(-rc) : strerror(ENODEV));
-               return rc;
+                       "%s %s: cannot specify -d with -c or -i options\n",
+                       progname, argv[0]);
+               return CMD_HELP;
        }
 
-       rc = llapi_target_check(num_types, obd_types, mntdir);
-       if (rc)
-               fprintf(stderr, "%s check: cannot check target '%s': %s\n",
-                       progname, argv[1], strerror(-rc));
+       if (mode_opt != NULL) {
+               mode = strtoul(mode_opt, &end, 8);
+               if (*end != '\0') {
+                       fprintf(stderr,
+                               "%s %s: bad MODE '%s'\n",
+                               progname, argv[0], mode_opt);
+                       return CMD_HELP;
+               }
+               previous_mode = umask(0);
+       }
 
-       return rc;
+       /*
+        * initialize stripe parameters, in case param is converted to specific,
+        * i.e, 'lfs mkdir -i -1 -c N', always allocate space for lsp_tgts.
+        */
+       param = calloc(1, offsetof(typeof(*param),
+                      lsp_tgts[lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT ?
+                               lsa.lsa_stripe_count : lsa.lsa_nr_tgts]));
+       if (param == NULL) {
+               fprintf(stderr,
+                       "%s %s: cannot allocate memory for parameters: %s\n",
+                       progname, argv[0], strerror(ENOMEM));
+               return CMD_HELP;
+       }
 
-}
+       if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
+               param->lsp_stripe_count = lsa.lsa_stripe_count;
+       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+               param->lsp_stripe_offset = -1;
+       else
+               param->lsp_stripe_offset = lsa.lsa_stripe_off;
+       if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
+               param->lsp_stripe_pattern = lsa.lsa_pattern;
+       else
+               param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64;
+       param->lsp_pool = lsa.lsa_pool_name;
+       param->lsp_is_specific = false;
+       if (lsa.lsa_nr_tgts > 1) {
+               if (lsa.lsa_stripe_count > 0 &&
+                   lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
+                   lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
+                       fprintf(stderr, "error: %s: stripe count %lld doesn't "
+                               "match the number of MDTs: %d\n",
+                               argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts);
+                       free(param);
+                       return CMD_HELP;
+               }
 
-#ifdef HAVE_SYS_QUOTA_H
-#define ARG2INT(nr, str, msg)                                           \
-do {                                                                    \
-       char *endp;                                                     \
-       nr = strtol(str, &endp, 0);                                     \
-       if (*endp != '\0') {                                            \
-               fprintf(stderr, "%s: bad %s '%s'\n",                    \
-                       progname, msg, str);                            \
-               return CMD_HELP;                                        \
-       }                                                               \
-} while (0)
+               param->lsp_is_specific = true;
+               param->lsp_stripe_count = lsa.lsa_nr_tgts;
+               memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts);
+       }
 
-#define ADD_OVERFLOW(a,b) ((a + b) < a) ? (a = ULONG_MAX) : (a = a + b)
+       dname = argv[optind];
+       do {
+               if (default_stripe) {
+                       result = llapi_dir_set_default_lmv(dname, param);
+               } else {
+                       /* if current \a dname isn't under the same \a mntdir
+                        * as the last one, and the last one was
+                        * auto-distributed, restore \a param.
+                        */
+                       if (mntdir[0] != '\0' &&
+                           strncmp(dname, mntdir, strlen(mntdir)) &&
+                           auto_distributed) {
+                               param->lsp_is_specific = false;
+                               param->lsp_stripe_offset = -1;
+                               auto_distributed = false;
+                       }
 
-/* Convert format time string "XXwXXdXXhXXmXXs" into seconds value
- * returns the value or ULONG_MAX on integer overflow or incorrect format
- * Notes:
- *        1. the order of specifiers is arbitrary (may be: 5w3s or 3s5w)
- *        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)
-{
-        const char spec[] = "smhdw";
-        const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
-        unsigned long val = 0;
-        char *tail;
+                       if (!param->lsp_is_specific &&
+                           param->lsp_stripe_offset == -1) {
+                               char path[PATH_MAX] = "";
 
-        if (strpbrk(timestr, spec) == NULL) {
-                /* no specifiers inside the time string,
-                   should treat it as an integer value */
-                val = strtoul(timestr, &tail, 10);
-                return *tail ? ULONG_MAX : val;
-        }
+                               if (!lsb) {
+                                       lsb = malloc(sizeof(*lsb));
+                                       if (!lsb) {
+                                               result = -ENOMEM;
+                                               break;
+                                       }
+                               }
+                               lsb->sb_count = 0;
 
-        /* format string is XXwXXdXXhXXmXXs */
-        while (*timestr) {
-                unsigned long v;
-                int ind;
-                char* ptr;
+                               /* use mntdir for dirname() temporarily */
+                               strncpy(mntdir, dname, sizeof(mntdir));
+                               if (!realpath(dirname(mntdir), path)) {
+                                       result = -errno;
+                                       fprintf(stderr,
+                                               "error: invalid path '%s': %s\n",
+                                               argv[optind], strerror(errno));
+                                       break;
+                               }
+                               mntdir[0] = '\0';
 
-                v = strtoul(timestr, &tail, 10);
-                if (v == ULONG_MAX || *tail == '\0')
-                        /* value too large (ULONG_MAX or more)
-                           or missing specifier */
-                        goto error;
+                               result = llapi_search_mounts(path, 0, mntdir,
+                                                            NULL);
+                               if (result < 0 || mntdir[0] == '\0') {
+                                       fprintf(stderr,
+                                               "No suitable Lustre mount found\n");
+                                       break;
+                               }
 
-                ptr = strchr(spec, *tail);
-                if (ptr == NULL)
-                        /* unknown specifier */
-                        goto error;
+                               result = mntdf(mntdir, NULL, NULL, 0,
+                                              LL_STATFS_LMV, lsb);
+                               if (result < 0)
+                                       break;
 
-                ind = ptr - spec;
+                               if (param->lsp_stripe_count > lsb->sb_count) {
+                                       fprintf(stderr,
+                                               "error: stripe count %d is too big\n",
+                                               param->lsp_stripe_count);
+                                       result = -ERANGE;
+                                       break;
+                               }
 
-                /* check if product will overflow the type */
-                if (!(v < ULONG_MAX / mult[ind]))
-                        goto error;
+                               qsort(lsb->sb_buf, lsb->sb_count,
+                                     sizeof(struct ll_statfs_data),
+                                     ll_statfs_data_comp);
 
-                ADD_OVERFLOW(val, mult[ind] * v);
-                if (val == ULONG_MAX)
-                        goto error;
+                               auto_distributed = true;
+                       }
 
-                timestr = tail + 1;
-        }
+                       if (auto_distributed) {
+                               int r;
+                               int nr = MAX(param->lsp_stripe_count,
+                                            lsb->sb_count / 2);
+
+                               /* don't use server whose usage is above 90% */
+                               while (nr != param->lsp_stripe_count &&
+                                      obd_statfs_ratio(&lsb->sb_buf[nr].sd_st,
+                                                       false) > 90)
+                                       nr = MAX(param->lsp_stripe_count,
+                                                nr / 2);
+
+                               /* get \a r between [0, nr) */
+                               r = rand() % nr;
+
+                               param->lsp_stripe_offset =
+                                       lsb->sb_buf[r].sd_index;
+                               if (param->lsp_stripe_count > 1) {
+                                       int i = 0;
+
+                                       param->lsp_is_specific = true;
+                                       for (; i < param->lsp_stripe_count; i++)
+                                               param->lsp_tgts[(i + r) % nr] =
+                                                       lsb->sb_buf[i].sd_index;
+                               }
+                       }
 
-        return val;
+                       result = llapi_dir_create(dname, mode, param);
+               }
 
-error:
-        return ULONG_MAX;
-}
+               if (result) {
+                       fprintf(stderr,
+                               "%s setdirstripe: cannot create stripe dir '%s': %s\n",
+                               progname, dname, strerror(-result));
+                       break;
+               }
+               dname = argv[++optind];
+       } while (dname != NULL);
 
-#define ARG2ULL(nr, str, def_units)                                    \
-do {                                                                   \
-       unsigned long long limit, units = def_units;                    \
-       int rc;                                                         \
-                                                                       \
-       rc = llapi_parse_size(str, &limit, &units, 1);                  \
-       if (rc < 0) {                                                   \
-               fprintf(stderr, "%s: invalid limit '%s'\n",             \
-                       progname, str);                                 \
-               return CMD_HELP;                                        \
-       }                                                               \
-       nr = limit;                                                     \
-} while (0)
+       if (mode_opt != NULL)
+               umask(previous_mode);
 
-static inline int has_times_option(int argc, char **argv)
+       free(lsb);
+       free(param);
+       return result;
+}
+
+/* functions */
+static int lfs_rmentry(int argc, char **argv)
 {
-        int i;
+       char *dname;
+       int   index;
+       int   result = 0;
 
-        for (i = 1; i < argc; i++)
-                if (!strcmp(argv[i], "-t"))
-                        return 1;
+       if (argc <= 1) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
 
-        return 0;
+       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;
 }
 
-int lfs_setquota_times(int argc, char **argv)
+static int lfs_mv(int argc, char **argv)
 {
-        int c, rc;
-        struct if_quotactl qctl;
-        char *mnt, *obd_type = (char *)qctl.obd_type;
-        struct obd_dqblk *dqb = &qctl.qc_dqblk;
-        struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
-        struct option long_opts[] = {
-       { .val = 'b',   .name = "block-grace",  .has_arg = required_argument },
-       { .val = 'g',   .name = "group",        .has_arg = no_argument },
-       { .val = 'i',   .name = "inode-grace",  .has_arg = required_argument },
-       { .val = 'p',   .name = "projid",       .has_arg = no_argument },
-       { .val = 't',   .name = "times",        .has_arg = no_argument },
-       { .val = 'u',   .name = "user",         .has_arg = no_argument },
+       struct lmv_user_md lmu = { LMV_USER_MAGIC };
+       struct find_param param = {
+               .fp_max_depth = -1,
+               .fp_mdt_index = -1,
+       };
+       char *end;
+       int c;
+       int rc = 0;
+       struct option long_opts[] = {
+       { .val = 'm',   .name = "mdt",          .has_arg = required_argument },
+       { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
+       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
        { .name = NULL } };
-       int qtype;
-
-       memset(&qctl, 0, sizeof(qctl));
-       qctl.qc_cmd  = LUSTRE_Q_SETINFO;
-       qctl.qc_type = ALLQUOTA;
 
-       while ((c = getopt_long(argc, argv, "b:gi:ptu",
-                               long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "m:M:v", long_opts, NULL)) != -1) {
                switch (c) {
-               case 'u':
-                       qtype = USRQUOTA;
-                       goto quota_type;
-               case 'g':
-                       qtype = GRPQUOTA;
-                       goto quota_type;
-               case 'p':
-                       qtype = PRJQUOTA;
-quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
-                               fprintf(stderr, "error: -u/g/p can't be used "
-                                                "more than once\n");
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+               case 'M':
+                       fprintf(stderr, "warning: '-M' deprecated"
+                               ", use '--mdt-index' or '-m' instead\n");
+#endif
+               case 'm':
+                       lmu.lum_stripe_offset = strtoul(optarg, &end, 0);
+                       if (*end != '\0') {
+                               fprintf(stderr, "%s mv: bad MDT index '%s'\n",
+                                       progname, optarg);
                                return CMD_HELP;
                        }
-                       qctl.qc_type = qtype;
                        break;
-                case 'b':
-                        if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) {
-                                fprintf(stderr, "error: bad block-grace: %s\n",
-                                        optarg);
-                                return CMD_HELP;
-                        }
-                        dqb->dqb_valid |= QIF_BTIME;
-                        break;
-                case 'i':
-                        if ((dqi->dqi_igrace = str2sec(optarg)) == ULONG_MAX) {
-                                fprintf(stderr, "error: bad inode-grace: %s\n",
-                                        optarg);
-                                return CMD_HELP;
-                        }
-                        dqb->dqb_valid |= QIF_ITIME;
-                        break;
-                case 't': /* Yes, of course! */
-                        break;
-                default: /* getopt prints error message for us when opterr != 0 */
-                        return CMD_HELP;
-                }
-        }
+               case 'v':
+                       param.fp_verbose = VERBOSE_DETAIL;
+                       break;
+               default:
+                       fprintf(stderr, "%s mv: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
 
-       if (qctl.qc_type == ALLQUOTA) {
-               fprintf(stderr, "error: neither -u, -g nor -p specified\n");
-                return CMD_HELP;
-        }
+       if (lmu.lum_stripe_offset == -1) {
+               fprintf(stderr, "%s mv: MDT index must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
-        if (optind != argc - 1) {
-                fprintf(stderr, "error: unexpected parameters encountered\n");
-                return CMD_HELP;
-        }
+       if (optind >= argc) {
+               fprintf(stderr, "%s mv: DIR must be specified\n", progname);
+               return CMD_HELP;
+       }
 
-        mnt = argv[optind];
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc) {
-                if (*obd_type)
-                        fprintf(stderr, "%s %s ", obd_type,
-                                obd_uuid2str(&qctl.obd_uuid));
-                fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
-                return rc;
-        }
 
-        return 0;
+       /* initialize migrate mdt parameters */
+       param.fp_lmv_md = &lmu;
+       param.fp_migrate = 1;
+       rc = llapi_migrate_mdt(argv[optind], &param);
+       if (rc != 0)
+               fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n",
+                       progname, argv[optind], param.fp_mdt_index,
+                       strerror(-rc));
+       return rc;
 }
 
-#define BSLIMIT (1 << 0)
-#define BHLIMIT (1 << 1)
-#define ISLIMIT (1 << 2)
-#define IHLIMIT (1 << 3)
-
-int lfs_setquota(int argc, char **argv)
+static int lfs_osts(int argc, char **argv)
 {
-        int c, rc;
-        struct if_quotactl qctl;
-        char *mnt, *obd_type = (char *)qctl.obd_type;
-        struct obd_dqblk *dqb = &qctl.qc_dqblk;
-        struct option long_opts[] = {
-       { .val = 'b',   .name = "block-softlimit",
-                                               .has_arg = required_argument },
-       { .val = 'B',   .name = "block-hardlimit",
-                                               .has_arg = required_argument },
-       { .val = 'g',   .name = "group",        .has_arg = required_argument },
-       { .val = 'i',   .name = "inode-softlimit",
-                                               .has_arg = required_argument },
-       { .val = 'I',   .name = "inode-hardlimit",
-                                               .has_arg = required_argument },
-       { .val = 'p',   .name = "projid",       .has_arg = required_argument },
-       { .val = 'u',   .name = "user",         .has_arg = required_argument },
-       { .name = NULL } };
-        unsigned limit_mask = 0;
-        char *endptr;
-       int qtype;
+        return lfs_tgts(argc, argv);
+}
 
-       if (has_times_option(argc, argv))
-               return lfs_setquota_times(argc, argv);
+static int lfs_mdts(int argc, char **argv)
+{
+        return lfs_tgts(argc, argv);
+}
 
-       memset(&qctl, 0, sizeof(qctl));
-       qctl.qc_cmd  = LUSTRE_Q_SETQUOTA;
-       qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
-                                 * so it can be used as a marker that qc_type
-                                 * isn't reinitialized from command line */
+static int lfs_df(int argc, char **argv)
+{
+       char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
+       enum mntdf_flags flags = MNTDF_SHOW;
+       int ops = LL_STATFS_LMV | LL_STATFS_LOV;
+       int c, rc = 0, index = 0;
+       char fsname[PATH_MAX] = "", *pool_name = NULL;
+       struct option long_opts[] = {
+       { .val = 'h',   .name = "human-readable",
+                                               .has_arg = no_argument },
+       { .val = 'i',   .name = "inodes",       .has_arg = no_argument },
+       { .val = 'l',   .name = "lazy",         .has_arg = no_argument },
+       { .val = 'p',   .name = "pool",         .has_arg = required_argument },
+       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
+       { .name = NULL} };
 
-       while ((c = getopt_long(argc, argv, "b:B:g:i:I:p:u:",
-               long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) {
                switch (c) {
-               case 'u':
-                       qtype = USRQUOTA;
-                       rc = name2uid(&qctl.qc_id, optarg);
-                       goto quota_type;
-                case 'g':
-                       qtype = GRPQUOTA;
-                       rc = name2gid(&qctl.qc_id, optarg);
-                       goto quota_type;
-               case 'p':
-                       qtype = PRJQUOTA;
-                       rc = name2projid(&qctl.qc_id, optarg);
-quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
-                               fprintf(stderr,
-                                       "%s setquota: only one of -u, -g or -p may be specified\n",
-                                       progname);
-                               return CMD_HELP;
-                       }
-                       qctl.qc_type = qtype;
-                       if (rc) {
-                               qctl.qc_id = strtoul(optarg, &endptr, 10);
-                               if (*endptr != '\0') {
-                                       fprintf(stderr,
-                                               "%s setquota: invalid id '%s'\n",
-                                               progname, optarg);
-                                       return -1;
-                               }
-                       }
+               case 'h':
+                       flags |= MNTDF_COOKED;
                        break;
-               case 'b':
-                       ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
-                       dqb->dqb_bsoftlimit >>= 10;
-                       limit_mask |= BSLIMIT;
-                       if (dqb->dqb_bsoftlimit &&
-                           dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */
-                               fprintf(stderr,
-                                       "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\n"
-                                       "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_bsoftlimit,
-                                       progname);
+               case 'i':
+                       flags |= MNTDF_INODES;
                        break;
-               case 'B':
-                       ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024);
-                       dqb->dqb_bhardlimit >>= 10;
-                       limit_mask |= BHLIMIT;
-                       if (dqb->dqb_bhardlimit &&
-                           dqb->dqb_bhardlimit <= 1024) /* <= 1M? */
-                               fprintf(stderr,
-                                       "%s setquota: warning: block hardlimit '%llu' smaller than minimum qunit size\n"
-                                       "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_bhardlimit,
-                                       progname);
+               case 'l':
+                       flags |= MNTDF_LAZY;
                        break;
-               case 'i':
-                       ARG2ULL(dqb->dqb_isoftlimit, optarg, 1);
-                       limit_mask |= ISLIMIT;
-                       if (dqb->dqb_isoftlimit &&
-                           dqb->dqb_isoftlimit <= 1024) /* <= 1K inodes? */
-                               fprintf(stderr,
-                                       "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\n"
-                                       "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_isoftlimit,
-                                       progname);
+               case 'p':
+                       pool_name = optarg;
                        break;
-               case 'I':
-                       ARG2ULL(dqb->dqb_ihardlimit, optarg, 1);
-                       limit_mask |= IHLIMIT;
-                       if (dqb->dqb_ihardlimit &&
-                           dqb->dqb_ihardlimit <= 1024) /* <= 1K inodes? */
-                               fprintf(stderr,
-                                       "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\n"
-                                       "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_ihardlimit,
-                                       progname);
+               case 'v':
+                       flags |= MNTDF_VERBOSE;
                        break;
                default:
-                       fprintf(stderr,
-                               "%s setquota: unrecognized option '%s'\n",
-                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
-
-       if (qctl.qc_type == ALLQUOTA) {
-               fprintf(stderr,
-                       "%s setquota: either -u or -g must be specified\n",
-                       progname);
-               return CMD_HELP;
+       if (optind < argc && !realpath(argv[optind], path)) {
+               rc = -errno;
+               fprintf(stderr, "error: invalid path '%s': %s\n",
+                       argv[optind], strerror(-rc));
+               return rc;
        }
 
-       if (limit_mask == 0) {
-               fprintf(stderr,
-                       "%s setquota: at least one limit must be specified\n",
-                       progname);
-               return CMD_HELP;
-       }
+       while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+               /* Check if we have a mount point */
+               if (mntdir[0] == '\0')
+                       continue;
 
-       if (optind != argc - 1) {
-               fprintf(stderr,
-                       "%s setquota: filesystem not specified or unexpected argument '%s'\n",
-                       progname, argv[optind]);
-               return CMD_HELP;
+               rc = mntdf(mntdir, fsname, pool_name, flags, ops, NULL);
+               if (rc || path[0] != '\0')
+                       break;
+               fsname[0] = '\0'; /* avoid matching in next loop */
+               mntdir[0] = '\0'; /* avoid matching in next loop */
        }
 
-        mnt = argv[optind];
+       return rc;
+}
+
+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)];
 
-        if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) ||
-            (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) {
-                /* sigh, we can't just set blimits/ilimits */
-                struct if_quotactl tmp_qctl = {.qc_cmd  = LUSTRE_Q_GETQUOTA,
-                                               .qc_type = qctl.qc_type,
-                                               .qc_id   = qctl.qc_id};
+        while ((c = getopt(argc, argv, "h")) != -1)
+                return CMD_HELP;
 
-                rc = llapi_quotactl(mnt, &tmp_qctl);
-               if (rc < 0)
-                       return rc;
+        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;
+                        }
 
-                if (!(limit_mask & BHLIMIT))
-                        dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
-                if (!(limit_mask & BSLIMIT))
-                        dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit;
-                if (!(limit_mask & IHLIMIT))
-                        dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit;
-                if (!(limit_mask & ISLIMIT))
-                        dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit;
-
-                /* Keep grace times if we have got no softlimit arguments */
-                if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) {
-                        dqb->dqb_valid |= QIF_BTIME;
-                        dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime;
+                        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;
+                        }
 
-                if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) {
-                        dqb->dqb_valid |= QIF_ITIME;
-                        dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime;
+                        printf("%s %s\n", buf, argv[optind]);
                 }
         }
+        return rc;
+}
+
+static int lfs_check(int argc, char **argv)
+{
+       char mntdir[PATH_MAX] = {'\0'};
+       int num_types = 1;
+       char *obd_types[3];
+       char obd_type1[4];
+       char obd_type2[4];
+       char obd_type3[4];
+       int rc;
 
-        dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0;
-        dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0;
+       if (argc != 2) {
+               fprintf(stderr, "%s check: server type must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
-        rc = llapi_quotactl(mnt, &qctl);
-       if (rc) {
-               if (*obd_type)
-                       fprintf(stderr,
-                               "%s setquota: cannot quotactl '%s' '%s': %s",
-                               progname, obd_type,
-                               obd_uuid2str(&qctl.obd_uuid), strerror(-rc));
+       obd_types[0] = obd_type1;
+       obd_types[1] = obd_type2;
+       obd_types[2] = obd_type3;
+
+       if (strcmp(argv[1], "osts") == 0) {
+               strcpy(obd_types[0], "osc");
+       } else if (strcmp(argv[1], "mdts") == 0 ||
+                  strcmp(argv[1], "mds") == 0) {
+               strcpy(obd_types[0], "mdc");
+       } else if (strcmp(argv[1], "mgts") == 0) {
+               strcpy(obd_types[0], "mgc");
+       } else if (strcmp(argv[1], "all") == 0 ||
+                  strcmp(argv[1], "servers") == 0) {
+               num_types = 3;
+               strcpy(obd_types[0], "osc");
+               strcpy(obd_types[1], "mdc");
+               strcpy(obd_types[2], "mgc");
+       } else {
+               fprintf(stderr, "%s check: unrecognized option '%s'\n",
+                       progname, argv[1]);
+               return CMD_HELP;
+       }
+
+        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
+       if (rc < 0 || mntdir[0] == '\0') {
+               fprintf(stderr,
+                       "%s check: cannot find mounted Lustre filesystem: %s\n",
+                       progname, (rc < 0) ? strerror(-rc) : strerror(ENODEV));
                return rc;
        }
 
-       return 0;
+       rc = llapi_target_check(num_types, obd_types, mntdir);
+       if (rc)
+               fprintf(stderr, "%s check: cannot check target '%s': %s\n",
+                       progname, argv[1], strerror(-rc));
+
+       return rc;
+
 }
 
-/* Converts seconds value into format string
- * result is returned in buf
+#ifdef HAVE_SYS_QUOTA_H
+#define ARG2INT(nr, str, msg)                                           \
+do {                                                                    \
+       char *endp;                                                     \
+       nr = strtol(str, &endp, 0);                                     \
+       if (*endp != '\0') {                                            \
+               fprintf(stderr, "%s: bad %s '%s'\n",                    \
+                       progname, msg, str);                            \
+               return CMD_HELP;                                        \
+       }                                                               \
+} while (0)
+
+#define ADD_OVERFLOW(a,b) ((a + b) < a) ? (a = ULONG_MAX) : (a = a + b)
+
+/* Convert format time string "XXwXXdXXhXXmXXs" into seconds value
+ * returns the value or ULONG_MAX on integer overflow or incorrect format
  * Notes:
- *        1. result is in descenting order: 1w2d3h4m5s
- *        2. zero fields are not filled (except for p. 3): 5d1s
- *        3. zero seconds value is presented as "0s"
+ *        1. the order of specifiers is arbitrary (may be: 5w3s or 3s5w)
+ *        2. specifiers may be encountered multiple times (2s3s is 5 seconds)
+ *        3. empty integer value is interpreted as 0
  */
-static char * __sec2str(time_t seconds, char *buf)
+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 c;
-        char *tail = buf;
-        int i;
-
-        for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) {
-                c = seconds / mult[i];
-
-                if (c > 0 || (i == 0 && buf == tail))
-                        tail += snprintf(tail, 40-(tail-buf), "%lu%c", c, spec[i]);
+        unsigned long val = 0;
+        char *tail;
 
-                seconds %= mult[i];
+        if (strpbrk(timestr, spec) == NULL) {
+                /* no specifiers inside the time string,
+                   should treat it as an integer value */
+                val = strtoul(timestr, &tail, 10);
+                return *tail ? ULONG_MAX : val;
         }
 
-        return tail;
-}
-
-static void sec2str(time_t seconds, char *buf, int rc)
-{
-        char *tail = buf;
+        /* format string is XXwXXdXXhXXmXXs */
+        while (*timestr) {
+                unsigned long v;
+                int ind;
+                char* ptr;
 
-        if (rc)
-                *tail++ = '[';
+                v = strtoul(timestr, &tail, 10);
+                if (v == ULONG_MAX || *tail == '\0')
+                        /* value too large (ULONG_MAX or more)
+                           or missing specifier */
+                        goto error;
 
-        tail = __sec2str(seconds, tail);
+                ptr = strchr(spec, *tail);
+                if (ptr == NULL)
+                        /* unknown specifier */
+                        goto error;
 
-        if (rc && tail - buf < 39) {
-                *tail++ = ']';
-                *tail++ = 0;
-        }
-}
+                ind = ptr - spec;
 
-static void diff2str(time_t seconds, char *buf, time_t now)
-{
+                /* check if product will overflow the type */
+                if (!(v < ULONG_MAX / mult[ind]))
+                        goto error;
 
-        buf[0] = 0;
-        if (!seconds)
-                return;
-        if (seconds <= now) {
-                strcpy(buf, "none");
-                return;
+                ADD_OVERFLOW(val, mult[ind] * v);
+                if (val == ULONG_MAX)
+                        goto error;
+
+                timestr = tail + 1;
         }
-        __sec2str(seconds - now, buf);
-}
 
-static void print_quota_title(char *name, struct if_quotactl *qctl,
-                             bool human_readable)
-{
-       printf("Disk quotas for %s %s (%cid %u):\n",
-              qtype_name(qctl->qc_type), name,
-              *qtype_name(qctl->qc_type), qctl->qc_id);
-       printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
-              "Filesystem", human_readable ? "used" : "kbytes",
-              "quota", "limit", "grace",
-              "files", "quota", "limit", "grace");
+        return val;
+
+error:
+        return ULONG_MAX;
 }
 
-static void kbytes2str(__u64 num, char *buf, int buflen, bool h)
+#define ARG2ULL(nr, str, def_units)                                    \
+do {                                                                   \
+       unsigned long long limit, units = def_units;                    \
+       int rc;                                                         \
+                                                                       \
+       rc = llapi_parse_size(str, &limit, &units, 1);                  \
+       if (rc < 0) {                                                   \
+               fprintf(stderr, "%s: invalid limit '%s'\n",             \
+                       progname, str);                                 \
+               return CMD_HELP;                                        \
+       }                                                               \
+       nr = limit;                                                     \
+} while (0)
+
+static inline int has_times_option(int argc, char **argv)
 {
-       if (!h) {
-               snprintf(buf, buflen, "%ju", (uintmax_t)num);
-       } else {
-               if (num >> 40)
-                       snprintf(buf, buflen, "%5.4gP",
-                                (double)num / ((__u64)1 << 40));
-               else if (num >> 30)
-                       snprintf(buf, buflen, "%5.4gT",
-                                (double)num / (1 << 30));
-               else if (num >> 20)
-                       snprintf(buf, buflen, "%5.4gG",
-                                (double)num / (1 << 20));
-               else if (num >> 10)
-                       snprintf(buf, buflen, "%5.4gM",
-                                (double)num / (1 << 10));
-               else
-                       snprintf(buf, buflen, "%ju%s", (uintmax_t)num, "k");
-       }
+        int i;
+
+        for (i = 1; i < argc; i++)
+                if (!strcmp(argv[i], "-t"))
+                        return 1;
+
+        return 0;
 }
 
-#define STRBUF_LEN     32
-static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
-                       int rc, bool h)
+int lfs_setquota_times(int argc, char **argv)
 {
-        time_t now;
-
-        time(&now);
+        int c, rc;
+        struct if_quotactl qctl;
+        char *mnt, *obd_type = (char *)qctl.obd_type;
+        struct obd_dqblk *dqb = &qctl.qc_dqblk;
+        struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
+        struct option long_opts[] = {
+       { .val = 'b',   .name = "block-grace",  .has_arg = required_argument },
+       { .val = 'g',   .name = "group",        .has_arg = no_argument },
+       { .val = 'i',   .name = "inode-grace",  .has_arg = required_argument },
+       { .val = 'p',   .name = "projid",       .has_arg = no_argument },
+       { .val = 't',   .name = "times",        .has_arg = no_argument },
+       { .val = 'u',   .name = "user",         .has_arg = no_argument },
+       { .name = NULL } };
+       int qtype;
 
-        if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) {
-               int bover = 0, iover = 0;
-               struct obd_dqblk *dqb = &qctl->qc_dqblk;
-               char numbuf[3][STRBUF_LEN];
-               char timebuf[40];
-               char strbuf[STRBUF_LEN];
+       memset(&qctl, 0, sizeof(qctl));
+       qctl.qc_cmd  = LUSTRE_Q_SETINFO;
+       qctl.qc_type = ALLQUOTA;
 
-                if (dqb->dqb_bhardlimit &&
-                   lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
-                        bover = 1;
-                } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
-                        if (dqb->dqb_btime > now) {
-                                bover = 2;
-                        } else {
-                                bover = 3;
+       while ((c = getopt_long(argc, argv, "b:gi:ptu",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'u':
+                       qtype = USRQUOTA;
+                       goto quota_type;
+               case 'g':
+                       qtype = GRPQUOTA;
+                       goto quota_type;
+               case 'p':
+                       qtype = PRJQUOTA;
+quota_type:
+                       if (qctl.qc_type != ALLQUOTA) {
+                               fprintf(stderr, "error: -u/g/p can't be used "
+                                                "more than once\n");
+                               return CMD_HELP;
+                       }
+                       qctl.qc_type = qtype;
+                       break;
+                case 'b':
+                        if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) {
+                                fprintf(stderr, "error: bad block-grace: %s\n",
+                                        optarg);
+                                return CMD_HELP;
+                        }
+                        dqb->dqb_valid |= QIF_BTIME;
+                        break;
+                case 'i':
+                        if ((dqi->dqi_igrace = str2sec(optarg)) == ULONG_MAX) {
+                                fprintf(stderr, "error: bad inode-grace: %s\n",
+                                        optarg);
+                                return CMD_HELP;
                         }
+                        dqb->dqb_valid |= QIF_ITIME;
+                        break;
+                case 't': /* Yes, of course! */
+                        break;
+                default: /* getopt prints error message for us when opterr != 0 */
+                        return CMD_HELP;
                 }
+        }
 
-                if (dqb->dqb_ihardlimit &&
-                    dqb->dqb_curinodes >= dqb->dqb_ihardlimit) {
-                        iover = 1;
-                } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) {
-                       if (dqb->dqb_itime > now) {
-                               iover = 2;
-                       } else {
-                               iover = 3;
-                       }
-                }
+       if (qctl.qc_type == ALLQUOTA) {
+               fprintf(stderr, "error: neither -u, -g nor -p specified\n");
+                return CMD_HELP;
+        }
 
+        if (optind != argc - 1) {
+                fprintf(stderr, "error: unexpected parameters encountered\n");
+                return CMD_HELP;
+        }
 
-               if (strlen(mnt) > 15)
-                       printf("%s\n%15s", mnt, "");
-               else
-                       printf("%15s", mnt);
+       if ((dqb->dqb_valid | QIF_BTIME && dqi->dqi_bgrace >= UINT_MAX) ||
+           (dqb->dqb_valid | QIF_ITIME && dqi->dqi_igrace >= UINT_MAX)) {
+               fprintf(stderr, "error: grace time is too large\n");
+               return CMD_HELP;
+       }
 
-               if (bover)
-                       diff2str(dqb->dqb_btime, timebuf, now);
+        mnt = argv[optind];
+        rc = llapi_quotactl(mnt, &qctl);
+        if (rc) {
+                if (*obd_type)
+                        fprintf(stderr, "%s %s ", obd_type,
+                                obd_uuid2str(&qctl.obd_uuid));
+                fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
+                return rc;
+        }
 
-               kbytes2str(lustre_stoqb(dqb->dqb_curspace),
-                          strbuf, sizeof(strbuf), h);
-               if (rc == -EREMOTEIO)
-                       sprintf(numbuf[0], "%s*", strbuf);
-               else
-                       sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ?
-                               "%s" : "[%s]", strbuf);
+        return 0;
+}
 
-               kbytes2str(dqb->dqb_bsoftlimit, strbuf, sizeof(strbuf), h);
-               if (type == QC_GENERAL)
-                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ?
-                               "%s" : "[%s]", strbuf);
-               else
-                       sprintf(numbuf[1], "%s", "-");
+#define BSLIMIT (1 << 0)
+#define BHLIMIT (1 << 1)
+#define ISLIMIT (1 << 2)
+#define IHLIMIT (1 << 3)
 
-               kbytes2str(dqb->dqb_bhardlimit, strbuf, sizeof(strbuf), h);
-               sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ?
-                       "%s" : "[%s]", strbuf);
+int lfs_setquota(int argc, char **argv)
+{
+       int c, rc = 0;
+       struct if_quotactl qctl;
+       char *mnt, *obd_type = (char *)qctl.obd_type;
+       struct obd_dqblk *dqb = &qctl.qc_dqblk;
+       struct option long_opts[] = {
+       { .val = 'b',   .name = "block-softlimit",
+                                               .has_arg = required_argument },
+       { .val = 'B',   .name = "block-hardlimit",
+                                               .has_arg = required_argument },
+       { .val = 'd',   .name = "default",      .has_arg = no_argument },
+       { .val = 'g',   .name = "group",        .has_arg = required_argument },
+       { .val = 'G',   .name = "default-grp",  .has_arg = no_argument },
+       { .val = 'i',   .name = "inode-softlimit",
+                                               .has_arg = required_argument },
+       { .val = 'I',   .name = "inode-hardlimit",
+                                               .has_arg = required_argument },
+       { .val = 'p',   .name = "projid",       .has_arg = required_argument },
+       { .val = 'P',   .name = "default-prj",  .has_arg = no_argument },
+       { .val = 'u',   .name = "user",         .has_arg = required_argument },
+       { .val = 'U',   .name = "default-usr",  .has_arg = no_argument },
+       { .name = NULL } };
+       unsigned limit_mask = 0;
+       char *endptr;
+       bool use_default = false;
+       int qtype;
+
+       if (has_times_option(argc, argv))
+               return lfs_setquota_times(argc, argv);
 
-               printf(" %7s%c %6s %7s %7s",
-                      numbuf[0], bover ? '*' : ' ', numbuf[1],
-                      numbuf[2], bover > 1 ? timebuf : "-");
+       memset(&qctl, 0, sizeof(qctl));
+       qctl.qc_cmd  = LUSTRE_Q_SETQUOTA;
+       qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
+                                 * so it can be used as a marker that qc_type
+                                 * isn't reinitialized from command line */
+
+       while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U",
+               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'U':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = USRQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
+               case 'u':
+                       qtype = USRQUOTA;
+                       rc = name2uid(&qctl.qc_id, optarg);
+                       goto quota_type;
+               case 'G':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = GRPQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
+                case 'g':
+                       qtype = GRPQUOTA;
+                       rc = name2gid(&qctl.qc_id, optarg);
+                       goto quota_type;
+               case 'P':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = PRJQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
+               case 'p':
+                       qtype = PRJQUOTA;
+                       rc = name2projid(&qctl.qc_id, optarg);
+quota_type:
+                       if (rc) {
+                               qctl.qc_id = strtoul(optarg, &endptr, 10);
+                               if (*endptr != '\0') {
+                                       fprintf(stderr, "%s setquota: invalid"
+                                               " id '%s'\n", progname, optarg);
+                                       return -1;
+                               }
+                       }
+
+                       if (qctl.qc_id == 0) {
+                               fprintf(stderr, "%s setquota: can't set quota"
+                                       " for root usr/group/project.\n",
+                                       progname);
+                               return -1;
+                       }
+
+quota_type_def:
+                       if (qctl.qc_type != ALLQUOTA) {
+                               fprintf(stderr,
+                                       "%s setquota: only one of -u, -U, -g,"
+                                       " -G, -p or -P may be specified\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+                       qctl.qc_type = qtype;
+                       break;
+               case 'd':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       use_default = true;
+                       break;
+               case 'b':
+                       ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
+                       dqb->dqb_bsoftlimit >>= 10;
+                       limit_mask |= BSLIMIT;
+                       if (dqb->dqb_bsoftlimit &&
+                           dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */
+                               fprintf(stderr,
+                                       "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\n"
+                                       "See '%s help setquota' or Lustre manual for details\n",
+                                       progname, dqb->dqb_bsoftlimit,
+                                       progname);
+                       break;
+               case 'B':
+                       ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024);
+                       dqb->dqb_bhardlimit >>= 10;
+                       limit_mask |= BHLIMIT;
+                       if (dqb->dqb_bhardlimit &&
+                           dqb->dqb_bhardlimit <= 1024) /* <= 1M? */
+                               fprintf(stderr,
+                                       "%s setquota: warning: block hardlimit '%llu' smaller than minimum qunit size\n"
+                                       "See '%s help setquota' or Lustre manual for details\n",
+                                       progname, dqb->dqb_bhardlimit,
+                                       progname);
+                       break;
+               case 'i':
+                       ARG2ULL(dqb->dqb_isoftlimit, optarg, 1);
+                       limit_mask |= ISLIMIT;
+                       if (dqb->dqb_isoftlimit &&
+                           dqb->dqb_isoftlimit <= 1024) /* <= 1K inodes? */
+                               fprintf(stderr,
+                                       "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\n"
+                                       "See '%s help setquota' or Lustre manual for details\n",
+                                       progname, dqb->dqb_isoftlimit,
+                                       progname);
+                       break;
+               case 'I':
+                       ARG2ULL(dqb->dqb_ihardlimit, optarg, 1);
+                       limit_mask |= IHLIMIT;
+                       if (dqb->dqb_ihardlimit &&
+                           dqb->dqb_ihardlimit <= 1024) /* <= 1K inodes? */
+                               fprintf(stderr,
+                                       "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\n"
+                                       "See '%s help setquota' or Lustre manual for details\n",
+                                       progname, dqb->dqb_ihardlimit,
+                                       progname);
+                       break;
+               default:
+                       fprintf(stderr,
+                               "%s setquota: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (qctl.qc_type == ALLQUOTA) {
+               fprintf(stderr,
+                       "%s setquota: either -u or -g must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       if (!use_default && limit_mask == 0) {
+               fprintf(stderr,
+                       "%s setquota: at least one limit must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       if (use_default && limit_mask != 0) {
+               fprintf(stderr,
+                       "%s setquota: limits should not be specified when"
+                       " using default quota\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       if (use_default && qctl.qc_id == 0) {
+               fprintf(stderr,
+                       "%s setquota: can not set default quota for root"
+                       " user/group/project\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       if (optind != argc - 1) {
+               fprintf(stderr,
+                       "%s setquota: filesystem not specified or unexpected argument '%s'\n",
+                       progname, argv[optind]);
+               return CMD_HELP;
+       }
+
+        mnt = argv[optind];
+
+       if (use_default) {
+               dqb->dqb_bhardlimit = 0;
+               dqb->dqb_bsoftlimit = 0;
+               dqb->dqb_ihardlimit = 0;
+               dqb->dqb_isoftlimit = 0;
+               dqb->dqb_itime = 0;
+               dqb->dqb_btime = 0;
+               dqb->dqb_valid |= QIF_LIMITS | QIF_TIMES;
+       } else if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) ||
+                  (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) {
+               /* sigh, we can't just set blimits/ilimits */
+               struct if_quotactl tmp_qctl = {.qc_cmd  = LUSTRE_Q_GETQUOTA,
+                                              .qc_type = qctl.qc_type,
+                                              .qc_id   = qctl.qc_id};
+
+               rc = llapi_quotactl(mnt, &tmp_qctl);
+               if (rc < 0)
+                       return rc;
+
+               if (!(limit_mask & BHLIMIT))
+                       dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
+               if (!(limit_mask & BSLIMIT))
+                       dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit;
+               if (!(limit_mask & IHLIMIT))
+                       dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit;
+               if (!(limit_mask & ISLIMIT))
+                       dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit;
+
+               /* Keep grace times if we have got no softlimit arguments */
+               if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) {
+                       dqb->dqb_valid |= QIF_BTIME;
+                       dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime;
+               }
+
+               if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) {
+                       dqb->dqb_valid |= QIF_ITIME;
+                       dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime;
+               }
+       }
+
+       dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0;
+       dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0;
+
+       rc = llapi_quotactl(mnt, &qctl);
+       if (rc) {
+               if (*obd_type)
+                       fprintf(stderr,
+                               "%s setquota: cannot quotactl '%s' '%s': %s",
+                               progname, obd_type,
+                               obd_uuid2str(&qctl.obd_uuid), strerror(-rc));
+               return rc;
+       }
+
+       return 0;
+}
+
+/* Converts seconds value into format string
+ * result is returned in buf
+ * Notes:
+ *        1. result is in descenting order: 1w2d3h4m5s
+ *        2. zero fields are not filled (except for p. 3): 5d1s
+ *        3. zero seconds value is presented as "0s"
+ */
+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;
+        char *tail = buf;
+        int i;
+
+        for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) {
+                c = seconds / mult[i];
+
+                if (c > 0 || (i == 0 && buf == tail))
+                        tail += snprintf(tail, 40-(tail-buf), "%lu%c", c, spec[i]);
+
+                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)
+{
+
+        buf[0] = 0;
+        if (!seconds)
+                return;
+        if (seconds <= now) {
+                strcpy(buf, "none");
+                return;
+        }
+        __sec2str(seconds - now, buf);
+}
+
+static void print_quota_title(char *name, struct if_quotactl *qctl,
+                             bool human_readable, bool show_default)
+{
+       if (show_default) {
+               printf("Disk default %s quota:\n", qtype_name(qctl->qc_type));
+               printf("%15s %8s%8s%8s %8s%8s%8s\n",
+                      "Filesystem", "bquota", "blimit", "bgrace",
+                      "iquota", "ilimit", "igrace");
+       } else {
+               printf("Disk quotas for %s %s (%cid %u):\n",
+                      qtype_name(qctl->qc_type), name,
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+               printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
+                      "Filesystem", human_readable ? "used" : "kbytes",
+                      "quota", "limit", "grace",
+                      "files", "quota", "limit", "grace");
+       }
+}
+
+static void kbytes2str(__u64 num, char *buf, int buflen, bool h)
+{
+       if (!h) {
+               snprintf(buf, buflen, "%ju", (uintmax_t)num);
+       } else {
+               if (num >> 40)
+                       snprintf(buf, buflen, "%5.4gP",
+                                (double)num / ((__u64)1 << 40));
+               else if (num >> 30)
+                       snprintf(buf, buflen, "%5.4gT",
+                                (double)num / (1 << 30));
+               else if (num >> 20)
+                       snprintf(buf, buflen, "%5.4gG",
+                                (double)num / (1 << 20));
+               else if (num >> 10)
+                       snprintf(buf, buflen, "%5.4gM",
+                                (double)num / (1 << 10));
+               else
+                       snprintf(buf, buflen, "%ju%s", (uintmax_t)num, "k");
+       }
+}
+
+#define STRBUF_LEN     32
+static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
+                       int rc, bool h, bool show_default)
+{
+       time_t now;
+
+       time(&now);
+
+       if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA ||
+           qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) {
+               int bover = 0, iover = 0;
+               struct obd_dqblk *dqb = &qctl->qc_dqblk;
+               char numbuf[3][STRBUF_LEN];
+               char timebuf[40];
+               char strbuf[STRBUF_LEN];
+
+               if (dqb->dqb_bhardlimit &&
+                   lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
+                        bover = 1;
+                } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
+                        if (dqb->dqb_btime > now) {
+                                bover = 2;
+                        } else {
+                                bover = 3;
+                        }
+                }
+
+                if (dqb->dqb_ihardlimit &&
+                    dqb->dqb_curinodes >= dqb->dqb_ihardlimit) {
+                        iover = 1;
+                } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) {
+                       if (dqb->dqb_itime > now) {
+                               iover = 2;
+                       } else {
+                               iover = 3;
+                       }
+                }
+
+
+               if (strlen(mnt) > 15)
+                       printf("%s\n%15s", mnt, "");
+               else
+                       printf("%15s", mnt);
+
+               if (bover)
+                       diff2str(dqb->dqb_btime, timebuf, now);
+               else if (show_default)
+                       snprintf(timebuf, sizeof(timebuf), "%llu",
+                                dqb->dqb_btime);
+
+               kbytes2str(lustre_stoqb(dqb->dqb_curspace),
+                          strbuf, sizeof(strbuf), h);
+               if (rc == -EREMOTEIO)
+                       sprintf(numbuf[0], "%s*", strbuf);
+               else
+                       sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ?
+                               "%s" : "[%s]", strbuf);
+
+               kbytes2str(dqb->dqb_bsoftlimit, strbuf, sizeof(strbuf), h);
+               if (type == QC_GENERAL)
+                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ?
+                               "%s" : "[%s]", strbuf);
+               else
+                       sprintf(numbuf[1], "%s", "-");
+
+               kbytes2str(dqb->dqb_bhardlimit, strbuf, sizeof(strbuf), h);
+               sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ?
+                       "%s" : "[%s]", strbuf);
+
+               if (show_default)
+                       printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf);
+               else
+                       printf(" %7s%c %6s %7s %7s",
+                              numbuf[0], bover ? '*' : ' ', numbuf[1],
+                              numbuf[2], bover > 1 ? timebuf : "-");
+
+
+               if (iover)
+                       diff2str(dqb->dqb_itime, timebuf, now);
+               else if (show_default)
+                       snprintf(timebuf, sizeof(timebuf), "%llu",
+                                dqb->dqb_itime);
+
+               snprintf(numbuf[0], sizeof(numbuf),
+                        (dqb->dqb_valid & QIF_INODES) ? "%ju" : "[%ju]",
+                        (uintmax_t)dqb->dqb_curinodes);
+
+               if (type == QC_GENERAL)
+                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ?
+                               "%ju" : "[%ju]",
+                               (uintmax_t)dqb->dqb_isoftlimit);
+               else
+                       sprintf(numbuf[1], "%s", "-");
+
+               sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
+                       "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit);
+
+               if (show_default)
+                       printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf);
+               else if (type != QC_OSTIDX)
+                       printf(" %7s%c %6s %7s %7s",
+                              numbuf[0], iover ? '*' : ' ', numbuf[1],
+                              numbuf[2], iover > 1 ? timebuf : "-");
+               else
+                       printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
+               printf("\n");
+
+        } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
+                   qctl->qc_cmd == Q_GETOINFO) {
+                char bgtimebuf[40];
+                char igtimebuf[40];
+
+                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);
+        }
+}
+
+static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
+                          bool h, __u64 *total)
+{
+        int rc = 0, rc1 = 0, count = 0;
+        __u32 valid = qctl->qc_valid;
+
+        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(-rc));
+                return rc;
+        }
+
+        for (qctl->qc_idx = 0; qctl->qc_idx < count; qctl->qc_idx++) {
+                qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX;
+                rc = llapi_quotactl(mnt, qctl);
+                if (rc) {
+                       /* It is remote client case. */
+                       if (rc == -EOPNOTSUPP) {
+                                rc = 0;
+                                goto out;
+                        }
+
+                        if (!rc1)
+                                rc1 = rc;
+                        fprintf(stderr, "quotactl %s%d failed.\n",
+                                is_mdt ? "mdt": "ost", qctl->qc_idx);
+                        continue;
+                }
+
+               print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
+                           qctl->qc_valid, 0, h, false);
+               *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
+                                  qctl->qc_dqblk.dqb_bhardlimit;
+       }
+out:
+       qctl->qc_valid = valid;
+       return rc ? : rc1;
+}
+
+static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
+                          int verbose, int quiet, bool human_readable,
+                          bool show_default)
+{
+       int rc1 = 0, rc2 = 0, rc3 = 0;
+       char *obd_type = (char *)qctl->obd_type;
+       char *obd_uuid = (char *)qctl->obd_uuid.uuid;
+       __u64 total_ialloc = 0, total_balloc = 0;
+       bool use_default_for_blk = false;
+       bool use_default_for_file = false;
+       int inacc;
+
+       rc1 = llapi_quotactl(mnt, qctl);
+       if (rc1 < 0) {
+               switch (rc1) {
+               case -ESRCH:
+                       fprintf(stderr, "%s quotas are not enabled.\n",
+                               qtype_name(qctl->qc_type));
+                       goto out;
+               case -EPERM:
+                       fprintf(stderr, "Permission denied.\n");
+               case -ENODEV:
+               case -ENOENT:
+                       /* We already got error message. */
+                       goto out;
+               default:
+                       fprintf(stderr, "Unexpected quotactl error: %s\n",
+                               strerror(-rc1));
+               }
+       }
+
+       if (!show_default && qctl->qc_id == 0) {
+               qctl->qc_dqblk.dqb_bhardlimit = 0;
+               qctl->qc_dqblk.dqb_bsoftlimit = 0;
+               qctl->qc_dqblk.dqb_ihardlimit = 0;
+               qctl->qc_dqblk.dqb_isoftlimit = 0;
+               qctl->qc_dqblk.dqb_btime = 0;
+               qctl->qc_dqblk.dqb_itime = 0;
+               qctl->qc_dqblk.dqb_valid |= QIF_LIMITS | QIF_TIMES;
+       }
+
+       if (qctl->qc_dqblk.dqb_valid & QIF_BTIME &&
+           LQUOTA_FLAG(qctl->qc_dqblk.dqb_btime) & LQUOTA_FLAG_DEFAULT) {
+               use_default_for_blk = true;
+               qctl->qc_dqblk.dqb_btime &= LQUOTA_GRACE_MASK;
+       }
+
+       if (qctl->qc_dqblk.dqb_valid & QIF_ITIME &&
+           LQUOTA_FLAG(qctl->qc_dqblk.dqb_itime) & LQUOTA_FLAG_DEFAULT) {
+               use_default_for_file = true;
+               qctl->qc_dqblk.dqb_itime &= LQUOTA_GRACE_MASK;
+       }
+
+       if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+            qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet)
+               print_quota_title(name, qctl, human_readable, show_default);
+
+       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, human_readable, show_default);
+
+       if (!show_default && verbose &&
+           qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) {
+               char strbuf[STRBUF_LEN];
+
+               rc2 = print_obd_quota(mnt, qctl, 1, human_readable,
+                                     &total_ialloc);
+               rc3 = print_obd_quota(mnt, qctl, 0, human_readable,
+                                     &total_balloc);
+               kbytes2str(total_balloc, strbuf, sizeof(strbuf),
+                          human_readable);
+               printf("Total allocated inode limit: %ju, total "
+                      "allocated block limit: %s\n", (uintmax_t)total_ialloc,
+                      strbuf);
+       }
+
+       if (use_default_for_blk)
+               printf("%cid %u is using default block quota setting\n",
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+
+       if (use_default_for_file)
+               printf("%cid %u is using default file quota setting\n",
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+
+       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");
+out:
+       return rc1;
+
+}
+
+static int lfs_project(int argc, char **argv)
+{
+       int ret = 0, err = 0, c, i;
+       struct project_handle_control phc = { 0 };
+       enum lfs_project_ops_t op;
+
+       phc.newline = true;
+       phc.assign_projid = false;
+       /* default action */
+       op = LFS_PROJECT_LIST;
+
+       while ((c = getopt(argc, argv, "p:cCsdkr0")) != -1) {
+               switch (c) {
+               case 'c':
+                       if (op != LFS_PROJECT_LIST) {
+                               fprintf(stderr,
+                                       "%s: cannot specify '-c' '-C' '-s' together\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+
+                       op = LFS_PROJECT_CHECK;
+                       break;
+               case 'C':
+                       if (op != LFS_PROJECT_LIST) {
+                               fprintf(stderr,
+                                       "%s: cannot specify '-c' '-C' '-s' together\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+
+                       op = LFS_PROJECT_CLEAR;
+                       break;
+               case 's':
+                       if (op != LFS_PROJECT_LIST) {
+                               fprintf(stderr,
+                                       "%s: cannot specify '-c' '-C' '-s' together\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+
+                       phc.set_inherit = true;
+                       op = LFS_PROJECT_SET;
+                       break;
+               case 'd':
+                       phc.dironly = true;
+                       break;
+               case 'k':
+                       phc.keep_projid = true;
+                       break;
+               case 'r':
+                       phc.recursive = true;
+                       break;
+               case 'p':
+                       phc.projid = strtoul(optarg, NULL, 0);
+                       phc.assign_projid = true;
+
+                       break;
+               case '0':
+                       phc.newline = false;
+                       break;
+               default:
+                       fprintf(stderr, "%s: invalid option '%c'\n",
+                               progname, optopt);
+                       return CMD_HELP;
+               }
+       }
+
+       if (phc.assign_projid && op == LFS_PROJECT_LIST) {
+               op = LFS_PROJECT_SET;
+               phc.set_projid = true;
+       } else if (phc.assign_projid && op == LFS_PROJECT_SET) {
+               phc.set_projid = true;
+       }
+
+       switch (op) {
+       case LFS_PROJECT_CHECK:
+               if (phc.keep_projid) {
+                       fprintf(stderr,
+                               "%s: '-k' is useless together with '-c'\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               break;
+       case LFS_PROJECT_CLEAR:
+               if (!phc.newline) {
+                       fprintf(stderr,
+                               "%s: '-0' is useless together with '-C'\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               if (phc.assign_projid) {
+                       fprintf(stderr,
+                               "%s: '-p' is useless together with '-C'\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               break;
+       case LFS_PROJECT_SET:
+               if (!phc.newline) {
+                       fprintf(stderr,
+                               "%s: '-0' is useless together with '-s'\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               if (phc.keep_projid) {
+                       fprintf(stderr,
+                               "%s: '-k' is useless together with '-s'\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               break;
+       default:
+               if (!phc.newline) {
+                       fprintf(stderr,
+                               "%s: '-0' is useless for list operations\n",
+                               progname);
+                       return CMD_HELP;
+               }
+               break;
+       }
+
+       argv += optind;
+       argc -= optind;
+       if (argc == 0) {
+               fprintf(stderr, "%s: missing file or directory target(s)\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       for (i = 0; i < argc; i++) {
+               switch (op) {
+               case LFS_PROJECT_CHECK:
+                       err = lfs_project_check(argv[i], &phc);
+                       break;
+               case LFS_PROJECT_LIST:
+                       err = lfs_project_list(argv[i], &phc);
+                       break;
+               case LFS_PROJECT_CLEAR:
+                       err = lfs_project_clear(argv[i], &phc);
+                       break;
+               case LFS_PROJECT_SET:
+                       err = lfs_project_set(argv[i], &phc);
+                       break;
+               default:
+                       break;
+               }
+               if (err && !ret)
+                       ret = err;
+       }
+
+       return ret;
+}
+
+static int lfs_quota(int argc, char **argv)
+{
+       int c;
+       char *mnt, *name = NULL;
+       struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
+                                   .qc_type = ALLQUOTA };
+       char *obd_uuid = (char *)qctl.obd_uuid.uuid;
+       int rc = 0, rc1 = 0, verbose = 0, quiet = 0;
+       char *endptr;
+       __u32 valid = QC_GENERAL, idx = 0;
+       bool human_readable = false;
+       bool show_default = false;
+       int qtype;
+
+       while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) {
+               switch (c) {
+               case 'U':
+                       show_default = true;
+               case 'u':
+                       qtype = USRQUOTA;
+                       goto quota_type;
+               case 'G':
+                       show_default = true;
+               case 'g':
+                       qtype = GRPQUOTA;
+                       goto quota_type;
+               case 'P':
+                       show_default = true;
+               case 'p':
+                       qtype = PRJQUOTA;
+quota_type:
+                       if (qctl.qc_type != ALLQUOTA) {
+                               fprintf(stderr,
+                                       "%s quota: only one of -u, -g, or -p may be specified\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+                       qctl.qc_type = qtype;
+                       break;
+                case 't':
+                        qctl.qc_cmd = LUSTRE_Q_GETINFO;
+                        break;
+                case 'o':
+                        valid = qctl.qc_valid = QC_UUID;
+                       snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg);
+                        break;
+               case 'i':
+                       valid = qctl.qc_valid = QC_MDTIDX;
+                       idx = qctl.qc_idx = atoi(optarg);
+                       if (idx == 0 && *optarg != '0') {
+                               fprintf(stderr,
+                                       "%s quota: invalid MDT index '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'I':
+                       valid = qctl.qc_valid = QC_OSTIDX;
+                       idx = qctl.qc_idx = atoi(optarg);
+                       if (idx == 0 && *optarg != '0') {
+                               fprintf(stderr,
+                                       "%s quota: invalid OST index '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+                case 'v':
+                        verbose = 1;
+                        break;
+                case 'q':
+                        quiet = 1;
+                        break;
+               case 'h':
+                       human_readable = true;
+                       break;
+               default:
+                       fprintf(stderr, "%s quota: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+        /* current uid/gid info for "lfs quota /path/to/lustre/mount" */
+       if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
+           optind == argc - 1 && !show_default) {
+
+               qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
+               qctl.qc_valid = valid;
+               qctl.qc_idx = idx;
+
+               for (qtype = USRQUOTA; qtype <= GRPQUOTA; qtype++) {
+                       qctl.qc_type = qtype;
+                       if (qtype == USRQUOTA) {
+                               qctl.qc_id = geteuid();
+                               rc = uid2name(&name, qctl.qc_id);
+                       } else {
+                               qctl.qc_id = getegid();
+                               rc = gid2name(&name, qctl.qc_id);
+                       }
+                       if (rc)
+                               name = "<unknown>";
+                       mnt = argv[optind];
+                       rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
+                                             human_readable, show_default);
+                       if (rc1 && !rc)
+                               rc = rc1;
+               }
+               return rc;
+       /* lfs quota -u username /path/to/lustre/mount */
+       } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
+               /* options should be followed by u/g-name and mntpoint */
+               if ((!show_default && optind + 2 != argc) ||
+                   (show_default && optind + 1 != argc) ||
+                   qctl.qc_type == ALLQUOTA) {
+                       fprintf(stderr,
+                               "%s quota: name and mount point must be specified\n",
+                               progname);
+                       return CMD_HELP;
+               }
 
-               if (iover)
-                       diff2str(dqb->dqb_itime, timebuf, now);
+               if (!show_default) {
+                       name = argv[optind++];
+                       switch (qctl.qc_type) {
+                       case USRQUOTA:
+                               rc = name2uid(&qctl.qc_id, name);
+                               break;
+                       case GRPQUOTA:
+                               rc = name2gid(&qctl.qc_id, name);
+                               break;
+                       case PRJQUOTA:
+                               rc = name2projid(&qctl.qc_id, name);
+                               break;
+                       default:
+                               rc = -ENOTSUP;
+                               break;
+                       }
+               } else {
+                       qctl.qc_valid = QC_GENERAL;
+                       qctl.qc_cmd = LUSTRE_Q_GETDEFAULT;
+                       qctl.qc_id = 0;
+               }
 
-               sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
-                       "%ju" : "[%ju]", (uintmax_t)dqb->dqb_curinodes);
+               if (rc) {
+                       qctl.qc_id = strtoul(name, &endptr, 10);
+                       if (*endptr != '\0') {
+                               fprintf(stderr, "%s quota: invalid id '%s'\n",
+                                       progname, name);
+                               return CMD_HELP;
+                       }
+               }
+       } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
+               fprintf(stderr, "%s quota: missing quota info argument(s)\n",
+                       progname);
+               return CMD_HELP;
+       }
 
-               if (type == QC_GENERAL)
-                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ?
-                               "%ju" : "[%ju]",
-                               (uintmax_t)dqb->dqb_isoftlimit);
-               else
-                       sprintf(numbuf[1], "%s", "-");
+       mnt = argv[optind];
+       rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
+                            human_readable, show_default);
+       return rc;
+}
+#endif /* HAVE_SYS_QUOTA_H! */
 
-               sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
-                       "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit);
+static int flushctx_ioctl(char *mp)
+{
+        int fd, rc;
 
-               if (type != QC_OSTIDX)
-                       printf(" %7s%c %6s %7s %7s",
-                              numbuf[0], iover ? '*' : ' ', numbuf[1],
-                              numbuf[2], iover > 1 ? timebuf : "-");
-               else
-                       printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
-               printf("\n");
+        fd = open(mp, O_RDONLY);
+        if (fd == -1) {
+                fprintf(stderr, "flushctx: error open %s: %s\n",
+                        mp, strerror(errno));
+                return -1;
+        }
 
-        } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
-                   qctl->qc_cmd == Q_GETOINFO) {
-                char bgtimebuf[40];
-                char igtimebuf[40];
+        rc = ioctl(fd, LL_IOC_FLUSHCTX);
+        if (rc == -1)
+                fprintf(stderr, "flushctx: error ioctl %s: %s\n",
+                        mp, strerror(errno));
 
-                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);
-        }
+        close(fd);
+        return rc;
 }
 
-static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
-                          bool h, __u64 *total)
+static int lfs_flushctx(int argc, char **argv)
 {
-        int rc = 0, rc1 = 0, count = 0;
-        __u32 valid = qctl->qc_valid;
+       int     kdestroy = 0, c;
+       char    mntdir[PATH_MAX] = {'\0'};
+       int     index = 0;
+       int     rc = 0;
 
-        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(-rc));
-                return rc;
+        while ((c = getopt(argc, argv, "k")) != -1) {
+                switch (c) {
+                case 'k':
+                        kdestroy = 1;
+                        break;
+                default:
+                        fprintf(stderr, "error: %s: option '-%c' "
+                                        "unrecognized\n", argv[0], c);
+                        return CMD_HELP;
+                }
         }
 
-        for (qctl->qc_idx = 0; qctl->qc_idx < count; qctl->qc_idx++) {
-                qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX;
-                rc = llapi_quotactl(mnt, qctl);
-                if (rc) {
-                       /* It is remote client case. */
-                       if (rc == -EOPNOTSUPP) {
-                                rc = 0;
-                                goto out;
-                        }
+        if (kdestroy) {
+            if ((rc = system("kdestroy > /dev/null")) != 0) {
+                rc = WEXITSTATUS(rc);
+                fprintf(stderr, "error destroying tickets: %d, continuing\n", rc);
+            }
+        }
 
-                        if (!rc1)
-                                rc1 = rc;
-                        fprintf(stderr, "quotactl %s%d failed.\n",
-                                is_mdt ? "mdt": "ost", qctl->qc_idx);
-                        continue;
-                }
+       if (optind >= argc) {
+               /* flush for all mounted lustre fs. */
+               while (!llapi_search_mounts(NULL, index++, mntdir, NULL)) {
+                       /* Check if we have a mount point */
+                       if (mntdir[0] == '\0')
+                               continue;
 
-               print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
-                           qctl->qc_valid, 0, h);
-               *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
-                                  qctl->qc_dqblk.dqb_bhardlimit;
-       }
-out:
-       qctl->qc_valid = valid;
-       return rc ? : rc1;
+                       if (flushctx_ioctl(mntdir))
+                               rc = -1;
+
+                       mntdir[0] = '\0'; /* avoid matching in next loop */
+               }
+        } else {
+                /* flush fs as specified */
+                while (optind < argc) {
+                        if (flushctx_ioctl(argv[optind++]))
+                                rc = -1;
+                }
+        }
+        return rc;
 }
 
-static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
-                          int verbose, int quiet, bool human_readable)
+static int lfs_changelog(int argc, char **argv)
 {
-       int rc1 = 0, rc2 = 0, rc3 = 0;
-       char *obd_type = (char *)qctl->obd_type;
-       char *obd_uuid = (char *)qctl->obd_uuid.uuid;
-       __u64 total_ialloc = 0, total_balloc = 0;
-       int inacc;
+       void *changelog_priv;
+       struct changelog_rec *rec;
+       long long startrec = 0, endrec = 0;
+       char *mdd;
+       struct option long_opts[] = {
+               { .val = 'f', .name = "follow", .has_arg = no_argument },
+               { .name = NULL } };
+       char short_opts[] = "f";
+       int rc, follow = 0;
 
-       rc1 = llapi_quotactl(mnt, qctl);
-       if (rc1 < 0) {
-               switch (rc1) {
-               case -ESRCH:
-                       fprintf(stderr, "%s quotas are not enabled.\n",
-                               qtype_name(qctl->qc_type));
-                       goto out;
-               case -EPERM:
-                       fprintf(stderr, "Permission denied.\n");
-               case -ENODEV:
-               case -ENOENT:
-                       /* We already got error message. */
-                       goto out;
-               default:
-                       fprintf(stderr, "Unexpected quotactl error: %s\n",
-                               strerror(-rc1));
-               }
+       while ((rc = getopt_long(argc, argv, short_opts,
+               long_opts, NULL)) != -1) {
+                switch (rc) {
+                case 'f':
+                        follow++;
+                        break;
+                default:
+                       fprintf(stderr,
+                               "%s changelog: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                        return CMD_HELP;
+                }
+        }
+       if (optind >= argc) {
+               fprintf(stderr, "%s changelog: mdtname must be specified\n",
+                       progname);
+               return CMD_HELP;
        }
 
-       if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
-               print_quota_title(name, qctl, human_readable);
+        mdd = argv[optind++];
+        if (argc > optind)
+                startrec = strtoll(argv[optind++], NULL, 10);
+        if (argc > optind)
+                endrec = strtoll(argv[optind++], NULL, 10);
 
-       if (rc1 && *obd_type)
-               fprintf(stderr, "%s %s ", obd_type, obd_uuid);
+       rc = llapi_changelog_start(&changelog_priv,
+                                  CHANGELOG_FLAG_BLOCK |
+                                  CHANGELOG_FLAG_JOBID |
+                                  CHANGELOG_FLAG_EXTRA_FLAGS |
+                                  (follow ? CHANGELOG_FLAG_FOLLOW : 0),
+                                  mdd, startrec);
+       if (rc < 0) {
+               fprintf(stderr, "%s changelog: cannot start changelog: %s\n",
+                       progname, strerror(errno = -rc));
+               return rc;
+       }
 
-       if (qctl->qc_valid != QC_GENERAL)
-               mnt = "";
+       rc = llapi_changelog_set_xflags(changelog_priv,
+                                       CHANGELOG_EXTRA_FLAG_UIDGID |
+                                       CHANGELOG_EXTRA_FLAG_NID |
+                                       CHANGELOG_EXTRA_FLAG_OMODE |
+                                       CHANGELOG_EXTRA_FLAG_XATTR);
+       if (rc < 0) {
+               fprintf(stderr,
+                       "%s changelog: cannot set xflags for changelog: %s\n",
+                       progname, strerror(errno = -rc));
+               return rc;
+       }
 
-       inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA) &&
-               ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
-                (QIF_LIMITS|QIF_USAGE));
+       while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) {
+               time_t secs;
+               struct tm ts;
 
-       print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable);
+               if (endrec && rec->cr_index > endrec) {
+                       llapi_changelog_free(&rec);
+                       break;
+               }
+               if (rec->cr_index < startrec) {
+                       llapi_changelog_free(&rec);
+                       continue;
+               }
 
-       if (qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO &&
-           verbose) {
-               char strbuf[STRBUF_LEN];
+               secs = rec->cr_time >> 30;
+               gmtime_r(&secs, &ts);
+               printf("%ju %02d%-5s %02d:%02d:%02d.%09d %04d.%02d.%02d "
+                      "0x%x t="DFID, (uintmax_t)rec->cr_index, rec->cr_type,
+                      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,
+                      rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
 
-               rc2 = print_obd_quota(mnt, qctl, 1, human_readable,
-                                     &total_ialloc);
-               rc3 = print_obd_quota(mnt, qctl, 0, human_readable,
-                                     &total_balloc);
-               kbytes2str(total_balloc, strbuf, sizeof(strbuf),
-                          human_readable);
-               printf("Total allocated inode limit: %ju, total "
-                      "allocated block limit: %s\n", (uintmax_t)total_ialloc,
-                      strbuf);
-       }
+               if (rec->cr_flags & CLF_JOBID) {
+                       struct changelog_ext_jobid *jid =
+                               changelog_rec_jobid(rec);
 
-       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");
-out:
-       return rc1;
+                       if (jid->cr_jobid[0] != '\0')
+                               printf(" j=%s", jid->cr_jobid);
+               }
 
-}
+               if (rec->cr_flags & CLF_EXTRA_FLAGS) {
+                       struct changelog_ext_extra_flags *ef =
+                               changelog_rec_extra_flags(rec);
 
-static int lfs_project(int argc, char **argv)
-{
-       int ret = 0, err = 0, c, i;
-       struct project_handle_control phc = { 0 };
-       enum lfs_project_ops_t op;
+                       printf(" ef=0x%llx", ef->cr_extra_flags);
 
-       phc.newline = true;
-       phc.assign_projid = false;
-       /* default action */
-       op = LFS_PROJECT_LIST;
+                       if (ef->cr_extra_flags & CLFE_UIDGID) {
+                               struct changelog_ext_uidgid *uidgid =
+                                       changelog_rec_uidgid(rec);
 
-       while ((c = getopt(argc, argv, "p:cCsdkr0")) != -1) {
-               switch (c) {
-               case 'c':
-                       if (op != LFS_PROJECT_LIST) {
-                               fprintf(stderr,
-                                       "%s: cannot specify '-c' '-C' '-s' together\n",
-                                       progname);
-                               return CMD_HELP;
+                               printf(" u=%llu:%llu",
+                                      uidgid->cr_uid, uidgid->cr_gid);
                        }
+                       if (ef->cr_extra_flags & CLFE_NID) {
+                               struct changelog_ext_nid *nid =
+                                       changelog_rec_nid(rec);
 
-                       op = LFS_PROJECT_CHECK;
-                       break;
-               case 'C':
-                       if (op != LFS_PROJECT_LIST) {
-                               fprintf(stderr,
-                                       "%s: cannot specify '-c' '-C' '-s' together\n",
-                                       progname);
-                               return CMD_HELP;
+                               printf(" nid=%s",
+                                      libcfs_nid2str(nid->cr_nid));
                        }
 
-                       op = LFS_PROJECT_CLEAR;
-                       break;
-               case 's':
-                       if (op != LFS_PROJECT_LIST) {
-                               fprintf(stderr,
-                                       "%s: cannot specify '-c' '-C' '-s' together\n",
-                                       progname);
-                               return CMD_HELP;
+                       if (ef->cr_extra_flags & CLFE_OPEN) {
+                               struct changelog_ext_openmode *omd =
+                                       changelog_rec_openmode(rec);
+                               char mode[] = "---";
+
+                               /* exec mode must be exclusive */
+                               if (omd->cr_openflags & MDS_FMODE_EXEC) {
+                                       mode[2] = 'x';
+                               } else {
+                                       if (omd->cr_openflags & MDS_FMODE_READ)
+                                               mode[0] = 'r';
+                                       if (omd->cr_openflags &
+                                           (MDS_FMODE_WRITE |
+                                            MDS_OPEN_TRUNC |
+                                            MDS_OPEN_APPEND))
+                                               mode[1] = 'w';
+                               }
+
+                               if (strcmp(mode, "---") != 0)
+                                       printf(" m=%s", mode);
+
                        }
 
-                       phc.set_inherit = true;
-                       op = LFS_PROJECT_SET;
-                       break;
-               case 'd':
-                       phc.dironly = true;
-                       break;
-               case 'k':
-                       phc.keep_projid = true;
-                       break;
-               case 'r':
-                       phc.recursive = true;
-                       break;
-               case 'p':
-                       phc.projid = strtoul(optarg, NULL, 0);
-                       phc.assign_projid = true;
+                       if (ef->cr_extra_flags & CLFE_XATTR) {
+                               struct changelog_ext_xattr *xattr =
+                                       changelog_rec_xattr(rec);
 
-                       break;
-               case '0':
-                       phc.newline = false;
-                       break;
-               default:
-                       fprintf(stderr, "%s: invalid option '%c'\n",
-                               progname, optopt);
-                       return CMD_HELP;
+                               if (xattr->cr_xattr[0] != '\0')
+                                       printf(" x=%s", xattr->cr_xattr);
+                       }
                }
-       }
 
-       if (phc.assign_projid && op == LFS_PROJECT_LIST) {
-               op = LFS_PROJECT_SET;
-               phc.set_projid = true;
-       } else if (phc.assign_projid && op == LFS_PROJECT_SET) {
-               phc.set_projid = true;
-       }
+               if (rec->cr_namelen)
+                       printf(" p="DFID" %.*s", PFID(&rec->cr_pfid),
+                              rec->cr_namelen, changelog_rec_name(rec));
 
-       switch (op) {
-       case LFS_PROJECT_CHECK:
-               if (phc.keep_projid) {
-                       fprintf(stderr,
-                               "%s: '-k' is useless together with '-c'\n",
-                               progname);
-                       return CMD_HELP;
-               }
-               break;
-       case LFS_PROJECT_CLEAR:
-               if (!phc.newline) {
-                       fprintf(stderr,
-                               "%s: '-0' is useless together with '-C'\n",
-                               progname);
-                       return CMD_HELP;
-               }
-               if (phc.assign_projid) {
-                       fprintf(stderr,
-                               "%s: '-p' is useless together with '-C'\n",
-                               progname);
-                       return CMD_HELP;
-               }
-               break;
-       case LFS_PROJECT_SET:
-               if (!phc.newline) {
-                       fprintf(stderr,
-                               "%s: '-0' is useless together with '-s'\n",
-                               progname);
-                       return CMD_HELP;
-               }
-               if (phc.keep_projid) {
-                       fprintf(stderr,
-                               "%s: '-k' is useless together with '-s'\n",
-                               progname);
-                       return CMD_HELP;
-               }
-               break;
-       default:
-               if (!phc.newline) {
-                       fprintf(stderr,
-                               "%s: '-0' is useless for list operations\n",
-                               progname);
-                       return CMD_HELP;
+               if (rec->cr_flags & CLF_RENAME) {
+                       struct changelog_ext_rename *rnm =
+                               changelog_rec_rename(rec);
+
+                       if (!fid_is_zero(&rnm->cr_sfid))
+                               printf(" s="DFID" sp="DFID" %.*s",
+                                      PFID(&rnm->cr_sfid),
+                                      PFID(&rnm->cr_spfid),
+                                      (int)changelog_rec_snamelen(rec),
+                                      changelog_rec_sname(rec));
                }
-               break;
+               printf("\n");
+
+               llapi_changelog_free(&rec);
        }
 
-       argv += optind;
-       argc -= optind;
-       if (argc == 0) {
-               fprintf(stderr, "%s: missing file or directory target(s)\n",
-                       progname);
+       llapi_changelog_fini(&changelog_priv);
+
+       if (rc < 0)
+               fprintf(stderr, "%s changelog: cannot access changelog: %s\n",
+                       progname, strerror(errno = -rc));
+
+       return (rc == 1 ? 0 : rc);
+}
+
+static int lfs_changelog_clear(int argc, char **argv)
+{
+       long long endrec;
+       int rc;
+
+       if (argc != 4)
                return CMD_HELP;
-       }
 
-       for (i = 0; i < argc; i++) {
-               switch (op) {
-               case LFS_PROJECT_CHECK:
-                       err = lfs_project_check(argv[i], &phc);
-                       break;
-               case LFS_PROJECT_LIST:
-                       err = lfs_project_list(argv[i], &phc);
-                       break;
-               case LFS_PROJECT_CLEAR:
-                       err = lfs_project_clear(argv[i], &phc);
-                       break;
-               case LFS_PROJECT_SET:
-                       err = lfs_project_set(argv[i], &phc);
-                       break;
-               default:
-                       break;
-               }
-               if (err && !ret)
-                       ret = err;
-       }
+       endrec = strtoll(argv[3], NULL, 10);
 
-       return ret;
+       rc = llapi_changelog_clear(argv[1], argv[2], endrec);
+
+       if (rc == -EINVAL)
+               fprintf(stderr, "%s: record out of range: %llu\n",
+                       argv[0], endrec);
+       else if (rc == -ENOENT)
+               fprintf(stderr, "%s: no changelog user: %s\n",
+                       argv[0], argv[2]);
+       else if (rc)
+               fprintf(stderr, "%s error: %s\n", argv[0],
+                       strerror(-rc));
+
+       if (rc)
+               errno = -rc;
+
+       return rc;
 }
 
-static int lfs_quota(int argc, char **argv)
+static int lfs_fid2path(int argc, char **argv)
 {
-       int c;
-       char *mnt, *name = NULL;
-       struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
-                                   .qc_type = ALLQUOTA };
-       char *obd_uuid = (char *)qctl.obd_uuid.uuid;
-       int rc = 0, rc1 = 0, verbose = 0, quiet = 0;
-       char *endptr;
-       __u32 valid = QC_GENERAL, idx = 0;
-       bool human_readable = false;
-       int qtype;
+       struct option long_opts[] = {
+               { .val = 'c',   .name = "cur",  .has_arg = no_argument },
+               { .val = 'l',   .name = "link", .has_arg = required_argument },
+               { .val = 'r',   .name = "rec",  .has_arg = required_argument },
+               { .name = NULL } };
+       char  short_opts[] = "cl:r:";
+       char *device, *fid, *path;
+       long long recno = -1;
+       int linkno = -1;
+       int lnktmp;
+       int printcur = 0;
+       int rc = 0;
+       char *endptr = NULL;
 
-       while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) {
-               switch (c) {
-               case 'u':
-                       qtype = USRQUOTA;
-                       goto quota_type;
-               case 'g':
-                       qtype = GRPQUOTA;
-                       goto quota_type;
-               case 'p':
-                       qtype = PRJQUOTA;
-quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
-                               fprintf(stderr,
-                                       "%s quota: only one of -u, -g, or -p may be specified\n",
-                                       progname);
-                               return CMD_HELP;
-                       }
-                       qctl.qc_type = qtype;
+       while ((rc = getopt_long(argc, argv, short_opts,
+               long_opts, NULL)) != -1) {
+               switch (rc) {
+               case 'c':
+                       printcur++;
                        break;
-                case 't':
-                        qctl.qc_cmd = LUSTRE_Q_GETINFO;
-                        break;
-                case 'o':
-                        valid = qctl.qc_valid = QC_UUID;
-                       strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid));
-                        break;
-               case 'i':
-                       valid = qctl.qc_valid = QC_MDTIDX;
-                       idx = qctl.qc_idx = atoi(optarg);
-                       if (idx == 0 && *optarg != '0') {
+               case 'l':
+                       linkno = strtol(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
                                fprintf(stderr,
-                                       "%s quota: invalid MDT index '%s'\n",
+                                       "%s fid2path: invalid linkno '%s'\n",
                                        progname, optarg);
                                return CMD_HELP;
                        }
                        break;
-               case 'I':
-                       valid = qctl.qc_valid = QC_OSTIDX;
-                       idx = qctl.qc_idx = atoi(optarg);
-                       if (idx == 0 && *optarg != '0') {
+               case 'r':
+                       recno = strtoll(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
                                fprintf(stderr,
-                                       "%s quota: invalid OST index '%s'\n",
+                                       "%s fid2path: invalid recno '%s'\n",
                                        progname, optarg);
                                return CMD_HELP;
                        }
                        break;
-                case 'v':
-                        verbose = 1;
-                        break;
-                case 'q':
-                        quiet = 1;
-                        break;
-               case 'h':
-                       human_readable = true;
-                       break;
                default:
-                       fprintf(stderr, "%s quota: unrecognized option '%s'\n",
+                       fprintf(stderr,
+                               "%s fid2path: unrecognized option '%s'\n",
                                progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
-        /* current uid/gid info for "lfs quota /path/to/lustre/mount" */
-       if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
-           optind == argc - 1) {
+       if (argc < 3) {
+               fprintf(stderr,
+                       "%s fid2path: <fsname|rootpath> and <fid>... must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
-               qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
-               qctl.qc_valid = valid;
-               qctl.qc_idx = idx;
+       device = argv[optind++];
+       path = calloc(1, PATH_MAX);
+       if (path == NULL) {
+               rc = -errno;
+               fprintf(stderr,
+                       "%s fid2path: cannot allocate memory for path: %s\n",
+                       progname, strerror(-rc));
+               return rc;
+       }
 
-               for (qtype = USRQUOTA; qtype <= GRPQUOTA; qtype++) {
-                       qctl.qc_type = qtype;
-                       if (qtype == USRQUOTA) {
-                               qctl.qc_id = geteuid();
-                               rc = uid2name(&name, qctl.qc_id);
-                       } else {
-                               qctl.qc_id = getegid();
-                               rc = gid2name(&name, qctl.qc_id);
+       rc = 0;
+       while (optind < argc) {
+               fid = argv[optind++];
+
+               lnktmp = (linkno >= 0) ? linkno : 0;
+               while (1) {
+                       int oldtmp = lnktmp;
+                       long long rectmp = recno;
+                       int rc2;
+                       rc2 = llapi_fid2path(device, fid, path, PATH_MAX,
+                                            &rectmp, &lnktmp);
+                       if (rc2 < 0) {
+                               fprintf(stderr,
+                                       "%s fid2path: cannot find '%s': %s\n",
+                                       progname, fid, strerror(errno = -rc2));
+                               if (rc == 0)
+                                       rc = rc2;
+                               break;
                        }
-                       if (rc)
-                               name = "<unknown>";
-                       mnt = argv[optind];
-                       rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
-                                             human_readable);
-                       if (rc1 && !rc)
-                               rc = rc1;
-               }
-       /* lfs quota -u username /path/to/lustre/mount */
-       } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
-               /* options should be followed by u/g-name and mntpoint */
-               if (optind + 2 != argc || qctl.qc_type == ALLQUOTA) {
-                       fprintf(stderr,
-                               "%s quota: name and mount point must be specified\n",
-                               progname);
-                       return CMD_HELP;
-               }
 
-               name = argv[optind++];
-               switch (qctl.qc_type) {
-               case USRQUOTA:
-                       rc = name2uid(&qctl.qc_id, name);
-                       break;
-               case GRPQUOTA:
-                       rc = name2gid(&qctl.qc_id, name);
-                       break;
-               case PRJQUOTA:
-                       rc = name2projid(&qctl.qc_id, name);
-                       break;
-               default:
-                       rc = -ENOTSUP;
-                       break;
-               }
-               if (rc) {
-                       qctl.qc_id = strtoul(name, &endptr, 10);
-                       if (*endptr != '\0') {
-                               fprintf(stderr, "%s quota: invalid id '%s'\n",
-                                       progname, name);
-                               return CMD_HELP;
+                       if (printcur)
+                               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 */
+                               break;
+                       if (oldtmp == lnktmp)
+                               /* no more links */
+                               break;
                }
-               mnt = argv[optind];
-               rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
-                                    human_readable);
-       } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
-               fprintf(stderr, "%s quota: missing quota info argument(s)\n",
-                       progname);
-               return CMD_HELP;
        }
 
+       free(path);
        return rc;
 }
-#endif /* HAVE_SYS_QUOTA_H! */
 
-static int flushctx_ioctl(char *mp)
+static int lfs_path2fid(int argc, char **argv)
 {
-        int fd, rc;
-
-        fd = open(mp, O_RDONLY);
-        if (fd == -1) {
-                fprintf(stderr, "flushctx: error open %s: %s\n",
-                        mp, strerror(errno));
-                return -1;
-        }
-
-        rc = ioctl(fd, LL_IOC_FLUSHCTX);
-        if (rc == -1)
-                fprintf(stderr, "flushctx: error ioctl %s: %s\n",
-                        mp, strerror(errno));
-
-        close(fd);
-        return rc;
-}
+       struct option long_opts[] = {
+               { .val = 'p', .name = "parents", .has_arg = no_argument },
+               { .name = NULL } };
+       char            **path;
+       const char        short_opts[] = "p";
+       const char       *sep = "";
+       struct lu_fid     fid;
+       int               rc = 0;
+       bool              show_parents = false;
 
-static int lfs_flushctx(int argc, char **argv)
-{
-       int     kdestroy = 0, c;
-       char    mntdir[PATH_MAX] = {'\0'};
-       int     index = 0;
-       int     rc = 0;
+       while ((rc = getopt_long(argc, argv, short_opts,
+                                long_opts, NULL)) != -1) {
+               switch (rc) {
+               case 'p':
+                       show_parents = true;
+                       break;
+               default:
+                       fprintf(stderr,
+                               "%s path2fid: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
 
-        while ((c = getopt(argc, argv, "k")) != -1) {
-                switch (c) {
-                case 'k':
-                        kdestroy = 1;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
+       if (optind > argc - 1) {
+               fprintf(stderr, "%s path2fid: FILE... must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
+       else if (optind < argc - 1)
+               sep = ": ";
 
-        if (kdestroy) {
-            if ((rc = system("kdestroy > /dev/null")) != 0) {
-                rc = WEXITSTATUS(rc);
-                fprintf(stderr, "error destroying tickets: %d, continuing\n", rc);
-            }
-        }
+       rc = 0;
+       for (path = argv + optind; *path != NULL; path++) {
+               int err = 0;
+               if (!show_parents) {
+                       err = llapi_path2fid(*path, &fid);
+                       if (!err)
+                               printf("%s%s"DFID"\n",
+                                      *sep != '\0' ? *path : "", sep,
+                                      PFID(&fid));
+               } else {
+                       char            name[NAME_MAX + 1];
+                       unsigned int    linkno = 0;
 
-       if (optind >= argc) {
-               /* flush for all mounted lustre fs. */
-               while (!llapi_search_mounts(NULL, index++, mntdir, NULL)) {
-                       /* Check if we have a mount point */
-                       if (mntdir[0] == '\0')
-                               continue;
+                       while ((err = llapi_path2parent(*path, linkno, &fid,
+                                               name, sizeof(name))) == 0) {
+                               if (*sep != '\0' && linkno == 0)
+                                       printf("%s%s", *path, sep);
 
-                       if (flushctx_ioctl(mntdir))
-                               rc = -1;
+                               printf("%s"DFID"/%s", linkno != 0 ? "\t" : "",
+                                      PFID(&fid), name);
+                               linkno++;
+                       }
 
-                       mntdir[0] = '\0'; /* avoid matching in next loop */
+                       /* err == -ENODATA is end-of-loop */
+                       if (linkno > 0 && err == -ENODATA) {
+                               printf("\n");
+                               err = 0;
+                       }
                }
-        } else {
-                /* flush fs as specified */
-                while (optind < argc) {
-                        if (flushctx_ioctl(argv[optind++]))
-                                rc = -1;
-                }
-        }
-        return rc;
-}
-
-static int lfs_cp(int argc, char **argv)
-{
-       fprintf(stderr, "remote client copy file(s).\n"
-               "obsolete, does not support it anymore.\n");
-       return 0;
-}
-
-static int lfs_ls(int argc, char **argv)
-{
-       fprintf(stderr, "remote client lists directory contents.\n"
-               "obsolete, does not support it anymore.\n");
-       return 0;
-}
 
-static int lfs_changelog(int argc, char **argv)
-{
-       void *changelog_priv;
-       struct changelog_rec *rec;
-       long long startrec = 0, endrec = 0;
-       char *mdd;
-       struct option long_opts[] = {
-               { .val = 'f', .name = "follow", .has_arg = no_argument },
-               { .name = NULL } };
-       char short_opts[] = "f";
-       int rc, follow = 0;
+               if (err) {
+                       fprintf(stderr,
+                               "%s path2fid: cannot get %sfid for '%s': %s\n",
+                               progname, show_parents ? "parent " : "", *path,
+                               strerror(-err));
+                       if (rc == 0) {
+                               rc = err;
+                               errno = -err;
+                       }
+               }
+       }
 
-       while ((rc = getopt_long(argc, argv, short_opts,
-               long_opts, NULL)) != -1) {
-                switch (rc) {
-                case 'f':
-                        follow++;
-                        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;
+       return rc;
+}
 
-        mdd = argv[optind++];
-        if (argc > optind)
-                startrec = strtoll(argv[optind++], NULL, 10);
-        if (argc > optind)
-                endrec = strtoll(argv[optind++], NULL, 10);
+static int lfs_data_version(int argc, char **argv)
+{
+       char *path;
+       __u64 data_version;
+       int fd;
+       int rc;
+       int c;
+       int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
 
-       rc = llapi_changelog_start(&changelog_priv,
-                                  CHANGELOG_FLAG_BLOCK |
-                                  CHANGELOG_FLAG_JOBID |
-                                  CHANGELOG_FLAG_EXTRA_FLAGS |
-                                  (follow ? CHANGELOG_FLAG_FOLLOW : 0),
-                                  mdd, startrec);
-       if (rc < 0) {
-               fprintf(stderr, "Can't start changelog: %s\n",
-                       strerror(errno = -rc));
-               return rc;
+       if (argc < 2) {
+               fprintf(stderr, "%s data_version: FILE must be specified\n",
+                       progname);
+               return CMD_HELP;
        }
 
-       rc = llapi_changelog_set_xflags(changelog_priv,
-                                       CHANGELOG_EXTRA_FLAG_UIDGID |
-                                       CHANGELOG_EXTRA_FLAG_NID |
-                                       CHANGELOG_EXTRA_FLAG_OMODE);
-       if (rc < 0) {
-               fprintf(stderr, "Can't set xflags for changelog: %s\n",
-                       strerror(errno = -rc));
+       while ((c = getopt(argc, argv, "nrw")) != -1) {
+               switch (c) {
+               case 'n':
+                       data_version_flags = 0;
+                       break;
+               case 'r':
+                       data_version_flags |= LL_DV_RD_FLUSH;
+                       break;
+               case 'w':
+                       data_version_flags |= LL_DV_WR_FLUSH;
+                       break;
+               default:
+                       fprintf(stderr,
+                               "%s data_version: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+       if (optind == argc) {
+               fprintf(stderr, "%s data_version: FILE must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       path = argv[optind];
+       fd = open(path, O_RDONLY);
+       if (fd < 0) {
+               rc = -errno;
+               fprintf(stderr, "%s data_version: cannot open file '%s': %s\n",
+                       progname, path, strerror(-rc));
                return rc;
        }
 
-       while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) {
-               time_t secs;
-               struct tm ts;
+       rc = llapi_get_data_version(fd, &data_version, data_version_flags);
+       if (rc < 0)
+               fprintf(stderr,
+                       "%s data_version: cannot get version for '%s': %s\n",
+                       progname, path, strerror(-rc));
+       else
+               printf("%ju" "\n", (uintmax_t)data_version);
 
-               if (endrec && rec->cr_index > endrec) {
-                       llapi_changelog_free(&rec);
-                       break;
-               }
-               if (rec->cr_index < startrec) {
-                       llapi_changelog_free(&rec);
-                       continue;
-               }
+       close(fd);
+       return rc;
+}
 
-               secs = rec->cr_time >> 30;
-               gmtime_r(&secs, &ts);
-               printf("%ju %02d%-5s %02d:%02d:%02d.%09d %04d.%02d.%02d "
-                      "0x%x t="DFID, (uintmax_t)rec->cr_index, rec->cr_type,
-                      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,
-                      rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
+static int lfs_hsm_state(int argc, char **argv)
+{
+       int rc;
+       int i = 1;
+       char *path;
+       struct hsm_user_state hus;
 
-               if (rec->cr_flags & CLF_JOBID) {
-                       struct changelog_ext_jobid *jid =
-                               changelog_rec_jobid(rec);
+       if (argc < 2)
+               return CMD_HELP;
 
-                       if (jid->cr_jobid[0] != '\0')
-                               printf(" j=%s", jid->cr_jobid);
+       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;
                }
 
-               if (rec->cr_flags & CLF_EXTRA_FLAGS) {
-                       struct changelog_ext_extra_flags *ef =
-                               changelog_rec_extra_flags(rec);
+               /* Display path name and status flags */
+               printf("%s: (0x%08x)", path, hus.hus_states);
 
-                       printf(" ef=0x%llx", ef->cr_extra_flags);
+               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 (ef->cr_extra_flags & CLFE_UIDGID) {
-                               struct changelog_ext_uidgid *uidgid =
-                                       changelog_rec_uidgid(rec);
+               if (hus.hus_archive_id != 0)
+                       printf(", archive_id:%d", hus.hus_archive_id);
+               printf("\n");
 
-                               printf(" u=%llu:%llu",
-                                      uidgid->cr_uid, uidgid->cr_gid);
-                       }
-                       if (ef->cr_extra_flags & CLFE_NID) {
-                               struct changelog_ext_nid *nid =
-                                       changelog_rec_nid(rec);
+       } while (++i < argc);
 
-                               printf(" nid=%s",
-                                      libcfs_nid2str(nid->cr_nid));
-                       }
+       return 0;
+}
 
-                       if (ef->cr_extra_flags & CLFE_OPEN) {
-                               struct changelog_ext_openmode *omd =
-                                       changelog_rec_openmode(rec);
-                               char mode[] = "---";
+#define LFS_HSM_SET   0
+#define LFS_HSM_CLEAR 1
 
-                               /* exec mode must be exclusive */
-                               if (omd->cr_openflags & MDS_FMODE_EXEC) {
-                                       mode[2] = 'x';
-                               } else {
-                                       if (omd->cr_openflags & FMODE_READ)
-                                               mode[0] = 'r';
-                                       if (omd->cr_openflags &
-                                           (FMODE_WRITE |
-                                            MDS_OPEN_TRUNC |
-                                            MDS_OPEN_APPEND))
-                                               mode[1] = 'w';
-                               }
+/**
+ * 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[] = {
+       { .val = 'A',   .name = "archived",     .has_arg = no_argument },
+       { .val = 'a',   .name = "noarchive",    .has_arg = no_argument },
+       { .val = 'd',   .name = "dirty",        .has_arg = no_argument },
+       { .val = 'e',   .name = "exists",       .has_arg = no_argument },
+       { .val = 'l',   .name = "lost",         .has_arg = no_argument },
+       { .val = 'r',   .name = "norelease",    .has_arg = no_argument },
+       { .val = 'i',   .name = "archive-id",   .has_arg = required_argument },
+       { .name = NULL } };
+       char short_opts[] = "lraAdei:";
+       __u64 mask = 0;
+       int c, rc;
+       char *path;
+       __u32 archive_id = 0;
+       char *end = NULL;
 
-                               if (strcmp(mode, "---") != 0)
-                                       printf(" m=%s", mode);
+       if (argc < 3)
+               return CMD_HELP;
 
+       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 'i':
+                       archive_id = strtol(optarg, &end, 10);
+                       if (*end != '\0') {
+                               fprintf(stderr, "invalid archive_id: '%s'\n",
+                                       end);
+                               return CMD_HELP;
                        }
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
                }
+       }
 
-               if (rec->cr_namelen)
-                       printf(" p="DFID" %.*s", PFID(&rec->cr_pfid),
-                              rec->cr_namelen, changelog_rec_name(rec));
-
-               if (rec->cr_flags & CLF_RENAME) {
-                       struct changelog_ext_rename *rnm =
-                               changelog_rec_rename(rec);
-
-                       if (!fid_is_zero(&rnm->cr_sfid))
-                               printf(" s="DFID" sp="DFID" %.*s",
-                                      PFID(&rnm->cr_sfid),
-                                      PFID(&rnm->cr_spfid),
-                                      (int)changelog_rec_snamelen(rec),
-                                      changelog_rec_sname(rec));
-               }
-               printf("\n");
+       /* User should have specified a flag */
+       if (mask == 0)
+               return CMD_HELP;
 
-               llapi_changelog_free(&rec);
-        }
+       while (optind < argc) {
+
+               path = argv[optind];
 
-        llapi_changelog_fini(&changelog_priv);
+               /* If mode == 0, this means we apply the mask. */
+               if (mode == LFS_HSM_SET)
+                       rc = llapi_hsm_state_set(path, mask, 0, archive_id);
+               else
+                       rc = llapi_hsm_state_set(path, 0, mask, 0);
 
-        if (rc < 0)
-                fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc));
+               if (rc != 0) {
+                       fprintf(stderr, "Can't change hsm flags for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+               optind++;
+       }
 
-        return (rc == 1 ? 0 : rc);
+       return 0;
 }
 
-static int lfs_changelog_clear(int argc, char **argv)
+static int lfs_hsm_action(int argc, char **argv)
 {
-       long long endrec;
-       int rc;
+       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 != 4)
+       if (argc < 2)
                return CMD_HELP;
 
-       endrec = strtoll(argv[3], NULL, 10);
+       do {
+               path = argv[i];
 
-       rc = llapi_changelog_clear(argv[1], argv[2], endrec);
+               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;
 
-       if (rc == -EINVAL)
-               fprintf(stderr, "%s: record out of range: %llu\n",
-                       argv[0], endrec);
-       else if (rc == -ENOENT)
-               fprintf(stderr, "%s: no changelog user: %s\n",
-                       argv[0], argv[2]);
-       else if (rc)
-               fprintf(stderr, "%s error: %s\n", argv[0],
-                       strerror(-rc));
+               printf("%s: %s", path, hsm_user_action2name(hua));
 
-       if (rc)
-               errno = -rc;
+               /* Skip file without action */
+               if (hca.hca_action == HUA_NONE) {
+                       printf("\n");
+                       continue;
+               }
 
-       return rc;
+               printf(" %s ", hsm_progress_state2name(hps));
+
+               if ((hps == HPS_RUNNING) &&
+                   (hua == HUA_ARCHIVE || hua == HUA_RESTORE))
+                       printf("(%llu bytes moved)\n",
+                              (unsigned long long)he.length);
+               else if ((he.offset + he.length) == LUSTRE_EOF)
+                       printf("(from %llu to EOF)\n",
+                              (unsigned long long)he.offset);
+               else
+                       printf("(from %llu to %llu)\n",
+                              (unsigned long long)he.offset,
+                              (unsigned long long)(he.offset + he.length));
+
+       } while (++i < argc);
+
+       return 0;
 }
 
-static int lfs_fid2path(int argc, char **argv)
+static int lfs_hsm_set(int argc, char **argv)
 {
-       struct option long_opts[] = {
-               { .val = 'c',   .name = "cur",  .has_arg = no_argument },
-               { .val = 'l',   .name = "link", .has_arg = required_argument },
-               { .val = 'r',   .name = "rec",  .has_arg = required_argument },
-               { .name = NULL } };
-       char  short_opts[] = "cl:r:";
-       char *device, *fid, *path;
-       long long recno = -1;
-       int linkno = -1;
-       int lnktmp;
-       int printcur = 0;
-       int rc = 0;
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_SET);
+}
 
-       while ((rc = getopt_long(argc, argv, short_opts,
-               long_opts, NULL)) != -1) {
-                switch (rc) {
-                case 'c':
-                        printcur++;
-                        break;
-                case 'l':
-                        linkno = strtol(optarg, NULL, 10);
-                        break;
-                case 'r':
-                        recno = strtoll(optarg, NULL, 10);
-                        break;
-                case '?':
-                        return CMD_HELP;
-                default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
-                        return CMD_HELP;
-                }
-        }
+static int lfs_hsm_clear(int argc, char **argv)
+{
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_CLEAR);
+}
 
-       if (argc < 3)
-               return CMD_HELP;
+/**
+ * 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(const char *file, struct lu_fid *fid,
+                               dev_t *last_dev)
+{
+       struct stat     st;
+       int             rc;
 
-       device = argv[optind++];
-       path = calloc(1, PATH_MAX);
-       if (path == NULL) {
-               fprintf(stderr, "error: Not enough memory\n");
+       rc = lstat(file, &st);
+       if (rc) {
+               fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno));
                return -errno;
        }
+       /* Checking for regular file as archiving as posix copytool
+        * rejects archiving files other than regular files
+        */
+       if (!S_ISREG(st.st_mode)) {
+               fprintf(stderr, "error: \"%s\" is not a regular file\n", file);
+               return CMD_HELP;
+       }
+       /* 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 = 0;
-       while (optind < argc) {
-               fid = argv[optind++];
+       rc = llapi_path2fid(file, fid);
+       if (rc) {
+               fprintf(stderr, "Cannot read FID of %s: %s\n",
+                       file, strerror(-rc));
+               return rc;
+       }
+       return 0;
+}
 
-               lnktmp = (linkno >= 0) ? linkno : 0;
-               while (1) {
-                       int oldtmp = lnktmp;
-                       long long rectmp = recno;
-                       int rc2;
-                       rc2 = llapi_fid2path(device, fid, path, PATH_MAX,
-                                            &rectmp, &lnktmp);
-                       if (rc2 < 0) {
-                               fprintf(stderr, "%s: error on FID %s: %s\n",
-                                       argv[0], fid, strerror(errno = -rc2));
-                               if (rc == 0)
-                                       rc = rc2;
-                               break;
-                       }
+/* Fill an HSM HUR item with a given file name.
+ *
+ * If mntpath is set, then the filename is actually a FID, and no
+ * lookup on the filesystem will be performed.
+ *
+ * \param[in]  hur         the user request to fill
+ * \param[in]  idx         index of the item inside the HUR to fill
+ * \param[in]  mntpath     mountpoint of Lustre
+ * \param[in]  fname       filename (if mtnpath is NULL)
+ *                         or FID (if mntpath is set)
+ * \param[in]  last_dev    pointer to last device id used
+ *
+ * \retval 0 on success
+ * \retval CMD_HELP or a negative errno on error
+ */
+static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx,
+                        const char *mntpath, const char *fname,
+                        dev_t *last_dev)
+{
+       struct hsm_user_item *hui = &hur->hur_user_item[idx];
+       int rc;
 
-                       if (printcur)
-                               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);
+       hui->hui_extent.length = -1;
 
-                       if (linkno >= 0)
-                               /* specified linkno */
-                               break;
-                       if (oldtmp == lnktmp)
-                               /* no more links */
-                               break;
+       if (mntpath != NULL) {
+               if (*fname == '[')
+                       fname++;
+               rc = sscanf(fname, SFID, RFID(&hui->hui_fid));
+               if (rc == 3) {
+                       rc = 0;
+               } else {
+                       fprintf(stderr, "hsm: '%s' is not a valid FID\n",
+                               fname);
+                       rc = -EINVAL;
                }
+       } else {
+               rc = lfs_hsm_prepare_file(fname, &hui->hui_fid, last_dev);
        }
 
-       free(path);
+       if (rc == 0)
+               hur->hur_request.hr_itemcount++;
+
        return rc;
 }
 
-static int lfs_path2fid(int argc, char **argv)
+static int lfs_hsm_request(int argc, char **argv, int action)
 {
        struct option long_opts[] = {
-               { .val = 'p', .name = "parents", .has_arg = no_argument },
-               { .name = NULL } };
-       char            **path;
-       const char        short_opts[] = "p";
-       const char       *sep = "";
-       struct lu_fid     fid;
-       int               rc = 0;
-       bool              show_parents = false;
+       { .val = 'a',   .name = "archive",      .has_arg = required_argument },
+       { .val = 'D',   .name = "data",         .has_arg = required_argument },
+       { .val = 'l',   .name = "filelist",     .has_arg = required_argument },
+       { .val = 'm',   .name = "mntpath",      .has_arg = required_argument },
+       { .name = NULL } };
+       dev_t                    last_dev = 0;
+       char                     short_opts[] = "l:D:a:m:";
+       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 = NULL;
+       char                    *mntpath = NULL;
+       int                      rc;
 
-       while ((rc = getopt_long(argc, argv, short_opts,
-                                long_opts, NULL)) != -1) {
-               switch (rc) {
-               case 'p':
-                       show_parents = true;
+       if (argc < 2)
+               return CMD_HELP;
+
+       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 &&
+                           action != HUA_REMOVE) {
+                               fprintf(stderr,
+                                       "error: -a is supported only "
+                                       "when archiving or removing\n");
+                               return CMD_HELP;
+                       }
+                       archive_id = atoi(optarg);
+                       break;
+               case 'm':
+                       if (some_file == NULL) {
+                               mntpath = optarg;
+                               some_file = strdup(optarg);
+                       }
                        break;
+               case '?':
+                       return CMD_HELP;
                default:
                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
                                argv[0], argv[optind - 1]);
@@ -5825,1319 +7527,1668 @@ static int lfs_path2fid(int argc, char **argv)
                }
        }
 
-       if (optind > argc - 1)
+       /* All remaining args are files, so we have at least nbfile */
+       nbfile = argc - optind;
+
+       if ((nbfile == 0) && (filelist == NULL))
                return CMD_HELP;
-       else if (optind < argc - 1)
-               sep = ": ";
 
-       rc = 0;
-       for (path = argv + optind; *path != NULL; path++) {
-               int err = 0;
-               if (!show_parents) {
-                       err = llapi_path2fid(*path, &fid);
-                       if (!err)
-                               printf("%s%s"DFID"\n",
-                                      *sep != '\0' ? *path : "", sep,
-                                      PFID(&fid));
-               } else {
-                       char            name[NAME_MAX + 1];
-                       unsigned int    linkno = 0;
+       if (opaque != NULL)
+               opaque_len = strlen(opaque);
 
-                       while ((err = llapi_path2parent(*path, linkno, &fid,
-                                               name, sizeof(name))) == 0) {
-                               if (*sep != '\0' && linkno == 0)
-                                       printf("%s%s", *path, sep);
+       /* 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;
 
-                               printf("%s"DFID"/%s", linkno != 0 ? "\t" : "",
-                                      PFID(&fid), name);
-                               linkno++;
+       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 && some_file == NULL)
+               some_file = strdup(argv[optind]);
+
+       for (i = 0; i < nbfile; i++) {
+               rc = fill_hur_item(hur, i, mntpath, argv[optind + i],
+                                  &last_dev);
+               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) {
+                       /* If allocated buffer was too small, get something
+                        * larger */
+                       if (nbfile_alloc <= hur->hur_request.hr_itemcount) {
+                               ssize_t size;
+
+                               nbfile_alloc = nbfile_alloc * 2 + 1;
+                               oldhur = hur;
+                               hur = llapi_hsm_user_request_alloc(nbfile_alloc,
+                                                                  opaque_len);
+                               if (hur == NULL) {
+                                       fprintf(stderr, "hsm: cannot allocate "
+                                               "the request: %s\n",
+                                               strerror(errno));
+                                       hur = oldhur;
+                                       rc = -errno;
+                                       fclose(fp);
+                                       goto out_free;
+                               }
+                               size = hur_len(oldhur);
+                               if (size < 0) {
+                                       fprintf(stderr, "hsm: cannot allocate "
+                                               "%u files + %u bytes data\n",
+                                           oldhur->hur_request.hr_itemcount,
+                                           oldhur->hur_request.hr_data_len);
+                                       free(hur);
+                                       hur = oldhur;
+                                       rc = -E2BIG;
+                                       fclose(fp);
+                                       goto out_free;
+                               }
+                               memcpy(hur, oldhur, size);
+                               free(oldhur);
                        }
 
-                       /* err == -ENODATA is end-of-loop */
-                       if (linkno > 0 && err == -ENODATA) {
-                               printf("\n");
-                               err = 0;
+                       /* Chop CR */
+                       if (line[strlen(line) - 1] == '\n')
+                               line[strlen(line) - 1] = '\0';
+
+                       rc = fill_hur_item(hur, hur->hur_request.hr_itemcount,
+                                          mntpath, line, &last_dev);
+                       if (rc) {
+                               fclose(fp);
+                               goto out_free;
                        }
-               }
 
-               if (err) {
-                       fprintf(stderr, "%s: can't get %sfid for %s: %s\n",
-                               argv[0], show_parents ? "parent " : "", *path,
-                               strerror(-err));
-                       if (rc == 0) {
-                               rc = err;
-                               errno = -err;
+                       if (some_file == NULL) {
+                               some_file = line;
+                               line = NULL;
                        }
                }
+
+               rc = fclose(fp);
+               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(some_file);
+       free(hur);
        return rc;
 }
 
-static int lfs_data_version(int argc, char **argv)
+static int lfs_hsm_archive(int argc, char **argv)
 {
-       char *path;
-       __u64 data_version;
-       int fd;
-       int rc;
-       int c;
-       int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
-
-       if (argc < 2)
-               return CMD_HELP;
-
-       while ((c = getopt(argc, argv, "nrw")) != -1) {
-               switch (c) {
-               case 'n':
-                       data_version_flags = 0;
-                       break;
-               case 'r':
-                       data_version_flags |= LL_DV_RD_FLUSH;
-                       break;
-               case 'w':
-                       data_version_flags |= LL_DV_WR_FLUSH;
-                       break;
-               default:
-                       return CMD_HELP;
-               }
-       }
-       if (optind == argc)
-               return CMD_HELP;
+       return lfs_hsm_request(argc, argv, HUA_ARCHIVE);
+}
 
-       path = argv[optind];
-       fd = open(path, O_RDONLY);
-       if (fd < 0)
-               err(errno, "cannot open file %s", path);
+static int lfs_hsm_restore(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RESTORE);
+}
 
-       rc = llapi_get_data_version(fd, &data_version, data_version_flags);
-       if (rc < 0)
-               err(errno, "cannot get version for %s", path);
-       else
-               printf("%ju" "\n", (uintmax_t)data_version);
+static int lfs_hsm_release(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RELEASE);
+}
 
-       close(fd);
-       return rc;
+static int lfs_hsm_remove(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_REMOVE);
 }
 
-static int lfs_hsm_state(int argc, char **argv)
+static int lfs_hsm_cancel(int argc, char **argv)
 {
-       int rc;
-       int i = 1;
-       char *path;
-       struct hsm_user_state hus;
+       return lfs_hsm_request(argc, argv, HUA_CANCEL);
+}
 
-       if (argc < 2)
+static int lfs_swap_layouts(int argc, char **argv)
+{
+       if (argc != 3)
                return CMD_HELP;
 
-       do {
-               path = argv[i];
+       return llapi_swap_layouts(argv[1], argv[2], 0, 0,
+                                 SWAP_LAYOUTS_KEEP_MTIME |
+                                 SWAP_LAYOUTS_KEEP_ATIME);
+}
 
-               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;
-               }
+static const char *const ladvise_names[] = LU_LADVISE_NAMES;
+
+static const char *const lock_mode_names[] = LOCK_MODE_NAMES;
+
+int lfs_get_mode(const char *string)
+{
+       enum lock_mode_user mode;
 
-               /* Display path name and status flags */
-               printf("%s: (0x%08x)", path, hus.hus_states);
+       for (mode = 0; mode < ARRAY_SIZE(lock_mode_names); mode++) {
+               if (lock_mode_names[mode] == NULL)
+                       continue;
+               if (strcmp(string, lock_mode_names[mode]) == 0)
+                       return mode;
+       }
 
-               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");
+       return -EINVAL;
+}
 
-               if (hus.hus_archive_id != 0)
-                       printf(", archive_id:%d", hus.hus_archive_id);
-               printf("\n");
+static enum lu_ladvise_type lfs_get_ladvice(const char *string)
+{
+       enum lu_ladvise_type advice;
 
-       } while (++i < argc);
+       for (advice = 0;
+            advice < ARRAY_SIZE(ladvise_names); advice++) {
+               if (ladvise_names[advice] == NULL)
+                       continue;
+               if (strcmp(string, ladvise_names[advice]) == 0)
+                       return advice;
+       }
 
-       return 0;
+       return LU_LADVISE_INVALID;
 }
 
-#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)
+static int lfs_ladvise(int argc, char **argv)
 {
        struct option long_opts[] = {
-       { .val = 'A',   .name = "archived",     .has_arg = no_argument },
-       { .val = 'a',   .name = "noarchive",    .has_arg = no_argument },
-       { .val = 'd',   .name = "dirty",        .has_arg = no_argument },
-       { .val = 'e',   .name = "exists",       .has_arg = no_argument },
-       { .val = 'l',   .name = "lost",         .has_arg = no_argument },
-       { .val = 'r',   .name = "norelease",    .has_arg = no_argument },
-       { .val = 'i',   .name = "archive-id",   .has_arg = required_argument },
+       { .val = 'a',   .name = "advice",       .has_arg = required_argument },
+       { .val = 'b',   .name = "background",   .has_arg = no_argument },
+       { .val = 'e',   .name = "end",          .has_arg = required_argument },
+       { .val = 'l',   .name = "length",       .has_arg = required_argument },
+       { .val = 'm',   .name = "mode",         .has_arg = required_argument },
+       { .val = 's',   .name = "start",        .has_arg = required_argument },
+       { .val = 'u',   .name = "unset",        .has_arg = no_argument },
        { .name = NULL } };
-       char short_opts[] = "lraAdei:";
-       __u64 mask = 0;
-       int c, rc;
-       char *path;
-       __u32 archive_id = 0;
-       char *end = NULL;
-
-       if (argc < 3)
-               return CMD_HELP;
+       char                     short_opts[] = "a:be:l:m:s:u";
+       int                      c;
+       int                      rc = 0;
+       const char              *path;
+       int                      fd;
+       struct llapi_lu_ladvise  advice;
+       enum lu_ladvise_type     advice_type = LU_LADVISE_INVALID;
+       unsigned long long       start = 0;
+       unsigned long long       end = LUSTRE_EOF;
+       unsigned long long       length = 0;
+       unsigned long long       size_units;
+       unsigned long long       flags = 0;
+       int                      mode = 0;
 
+       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;
+                       advice_type = lfs_get_ladvice(optarg);
+                       if (advice_type == LU_LADVISE_INVALID) {
+                               fprintf(stderr, "%s: invalid advice type "
+                                       "'%s'\n", argv[0], optarg);
+                               fprintf(stderr, "Valid types:");
+
+                               for (advice_type = 0;
+                                    advice_type < ARRAY_SIZE(ladvise_names);
+                                    advice_type++) {
+                                       if (ladvise_names[advice_type] == NULL)
+                                               continue;
+                                       fprintf(stderr, " %s",
+                                               ladvise_names[advice_type]);
+                               }
+                               fprintf(stderr, "\n");
+
+                               return CMD_HELP;
+                       }
                        break;
-               case 'r':
-                       mask |= HS_NORELEASE;
+               case 'b':
+                       flags |= LF_ASYNC;
                        break;
-               case 'd':
-                       mask |= HS_DIRTY;
+               case 'u':
+                       flags |= LF_UNSET;
                        break;
                case 'e':
-                       mask |= HS_EXISTS;
+                       size_units = 1;
+                       rc = llapi_parse_size(optarg, &end,
+                                             &size_units, 0);
+                       if (rc) {
+                               fprintf(stderr, "%s: bad end offset '%s'\n",
+                                       argv[0], optarg);
+                               return CMD_HELP;
+                       }
                        break;
-               case 'i':
-                       archive_id = strtol(optarg, &end, 10);
-                       if (*end != '\0') {
-                               fprintf(stderr, "invalid archive_id: '%s'\n",
-                                       end);
+               case 's':
+                       size_units = 1;
+                       rc = llapi_parse_size(optarg, &start,
+                                             &size_units, 0);
+                       if (rc) {
+                               fprintf(stderr, "%s: bad start offset "
+                                       "'%s'\n", argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'l':
+                       size_units = 1;
+                       rc = llapi_parse_size(optarg, &length,
+                                             &size_units, 0);
+                       if (rc) {
+                               fprintf(stderr, "%s: bad length '%s'\n",
+                                       argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'm':
+                       mode = lfs_get_mode(optarg);
+                       if (mode < 0) {
+                               fprintf(stderr, "%s: bad mode '%s', valid "
+                                                "modes are READ or WRITE\n",
+                                       argv[0], optarg);
                                return CMD_HELP;
                        }
                        break;
                case '?':
                        return CMD_HELP;
                default:
-                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
                                argv[0], argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
-       /* User should have specified a flag */
-       if (mask == 0)
+       if (advice_type == LU_LADVISE_INVALID) {
+               fprintf(stderr, "%s: please give an advice type\n", argv[0]);
+               fprintf(stderr, "Valid types:");
+               for (advice_type = 0; advice_type < ARRAY_SIZE(ladvise_names);
+                    advice_type++) {
+                       if (ladvise_names[advice_type] == NULL)
+                               continue;
+                       fprintf(stderr, " %s", ladvise_names[advice_type]);
+               }
+               fprintf(stderr, "\n");
                return CMD_HELP;
+       }
 
-       while (optind < argc) {
-
-               path = argv[optind];
+       if (advice_type == LU_LADVISE_LOCKNOEXPAND) {
+               fprintf(stderr, "%s: Lock no expand advice is a per file "
+                                "descriptor advice, so when called from lfs, "
+                                "it does nothing.\n", argv[0]);
+               return CMD_HELP;
+       }
 
-               /* If mode == 0, this means we apply the mask. */
-               if (mode == LFS_HSM_SET)
-                       rc = llapi_hsm_state_set(path, mask, 0, archive_id);
-               else
-                       rc = llapi_hsm_state_set(path, 0, mask, 0);
+       if (argc <= optind) {
+               fprintf(stderr, "%s: please give one or more file names\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
 
-               if (rc != 0) {
-                       fprintf(stderr, "Can't change hsm flags for %s: %s\n",
-                               path, strerror(errno = -rc));
-                       return rc;
-               }
-               optind++;
+       if (end != LUSTRE_EOF && length != 0 && end != start + length) {
+               fprintf(stderr, "%s: conflicting arguments of -l and -e\n",
+                       argv[0]);
+               return CMD_HELP;
        }
 
-       return 0;
-}
+       if (end == LUSTRE_EOF && length != 0)
+               end = start + length;
 
-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 (end <= start) {
+               fprintf(stderr, "%s: range [%llu, %llu] is invalid\n",
+                       argv[0], start, end);
+               return CMD_HELP;
+       }
 
-       if (argc < 2)
+       if (advice_type != LU_LADVISE_LOCKAHEAD && mode != 0) {
+               fprintf(stderr, "%s: mode is only valid with lockahead\n",
+                       argv[0]);
                return CMD_HELP;
+       }
 
-       do {
-               path = argv[i];
+       if (advice_type == LU_LADVISE_LOCKAHEAD && mode == 0) {
+               fprintf(stderr, "%s: mode is required with lockahead\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
 
-               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;
+       while (optind < argc) {
+               int rc2;
 
-               printf("%s: %s", path, hsm_user_action2name(hua));
+               path = argv[optind++];
 
-               /* Skip file without action */
-               if (hca.hca_action == HUA_NONE) {
-                       printf("\n");
-                       continue;
+               fd = open(path, O_RDONLY);
+               if (fd < 0) {
+                       fprintf(stderr, "%s: cannot open file '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       rc2 = -errno;
+                       goto next;
                }
 
-               printf(" %s ", hsm_progress_state2name(hps));
+               advice.lla_start = start;
+               advice.lla_end = end;
+               advice.lla_advice = advice_type;
+               advice.lla_value1 = 0;
+               advice.lla_value2 = 0;
+               advice.lla_value3 = 0;
+               advice.lla_value4 = 0;
+               if (advice_type == LU_LADVISE_LOCKAHEAD) {
+                       advice.lla_lockahead_mode = mode;
+                       advice.lla_peradvice_flags = flags;
+               }
 
-               if ((hps == HPS_RUNNING) &&
-                   (hua == HUA_ARCHIVE || hua == HUA_RESTORE))
-                       printf("(%llu bytes moved)\n",
-                              (unsigned long long)he.length);
-               else if ((he.offset + he.length) == LUSTRE_EOF)
-                       printf("(from %llu to EOF)\n",
-                              (unsigned long long)he.offset);
-               else
-                       printf("(from %llu to %llu)\n",
-                              (unsigned long long)he.offset,
-                              (unsigned long long)(he.offset + he.length));
+               rc2 = llapi_ladvise(fd, flags, 1, &advice);
+               close(fd);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot give advice '%s' to file "
+                               "'%s': %s\n", argv[0],
+                               ladvise_names[advice_type],
+                               path, strerror(errno));
 
-       } while (++i < argc);
+                       goto next;
+               }
 
-       return 0;
+next:
+               if (rc == 0 && rc2 < 0)
+                       rc = rc2;
+       }
+       return rc;
 }
 
-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);
-}
+static const char *const heat_names[] = LU_HEAT_NAMES;
 
-/**
- * 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(const char *file, struct lu_fid *fid,
-                               dev_t *last_dev)
+static int lfs_heat_get(int argc, char **argv)
 {
-       struct stat     st;
-       int             rc;
+       struct lu_heat  *heat;
+       int              rc = 0, rc2;
+       char            *path;
+       int              fd;
+       int              i;
 
-       rc = lstat(file, &st);
-       if (rc) {
-               fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno));
-               return -errno;
-       }
-       /* Checking for regular file as archiving as posix copytool
-        * rejects archiving files other than regular files
-        */
-       if (!S_ISREG(st.st_mode)) {
-               fprintf(stderr, "error: \"%s\" is not a regular file\n", file);
+       if (argc <= 1)
                return CMD_HELP;
-       }
-       /* 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;
+       heat = calloc(sizeof(*heat) + sizeof(__u64) * OBD_HEAT_COUNT, 1);
+       if (!heat) {
+               fprintf(stderr, "%s: memory allocation failed\n", argv[0]);
+               return -ENOMEM;
        }
-       return 0;
-}
 
-/* Fill an HSM HUR item with a given file name.
- *
- * If mntpath is set, then the filename is actually a FID, and no
- * lookup on the filesystem will be performed.
- *
- * \param[in]  hur         the user request to fill
- * \param[in]  idx         index of the item inside the HUR to fill
- * \param[in]  mntpath     mountpoint of Lustre
- * \param[in]  fname       filename (if mtnpath is NULL)
- *                         or FID (if mntpath is set)
- * \param[in]  last_dev    pointer to last device id used
- *
- * \retval 0 on success
- * \retval CMD_HELP or a negative errno on error
- */
-static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx,
-                        const char *mntpath, const char *fname,
-                        dev_t *last_dev)
-{
-       struct hsm_user_item *hui = &hur->hur_user_item[idx];
-       int rc;
+       optind = 1;
+       while (optind < argc) {
+               path = argv[optind++];
 
-       hui->hui_extent.length = -1;
+               fd = open(path, O_RDONLY);
+               if (fd < 0) {
+                       fprintf(stderr, "%s: cannot open file '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       rc2 = -errno;
+                       goto next;
+               }
 
-       if (mntpath != NULL) {
-               if (*fname == '[')
-                       fname++;
-               rc = sscanf(fname, SFID, RFID(&hui->hui_fid));
-               if (rc == 3) {
-                       rc = 0;
-               } else {
-                       fprintf(stderr, "hsm: '%s' is not a valid FID\n",
-                               fname);
-                       rc = -EINVAL;
+               heat->lh_count = OBD_HEAT_COUNT;
+               rc2 = llapi_heat_get(fd, heat);
+               close(fd);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot get heat of file '%s'"
+                               ": %s\n", argv[0], path, strerror(errno));
+                       goto next;
                }
-       } else {
-               rc = lfs_hsm_prepare_file(fname, &hui->hui_fid, last_dev);
-       }
 
-       if (rc == 0)
-               hur->hur_request.hr_itemcount++;
+               printf("flags: %x\n", heat->lh_flags);
+               for (i = 0; i < heat->lh_count; i++)
+                       printf("%s: %llu\n", heat_names[i], heat->lh_heat[i]);
+next:
+               if (rc == 0 && rc2 < 0)
+                       rc = rc2;
+       }
 
+       free(heat);
        return rc;
 }
 
-static int lfs_hsm_request(int argc, char **argv, int action)
+static int lfs_heat_set(int argc, char **argv)
 {
-       struct option long_opts[] = {
-       { .val = 'a',   .name = "archive",      .has_arg = required_argument },
-       { .val = 'D',   .name = "data",         .has_arg = required_argument },
-       { .val = 'l',   .name = "filelist",     .has_arg = required_argument },
-       { .val = 'm',   .name = "mntpath",      .has_arg = required_argument },
-       { .name = NULL } };
-       dev_t                    last_dev = 0;
-       char                     short_opts[] = "l:D:a:m:";
-       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 = NULL;
-       char                    *mntpath = NULL;
-       int                      rc;
-
-       if (argc < 2)
+       struct option    long_opts[] = {
+               {"clear", no_argument, 0, 'c'},
+               {"off", no_argument, 0, 'o'},
+               {"on", no_argument, 0, 'O'},
+               {0, 0, 0, 0}
+       };
+       char             short_opts[] = "coO";
+       int              rc = 0, rc2;
+       char            *path;
+       int              fd;
+       __u64            flags = 0;
+       int              c;
+
+       if (argc <= 1)
                return CMD_HELP;
 
+       optind = 0;
        while ((c = getopt_long(argc, argv, short_opts,
                                long_opts, NULL)) != -1) {
                switch (c) {
-               case 'l':
-                       filelist = optarg;
+               case 'c':
+                       flags |= LU_HEAT_FLAG_CLEAR;
                        break;
-               case 'D':
-                       opaque = optarg;
+               case 'o':
+                       flags |= LU_HEAT_FLAG_CLEAR;
+                       flags |= LU_HEAT_FLAG_OFF;
                        break;
-               case 'a':
-                       if (action != HUA_ARCHIVE &&
-                           action != HUA_REMOVE) {
-                               fprintf(stderr,
-                                       "error: -a is supported only "
-                                       "when archiving or removing\n");
-                               return CMD_HELP;
-                       }
-                       archive_id = atoi(optarg);
+               case 'O':
+                       flags &= ~LU_HEAT_FLAG_OFF;
                        break;
-               case 'm':
-                       if (some_file == NULL) {
-                               mntpath = optarg;
-                               some_file = strdup(optarg);
-                       }
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (argc <= optind) {
+               fprintf(stderr, "%s: please give one or more file names\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       while (optind < argc) {
+               path = argv[optind++];
+
+               fd = open(path, O_RDONLY);
+               if (fd < 0) {
+                       fprintf(stderr, "%s: cannot open file '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       rc2 = -errno;
+                       goto next;
+               }
+
+               rc2 = llapi_heat_set(fd, flags);
+               close(fd);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot setflags heat of file '%s'"
+                               ": %s\n", argv[0], path, strerror(errno));
+                       goto next;
+               }
+next:
+               if (rc == 0 && rc2 < 0)
+                       rc = rc2;
+       }
+       return rc;
+}
+
+/** The input string contains a comma delimited list of component ids and
+ * ranges, for example "1,2-4,7".
+ */
+static int parse_mirror_ids(__u16 *ids, int size, char *arg)
+{
+       bool end_of_loop = false;
+       char *ptr = NULL;
+       int nr = 0;
+       int rc;
+
+       if (arg == NULL)
+               return -EINVAL;
+
+       while (!end_of_loop) {
+               int start_index;
+               int end_index;
+               int i;
+               char *endptr = NULL;
+
+               rc = -EINVAL;
+               ptr = strchrnul(arg, ',');
+               end_of_loop = *ptr == '\0';
+               *ptr = '\0';
+
+               start_index = strtol(arg, &endptr, 0);
+               if (endptr == arg) /* no data at all */
                        break;
-               case '?':
-                       return CMD_HELP;
-               default:
-                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                               argv[0], argv[optind - 1]);
-                       return CMD_HELP;
+               if (*endptr != '-' && *endptr != '\0') /* has invalid data */
+                       break;
+               if (start_index < 0)
+                       break;
+
+               end_index = start_index;
+               if (*endptr == '-') {
+                       end_index = strtol(endptr + 1, &endptr, 0);
+                       if (*endptr != '\0')
+                               break;
+                       if (end_index < start_index)
+                               break;
                }
-       }
 
-       /* All remaining args are files, so we have at least nbfile */
-       nbfile = argc - optind;
+               for (i = start_index; i <= end_index && size > 0; i++) {
+                       int j;
 
-       if ((nbfile == 0) && (filelist == NULL))
-               return CMD_HELP;
+                       /* remove duplicate */
+                       for (j = 0; j < nr; j++) {
+                               if (ids[j] == i)
+                                       break;
+                       }
+                       if (j == nr) { /* no duplicate */
+                               ids[nr++] = i;
+                               --size;
+                       }
+               }
 
-       if (opaque != NULL)
-               opaque_len = strlen(opaque);
+               if (size == 0 && i < end_index)
+                       break;
 
-       /* 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;
+               *ptr = ',';
+               arg = ++ptr;
+               rc = 0;
        }
-       nbfile_alloc = nbfile;
-
-       hur->hur_request.hr_action = action;
-       hur->hur_request.hr_archive_id = archive_id;
-       hur->hur_request.hr_flags = 0;
+       if (!end_of_loop && ptr != NULL)
+               *ptr = ',';
 
-       /* All remaining args are files, add them */
-       if (nbfile != 0 && some_file == NULL)
-               some_file = strdup(argv[optind]);
+       return rc < 0 ? rc : nr;
+}
 
-       for (i = 0; i < nbfile; i++) {
-               rc = fill_hur_item(hur, i, mntpath, argv[optind + i],
-                                  &last_dev);
-               if (rc)
-                       goto out_free;
-       }
+/**
+ * struct verify_mirror_id - Mirror id to be verified.
+ * @mirror_id:   A specified mirror id.
+ * @is_valid_id: @mirror_id is valid or not in the mirrored file.
+ */
+struct verify_mirror_id {
+       __u16 mirror_id;
+       bool is_valid_id;
+};
 
-       /* from here stop using nb_file, use hur->hur_request.hr_itemcount */
+/**
+ * compare_mirror_ids() - Compare mirror ids.
+ * @layout: Mirror component list.
+ * @cbdata: Callback data in verify_mirror_id structure.
+ *
+ * This is a callback function called by llapi_layout_comp_iterate()
+ * to compare the specified mirror id with the one in the current
+ * component of @layout. If they are the same, then the specified
+ * mirror id is valid.
+ *
+ * Return: a negative error code on failure or
+ *        LLAPI_LAYOUT_ITER_CONT: Proceed iteration
+ *        LLAPI_LAYOUT_ITER_STOP: Stop iteration
+ */
+static inline
+int compare_mirror_ids(struct llapi_layout *layout, void *cbdata)
+{
+       struct verify_mirror_id *mirror_id_cbdata =
+                                (struct verify_mirror_id *)cbdata;
+       uint32_t mirror_id;
+       int rc = 0;
 
-       /* 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;
-               }
+       rc = llapi_layout_mirror_id_get(layout, &mirror_id);
+       if (rc < 0) {
+               rc = -errno;
+               fprintf(stderr,
+                       "%s: llapi_layout_mirror_id_get failed: %s.\n",
+                       progname, strerror(errno));
+               return rc;
+       }
 
-               while ((rc = getline(&line, &len, fp)) != -1) {
-                       /* If allocated buffer was too small, get something
-                        * larger */
-                       if (nbfile_alloc <= hur->hur_request.hr_itemcount) {
-                               ssize_t size;
+       if (mirror_id_cbdata->mirror_id == mirror_id) {
+               mirror_id_cbdata->is_valid_id = true;
+               return LLAPI_LAYOUT_ITER_STOP;
+       }
 
-                               nbfile_alloc = nbfile_alloc * 2 + 1;
-                               oldhur = hur;
-                               hur = llapi_hsm_user_request_alloc(nbfile_alloc,
-                                                                  opaque_len);
-                               if (hur == NULL) {
-                                       fprintf(stderr, "hsm: cannot allocate "
-                                               "the request: %s\n",
-                                               strerror(errno));
-                                       hur = oldhur;
-                                       rc = -errno;
-                                       fclose(fp);
-                                       goto out_free;
-                               }
-                               size = hur_len(oldhur);
-                               if (size < 0) {
-                                       fprintf(stderr, "hsm: cannot allocate "
-                                               "%u files + %u bytes data\n",
-                                           oldhur->hur_request.hr_itemcount,
-                                           oldhur->hur_request.hr_data_len);
-                                       free(hur);
-                                       hur = oldhur;
-                                       rc = -E2BIG;
-                                       fclose(fp);
-                                       goto out_free;
-                               }
-                               memcpy(hur, oldhur, size);
-                               free(oldhur);
-                       }
+       return LLAPI_LAYOUT_ITER_CONT;
+}
 
-                       /* Chop CR */
-                       if (line[strlen(line) - 1] == '\n')
-                               line[strlen(line) - 1] = '\0';
+/**
+ * verify_mirror_ids() - Verify specified mirror ids.
+ * @fname:      Mirrored file name.
+ * @mirror_ids: Specified mirror ids to be verified.
+ * @ids_nr:     Number of specified mirror ids.
+ *
+ * This function verifies that specified @mirror_ids are valid
+ * in the mirrored file @fname.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+static inline
+int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr)
+{
+       struct llapi_layout *layout = NULL;
+       struct verify_mirror_id mirror_id_cbdata = { 0 };
+       struct stat stbuf;
+       uint32_t flr_state;
+       int i;
+       int fd;
+       int rc = 0;
+       int rc2 = 0;
 
-                       rc = fill_hur_item(hur, hur->hur_request.hr_itemcount,
-                                          mntpath, line, &last_dev);
-                       if (rc) {
-                               fclose(fp);
-                               goto out_free;
-                       }
+       if (ids_nr <= 0)
+               return -EINVAL;
 
-                       if (some_file == NULL) {
-                               some_file = line;
-                               line = NULL;
-                       }
-               }
+       if (stat(fname, &stbuf) < 0) {
+               fprintf(stderr, "%s: cannot stat file '%s': %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto error;
+       }
 
-               rc = fclose(fp);
-               free(line);
+       if (!S_ISREG(stbuf.st_mode)) {
+               fprintf(stderr, "%s: '%s' is not a regular file.\n",
+                       progname, fname);
+               rc = -EINVAL;
+               goto error;
        }
 
-       /* 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);
+       fd = open(fname, O_DIRECT | O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "%s: cannot open '%s': %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto error;
+       }
 
-       /* 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_lease_acquire(fd, LL_LEASE_RDLCK);
+       if (rc < 0) {
+               fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n",
+                       progname, fname, strerror(errno));
+               goto close_fd;
        }
-       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;
+
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               llapi_lease_release(fd);
+               goto close_fd;
        }
 
-out_free:
-       free(some_file);
-       free(hur);
-       return rc;
-}
+       rc = llapi_layout_flags_get(layout, &flr_state);
+       if (rc < 0) {
+               fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto free_layout;
+       }
 
-static int lfs_hsm_archive(int argc, char **argv)
-{
-       return lfs_hsm_request(argc, argv, HUA_ARCHIVE);
-}
+       flr_state &= LCM_FL_FLR_MASK;
+       switch (flr_state) {
+       case LCM_FL_NONE:
+               rc = -EINVAL;
+               fprintf(stderr, "%s: '%s' file state error: %s.\n",
+                       progname, fname, llapi_layout_flags_string(flr_state));
+               goto free_layout;
+       default:
+               break;
+       }
 
-static int lfs_hsm_restore(int argc, char **argv)
-{
-       return lfs_hsm_request(argc, argv, HUA_RESTORE);
-}
+       rc2 = 0;
+       for (i = 0; i < ids_nr; i++) {
+               mirror_id_cbdata.mirror_id = mirror_ids[i];
+               mirror_id_cbdata.is_valid_id = false;
 
-static int lfs_hsm_release(int argc, char **argv)
-{
-       return lfs_hsm_request(argc, argv, HUA_RELEASE);
-}
+               rc = llapi_layout_comp_iterate(layout, compare_mirror_ids,
+                                              &mirror_id_cbdata);
+               if (rc < 0) {
+                       rc = -errno;
+                       fprintf(stderr,
+                               "%s: '%s' failed to verify mirror id: %u.\n",
+                               progname, fname, mirror_ids[i]);
+                       goto free_layout;
+               }
 
-static int lfs_hsm_remove(int argc, char **argv)
-{
-       return lfs_hsm_request(argc, argv, HUA_REMOVE);
-}
+               if (!mirror_id_cbdata.is_valid_id) {
+                       rc2 = -EINVAL;
+                       fprintf(stderr,
+                               "%s: '%s' invalid specified mirror id: %u.\n",
+                               progname, fname, mirror_ids[i]);
+               }
+       }
+       rc = rc2;
 
-static int lfs_hsm_cancel(int argc, char **argv)
-{
-       return lfs_hsm_request(argc, argv, HUA_CANCEL);
+free_layout:
+       llapi_layout_free(layout);
+       llapi_lease_release(fd);
+close_fd:
+       close(fd);
+error:
+       return rc;
 }
 
-static int lfs_swap_layouts(int argc, char **argv)
+static inline
+int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
+                          __u16 *mirror_ids, int ids_nr)
 {
-       if (argc != 3)
-               return CMD_HELP;
-
-       return llapi_swap_layouts(argv[1], argv[2], 0, 0,
-                                 SWAP_LAYOUTS_KEEP_MTIME |
-                                 SWAP_LAYOUTS_KEEP_ATIME);
-}
+       struct llapi_resync_comp comp_array[1024] = { { 0 } };
+       struct llapi_layout *layout;
+       struct stat stbuf;
+       uint32_t flr_state;
+       uint64_t start;
+       uint64_t end;
+       int comp_size = 0;
+       int idx;
+       int fd;
+       int rc;
 
-static const char *const ladvise_names[] = LU_LADVISE_NAMES;
+       if (stat(fname, &stbuf) < 0) {
+               fprintf(stderr, "%s: cannot stat file '%s': %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto error;
+       }
+       if (!S_ISREG(stbuf.st_mode)) {
+               fprintf(stderr, "%s: '%s' is not a regular file.\n",
+                       progname, fname);
+               rc = -EINVAL;
+               goto error;
+       }
 
-static const char *const lock_mode_names[] = LOCK_MODE_NAMES;
+       fd = open(fname, O_DIRECT | O_RDWR);
+       if (fd < 0) {
+               fprintf(stderr, "%s: cannot open '%s': %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto error;
+       }
 
-int lfs_get_mode(const char *string)
-{
-       enum lock_mode_user mode;
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto close_fd;
+       }
 
-       for (mode = 0; mode < ARRAY_SIZE(lock_mode_names); mode++) {
-               if (lock_mode_names[mode] == NULL)
-                       continue;
-               if (strcmp(string, lock_mode_names[mode]) == 0)
-                       return mode;
+       rc = llapi_layout_flags_get(layout, &flr_state);
+       if (rc) {
+               fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n",
+                       progname, fname, strerror(errno));
+               rc = -errno;
+               goto free_layout;
        }
 
-       return -EINVAL;
-}
+       flr_state &= LCM_FL_FLR_MASK;
+       if (flr_state == LCM_FL_NONE) {
+               rc = -EINVAL;
+               fprintf(stderr, "%s: '%s' is not a FLR file.\n",
+                       progname, fname);
+               goto free_layout;
+       }
 
-static enum lu_ladvise_type lfs_get_ladvice(const char *string)
-{
-       enum lu_ladvise_type advice;
+       /* get stale component info */
+       comp_size = llapi_mirror_find_stale(layout, comp_array,
+                                           ARRAY_SIZE(comp_array),
+                                           mirror_ids, ids_nr);
+       if (comp_size <= 0) {
+               rc = comp_size;
+               goto free_layout;
+       }
 
-       for (advice = 0;
-            advice < ARRAY_SIZE(ladvise_names); advice++) {
-               if (ladvise_names[advice] == NULL)
-                       continue;
-               if (strcmp(string, ladvise_names[advice]) == 0)
-                       return advice;
+       ioc->lil_mode = LL_LEASE_WRLCK;
+       ioc->lil_flags = LL_LEASE_RESYNC;
+       rc = llapi_lease_set(fd, ioc);
+       if (rc < 0) {
+               if (rc == -EALREADY)
+                       rc = 0;
+               else
+                       fprintf(stderr,
+                           "%s: '%s' llapi_lease_get_ext resync failed: %s.\n",
+                               progname, fname, strerror(errno));
+               goto free_layout;
        }
 
-       return LU_LADVISE_INVALID;
-}
+       /* get the read range [start, end) */
+       start = comp_array[0].lrc_start;
+       end = comp_array[0].lrc_end;
+       for (idx = 1; idx < comp_size; idx++) {
+               if (comp_array[idx].lrc_start < start)
+                       start = comp_array[idx].lrc_start;
+               if (end < comp_array[idx].lrc_end)
+                       end = comp_array[idx].lrc_end;
+       }
 
-static int lfs_ladvise(int argc, char **argv)
-{
-       struct option long_opts[] = {
-       { .val = 'a',   .name = "advice",       .has_arg = required_argument },
-       { .val = 'b',   .name = "background",   .has_arg = no_argument },
-       { .val = 'e',   .name = "end",          .has_arg = required_argument },
-       { .val = 'l',   .name = "length",       .has_arg = required_argument },
-       { .val = 'm',   .name = "mode",         .has_arg = required_argument },
-       { .val = 's',   .name = "start",        .has_arg = required_argument },
-       { .val = 'u',   .name = "unset",        .has_arg = no_argument },
-       { .name = NULL } };
-       char                     short_opts[] = "a:be:l:m:s:u";
-       int                      c;
-       int                      rc = 0;
-       const char              *path;
-       int                      fd;
-       struct llapi_lu_ladvise  advice;
-       enum lu_ladvise_type     advice_type = LU_LADVISE_INVALID;
-       unsigned long long       start = 0;
-       unsigned long long       end = LUSTRE_EOF;
-       unsigned long long       length = 0;
-       unsigned long long       size_units;
-       unsigned long long       flags = 0;
-       int                      mode = 0;
+       rc = llapi_lease_check(fd);
+       if (rc != LL_LEASE_WRLCK) {
+               fprintf(stderr, "%s: '%s' lost lease lock.\n",
+                       progname, fname);
+               goto free_layout;
+       }
 
-       optind = 0;
-       while ((c = getopt_long(argc, argv, short_opts,
-                               long_opts, NULL)) != -1) {
-               switch (c) {
-               case 'a':
-                       advice_type = lfs_get_ladvice(optarg);
-                       if (advice_type == LU_LADVISE_INVALID) {
-                               fprintf(stderr, "%s: invalid advice type "
-                                       "'%s'\n", argv[0], optarg);
-                               fprintf(stderr, "Valid types:");
+       rc = llapi_mirror_resync_many(fd, layout, comp_array, comp_size,
+                                     start, end);
+       if (rc < 0)
+               fprintf(stderr, "%s: '%s' llapi_mirror_resync_many: %d.\n",
+                       progname, fname, rc);
 
-                               for (advice_type = 0;
-                                    advice_type < ARRAY_SIZE(ladvise_names);
-                                    advice_type++) {
-                                       if (ladvise_names[advice_type] == NULL)
-                                               continue;
-                                       fprintf(stderr, " %s",
-                                               ladvise_names[advice_type]);
-                               }
-                               fprintf(stderr, "\n");
+       /* prepare ioc for lease put */
+       ioc->lil_mode = LL_LEASE_UNLCK;
+       ioc->lil_flags = LL_LEASE_RESYNC_DONE;
+       ioc->lil_count = 0;
+       for (idx = 0; idx < comp_size; idx++) {
+               if (comp_array[idx].lrc_synced) {
+                       ioc->lil_ids[ioc->lil_count] = comp_array[idx].lrc_id;
+                       ioc->lil_count++;
+               }
+       }
 
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'b':
-                       flags |= LF_ASYNC;
-                       break;
-               case 'u':
-                       flags |= LF_UNSET;
-                       break;
-               case 'e':
-                       size_units = 1;
-                       rc = llapi_parse_size(optarg, &end,
-                                             &size_units, 0);
-                       if (rc) {
-                               fprintf(stderr, "%s: bad end offset '%s'\n",
-                                       argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 's':
-                       size_units = 1;
-                       rc = llapi_parse_size(optarg, &start,
-                                             &size_units, 0);
-                       if (rc) {
-                               fprintf(stderr, "%s: bad start offset "
-                                       "'%s'\n", argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'l':
-                       size_units = 1;
-                       rc = llapi_parse_size(optarg, &length,
-                                             &size_units, 0);
-                       if (rc) {
-                               fprintf(stderr, "%s: bad length '%s'\n",
-                                       argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'm':
-                       mode = lfs_get_mode(optarg);
-                       if (mode < 0) {
-                               fprintf(stderr, "%s: bad mode '%s', valid "
-                                                "modes are READ or WRITE\n",
+       rc = llapi_lease_set(fd, ioc);
+       if (rc <= 0) {
+               if (rc == 0) /* lost lease lock */
+                       rc = -EBUSY;
+               fprintf(stderr, "%s: resync file '%s' failed: %s.\n",
+                       progname, fname, strerror(errno));
+               goto free_layout;
+       }
+       /**
+        * llapi_lease_set returns lease mode when it request to unlock
+        * the lease lock
+        */
+       rc = 0;
+
+free_layout:
+       llapi_layout_free(layout);
+close_fd:
+       close(fd);
+error:
+       return rc;
+}
+
+static inline int lfs_mirror_resync(int argc, char **argv)
+{
+       struct ll_ioc_lease *ioc = NULL;
+       __u16 mirror_ids[128] = { 0 };
+       int ids_nr = 0;
+       int c;
+       int rc = 0;
+
+       struct option long_opts[] = {
+       { .val = 'o',   .name = "only",         .has_arg = required_argument },
+       { .name = NULL } };
+
+       while ((c = getopt_long(argc, argv, "o:", long_opts, NULL)) >= 0) {
+               switch (c) {
+               case 'o':
+                       rc = parse_mirror_ids(mirror_ids,
+                                       sizeof(mirror_ids) / sizeof(__u16),
+                                       optarg);
+                       if (rc < 0) {
+                               fprintf(stderr,
+                                       "%s: bad mirror ids '%s'.\n",
                                        argv[0], optarg);
-                               return CMD_HELP;
+                               goto error;
                        }
+                       ids_nr = rc;
                        break;
-               case '?':
-                       return CMD_HELP;
                default:
-                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                       fprintf(stderr, "%s: options '%s' unrecognized.\n",
                                argv[0], argv[optind - 1]);
-                       return CMD_HELP;
-               }
-       }
-
-       if (advice_type == LU_LADVISE_INVALID) {
-               fprintf(stderr, "%s: please give an advice type\n", argv[0]);
-               fprintf(stderr, "Valid types:");
-               for (advice_type = 0; advice_type < ARRAY_SIZE(ladvise_names);
-                    advice_type++) {
-                       if (ladvise_names[advice_type] == NULL)
-                               continue;
-                       fprintf(stderr, " %s", ladvise_names[advice_type]);
+                       rc = -EINVAL;
+                       goto error;
                }
-               fprintf(stderr, "\n");
-               return CMD_HELP;
        }
 
-       if (advice_type == LU_LADVISE_LOCKNOEXPAND) {
-               fprintf(stderr, "%s: Lock no expand advice is a per file "
-                                "descriptor advice, so when called from lfs, "
-                                "it does nothing.\n", argv[0]);
-               return CMD_HELP;
-       }
-
-       if (argc <= optind) {
-               fprintf(stderr, "%s: please give one or more file names\n",
-                       argv[0]);
-               return CMD_HELP;
+       if (argc == optind) {
+               fprintf(stderr, "%s: no file name given.\n", argv[0]);
+               rc = CMD_HELP;
+               goto error;
        }
 
-       if (end != LUSTRE_EOF && length != 0 && end != start + length) {
-               fprintf(stderr, "%s: conflicting arguments of -l and -e\n",
+       if (ids_nr > 0 && argc > optind + 1) {
+               fprintf(stderr,
+                   "%s: option '--only' cannot be used upon multiple files.\n",
                        argv[0]);
-               return CMD_HELP;
-       }
-
-       if (end == LUSTRE_EOF && length != 0)
-               end = start + length;
+               rc = CMD_HELP;
+               goto error;
 
-       if (end <= start) {
-               fprintf(stderr, "%s: range [%llu, %llu] is invalid\n",
-                       argv[0], start, end);
-               return CMD_HELP;
        }
 
-       if (advice_type != LU_LADVISE_LOCKAHEAD && mode != 0) {
-               fprintf(stderr, "%s: mode is only valid with lockahead\n",
-                       argv[0]);
-               return CMD_HELP;
+       if (ids_nr > 0) {
+               rc = verify_mirror_ids(argv[optind], mirror_ids, ids_nr);
+               if (rc < 0)
+                       goto error;
        }
 
-       if (advice_type == LU_LADVISE_LOCKAHEAD && mode == 0) {
-               fprintf(stderr, "%s: mode is required with lockahead\n",
-                       argv[0]);
-               return CMD_HELP;
+       /* set the lease on the file */
+       ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1);
+       if (ioc == NULL) {
+               fprintf(stderr, "%s: cannot alloc id array for ioc: %s.\n",
+                       argv[0], strerror(errno));
+               rc = -errno;
+               goto error;
        }
 
-       while (optind < argc) {
-               int rc2;
-
-               path = argv[optind++];
-
-               fd = open(path, O_RDONLY);
-               if (fd < 0) {
-                       fprintf(stderr, "%s: cannot open file '%s': %s\n",
-                               argv[0], path, strerror(errno));
-                       rc2 = -errno;
-                       goto next;
-               }
-
-               advice.lla_start = start;
-               advice.lla_end = end;
-               advice.lla_advice = advice_type;
-               advice.lla_value1 = 0;
-               advice.lla_value2 = 0;
-               advice.lla_value3 = 0;
-               advice.lla_value4 = 0;
-               if (advice_type == LU_LADVISE_LOCKAHEAD) {
-                       advice.lla_lockahead_mode = mode;
-                       advice.lla_peradvice_flags = flags;
-               }
-
-               rc2 = llapi_ladvise(fd, flags, 1, &advice);
-               close(fd);
-               if (rc2 < 0) {
-                       fprintf(stderr, "%s: cannot give advice '%s' to file "
-                               "'%s': %s\n", argv[0],
-                               ladvise_names[advice_type],
-                               path, strerror(errno));
-
-                       goto next;
-               }
+       for (; optind < argc; optind++) {
+               rc = lfs_mirror_resync_file(argv[optind], ioc,
+                                           mirror_ids, ids_nr);
+               /* ignore previous file's error, continue with next file */
 
-next:
-               if (rc == 0 && rc2 < 0)
-                       rc = rc2;
+               /* reset ioc */
+               memset(ioc, 0, sizeof(*ioc) + sizeof(__u32) * 4096);
        }
+
+       free(ioc);
+error:
        return rc;
 }
 
-/** The input string contains a comma delimited list of component ids and
- * ranges, for example "1,2-4,7".
- */
-static int parse_mirror_ids(__u16 *ids, int size, char *arg)
+static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id)
 {
-       bool end_of_loop = false;
-       char *ptr = NULL;
-       int nr = 0;
+       struct llapi_layout *layout;
        int rc;
 
-       if (arg == NULL)
-               return -EINVAL;
-
-       while (!end_of_loop) {
-               int start_index;
-               int end_index;
-               int i;
-               char *endptr = NULL;
-
-               rc = -EINVAL;
-               ptr = strchrnul(arg, ',');
-               end_of_loop = *ptr == '\0';
-               *ptr = '\0';
-
-               start_index = strtol(arg, &endptr, 0);
-               if (endptr == arg) /* no data at all */
-                       break;
-               if (*endptr != '-' && *endptr != '\0') /* has invalid data */
-                       break;
-               if (start_index < 0)
-                       break;
-
-               end_index = start_index;
-               if (*endptr == '-') {
-                       end_index = strtol(endptr + 1, &endptr, 0);
-                       if (*endptr != '\0')
-                               break;
-                       if (end_index < start_index)
-                               break;
-               }
-
-               for (i = start_index; i <= end_index && size > 0; i++) {
-                       int j;
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "could not get layout.\n");
+               return  -EINVAL;
+       }
 
-                       /* remove duplicate */
-                       for (j = 0; j < nr; j++) {
-                               if (ids[j] == i)
-                                       break;
-                       }
-                       if (j == nr) { /* no duplicate */
-                               ids[nr++] = i;
-                               --size;
-                       }
-               }
+       rc = llapi_layout_comp_iterate(layout, find_mirror_id, &mirror_id);
+       if (rc < 0) {
+               fprintf(stderr, "failed to iterate layout\n");
+               llapi_layout_free(layout);
 
-               if (size == 0 && i < end_index)
-                       break;
+               return rc;
+       } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
+               fprintf(stderr, "does not find mirror with ID %u\n", mirror_id);
+               llapi_layout_free(layout);
 
-               *ptr = ',';
-               arg = ++ptr;
-               rc = 0;
+               return -EINVAL;
        }
-       if (!end_of_loop && ptr != NULL)
-               *ptr = ',';
+       llapi_layout_free(layout);
 
-       return rc < 0 ? rc : nr;
+       return 0;
 }
 
 /**
- * struct verify_mirror_id - Mirror id to be verified.
- * @mirror_id:   A specified mirror id.
- * @is_valid_id: @mirror_id is valid or not in the mirrored file.
- */
-struct verify_mirror_id {
-       __u16 mirror_id;
-       bool is_valid_id;
-};
-
-/**
- * compare_mirror_ids() - Compare mirror ids.
- * @layout: Mirror component list.
- * @cbdata: Callback data in verify_mirror_id structure.
- *
- * This is a callback function called by llapi_layout_comp_iterate()
- * to compare the specified mirror id with the one in the current
- * component of @layout. If they are the same, then the specified
- * mirror id is valid.
- *
- * Return: a negative error code on failure or
- *        LLAPI_LAYOUT_ITER_CONT: Proceed iteration
- *        LLAPI_LAYOUT_ITER_STOP: Stop iteration
+ * Check whether two files are the same file
+ * \retval     0  same file
+ * \retval     1  not the same file
+ * \retval     <0 error code
  */
-static inline
-int compare_mirror_ids(struct llapi_layout *layout, void *cbdata)
+static inline int check_same_file(const char *f1, const char *f2)
 {
-       struct verify_mirror_id *mirror_id_cbdata =
-                                (struct verify_mirror_id *)cbdata;
-       uint32_t mirror_id;
-       int rc = 0;
-
-       rc = llapi_layout_mirror_id_get(layout, &mirror_id);
-       if (rc < 0) {
-               rc = -errno;
-               fprintf(stderr,
-                       "%s: llapi_layout_mirror_id_get failed: %s.\n",
-                       progname, strerror(errno));
-               return rc;
+       struct stat stbuf1;
+       struct stat stbuf2;
+
+       if (stat(f1, &stbuf1) < 0) {
+               fprintf(stderr, "%s: cannot stat file '%s': %s\n",
+                       progname, f1, strerror(errno));
+               return -errno;
        }
 
-       if (mirror_id_cbdata->mirror_id == mirror_id) {
-               mirror_id_cbdata->is_valid_id = true;
-               return LLAPI_LAYOUT_ITER_STOP;
+       if (stat(f2, &stbuf2) < 0) {
+               fprintf(stderr, "%s: cannot stat file '%s': %s\n",
+                       progname, f2, strerror(errno));
+               return -errno;
        }
 
-       return LLAPI_LAYOUT_ITER_CONT;
+       if (stbuf1.st_rdev == stbuf2.st_rdev &&
+           stbuf1.st_ino == stbuf2.st_ino)
+               return 0;
+
+       return 1;
 }
 
-/**
- * verify_mirror_ids() - Verify specified mirror ids.
- * @fname:      Mirrored file name.
- * @mirror_ids: Specified mirror ids to be verified.
- * @ids_nr:     Number of specified mirror ids.
- *
- * This function verifies that specified @mirror_ids are valid
- * in the mirrored file @fname.
- *
- * Return: 0 on success or a negative error code on failure.
- */
-static inline
-int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr)
+static inline int lfs_mirror_read(int argc, char **argv)
 {
-       struct llapi_layout *layout = NULL;
-       struct verify_mirror_id mirror_id_cbdata = { 0 };
-       struct stat stbuf;
-       uint32_t flr_state;
-       int i;
-       int fd;
-       int rc = 0;
-       int rc2 = 0;
+       int rc = CMD_HELP;
+       __u16 mirror_id = 0;
+       const char *outfile = NULL;
+       char *fname;
+       int fd = 0;
+       int outfd;
+       int c;
+       void *buf;
+       const size_t buflen = 4 << 20;
+       off_t pos;
+       struct option long_opts[] = {
+       { .val = 'N',   .name = "mirror-id",    .has_arg = required_argument },
+       { .val = 'o',   .name = "outfile",      .has_arg = required_argument },
+       { .name = NULL } };
 
-       if (ids_nr <= 0)
-               return -EINVAL;
+       while ((c = getopt_long(argc, argv, "N:o:", long_opts, NULL)) >= 0) {
+               char *end;
 
-       if (stat(fname, &stbuf) < 0) {
-               fprintf(stderr, "%s: cannot stat file '%s': %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto error;
+               switch (c) {
+               case 'N':
+                       mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || mirror_id == 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
+                               return rc;
+                       }
+                       break;
+               case 'o':
+                       outfile = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized.\n",
+                               progname, argv[optind - 1]);
+                       return -EINVAL;
+               }
        }
 
-       if (!S_ISREG(stbuf.st_mode)) {
-               fprintf(stderr, "%s: '%s' is not a regular file.\n",
-                       progname, fname);
-               rc = -EINVAL;
-               goto error;
+       if (argc == optind) {
+               fprintf(stderr, "%s %s: no mirrored file provided\n",
+                       progname, argv[0]);
+               return rc;
+       } else if (argc > optind + 1) {
+               fprintf(stderr, "%s %s: too many files\n", progname, argv[0]);
+               return rc;
        }
 
-       fd = open(fname, O_DIRECT | O_RDONLY);
-       if (fd < 0) {
-               fprintf(stderr, "%s: cannot open '%s': %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto error;
+       if (mirror_id == 0) {
+               fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+                       progname, argv[0]);
+               return rc;
        }
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
-       if (rc < 0) {
-               fprintf(stderr, "%s: '%s' llapi_lease_get failed: %s.\n",
-                       progname, fname, strerror(errno));
-               goto close_fd;
+       /* open mirror file */
+       fname = argv[optind];
+
+       if (outfile) {
+               rc = check_same_file(fname, outfile);
+               if (rc == 0) {
+                       fprintf(stderr,
+                       "%s %s: output file cannot be the mirrored file\n",
+                               progname, argv[0]);
+                       return -EINVAL;
+               }
+               if (rc < 0)
+                       return rc;
        }
 
-       layout = llapi_layout_get_by_fd(fd, 0);
-       if (layout == NULL) {
-               fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               llapi_lease_put(fd);
+       fd = open(fname, O_DIRECT | O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "%s %s: cannot open '%s': %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               return rc;
+       }
+
+       /* verify mirror id */
+       rc = verify_mirror_id_by_fd(fd, mirror_id);
+       if (rc) {
+               fprintf(stderr,
+                       "%s %s: cannot find mirror with ID %u in '%s'\n",
+                       progname, argv[0], mirror_id, fname);
                goto close_fd;
        }
 
-       rc = llapi_layout_flags_get(layout, &flr_state);
-       if (rc < 0) {
-               fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto free_layout;
+       /* open output file */
+       if (outfile) {
+               outfd = open(outfile, O_EXCL | O_WRONLY | O_CREAT, 0644);
+               if (outfd < 0) {
+                       fprintf(stderr, "%s %s: cannot create file '%s': %s\n",
+                               progname, argv[0], outfile, strerror(errno));
+                       rc = -errno;
+                       goto close_fd;
+               }
+       } else {
+               outfd = STDOUT_FILENO;
        }
 
-       flr_state &= LCM_FL_FLR_MASK;
-       switch (flr_state) {
-       case LCM_FL_NOT_FLR:
-               rc = -EINVAL;
-               fprintf(stderr, "%s: '%s' file state error: %s.\n",
-                       progname, fname, lcm_flags_string(flr_state));
-               goto free_layout;
-       default:
-               break;
+       /* allocate buffer */
+       rc = posix_memalign(&buf, sysconf(_SC_PAGESIZE), buflen);
+       if (rc) {
+               fprintf(stderr, "%s %s: posix_memalign returns %d\n",
+                               progname, argv[0], rc);
+               goto close_outfd;
        }
 
-       rc2 = 0;
-       for (i = 0; i < ids_nr; i++) {
-               mirror_id_cbdata.mirror_id = mirror_ids[i];
-               mirror_id_cbdata.is_valid_id = false;
+       pos = 0;
+       while (1) {
+               ssize_t bytes_read;
+               ssize_t written = 0;
 
-               rc = llapi_layout_comp_iterate(layout, compare_mirror_ids,
-                                              &mirror_id_cbdata);
-               if (rc < 0) {
-                       rc = -errno;
+               bytes_read = llapi_mirror_read(fd, mirror_id, buf, buflen, pos);
+               if (bytes_read < 0) {
+                       rc = bytes_read;
                        fprintf(stderr,
-                               "%s: '%s' failed to verify mirror id: %u.\n",
-                               progname, fname, mirror_ids[i]);
-                       goto free_layout;
+                               "%s %s: fail to read data from mirror %u: %s\n",
+                               progname, argv[0], mirror_id, strerror(-rc));
+                       goto free_buf;
                }
 
-               if (!mirror_id_cbdata.is_valid_id) {
-                       rc2 = -EINVAL;
+               /* EOF reached */
+               if (bytes_read == 0)
+                       break;
+
+               while (written < bytes_read) {
+                       ssize_t written2;
+
+                       written2 = write(outfd, buf + written,
+                                        bytes_read - written);
+                       if (written2 < 0) {
+                               fprintf(stderr,
+                                       "%s %s: fail to write %s: %s\n",
+                                       progname, argv[0], outfile ? : "STDOUT",
+                                       strerror(errno));
+                               rc = -errno;
+                               goto free_buf;
+                       }
+                       written += written2;
+               }
+
+               if (written != bytes_read) {
                        fprintf(stderr,
-                               "%s: '%s' invalid specified mirror id: %u.\n",
-                               progname, fname, mirror_ids[i]);
+               "%s %s: written %ld bytes does not match with %ld read.\n",
+                               progname, argv[0], written, bytes_read);
+                       rc = -EIO;
+                       goto free_buf;
                }
+
+               pos += bytes_read;
        }
-       rc = rc2;
 
-free_layout:
-       llapi_layout_free(layout);
-       llapi_lease_put(fd);
+       fsync(outfd);
+       rc = 0;
+
+free_buf:
+       free(buf);
+close_outfd:
+       if (outfile)
+               close(outfd);
 close_fd:
        close(fd);
-error:
+
        return rc;
 }
 
-static inline
-int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
-                          __u16 *mirror_ids, int ids_nr)
+static inline int lfs_mirror_write(int argc, char **argv)
 {
-       const char *progname = "lfs mirror resync";
-       struct llapi_resync_comp comp_array[1024] = { { 0 } };
-       struct llapi_layout *layout;
-       struct stat stbuf;
-       uint32_t flr_state;
-       int comp_size = 0;
-       int idx;
-       int fd;
-       int rc;
+       int rc = CMD_HELP;
+       __u16 mirror_id = 0;
+       const char *inputfile = NULL;
+       char *fname;
+       int fd = 0;
+       int inputfd;
+       int c;
+       void *buf;
+       const size_t buflen = 4 << 20;
+       off_t pos;
+       size_t page_size = sysconf(_SC_PAGESIZE);
+       struct ll_ioc_lease_id ioc;
 
-       if (stat(fname, &stbuf) < 0) {
-               fprintf(stderr, "%s: cannot stat file '%s': %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto error;
+       struct option long_opts[] = {
+       { .val = 'N',   .name = "mirror-id",    .has_arg = required_argument },
+       { .val = 'i',   .name = "inputfile",    .has_arg = required_argument },
+       { .name = NULL } };
+
+       while ((c = getopt_long(argc, argv, "N:i:", long_opts, NULL)) >= 0) {
+               char *end;
+
+               switch (c) {
+               case 'N':
+                       mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || mirror_id == 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
+                               return rc;
+                       }
+                       break;
+               case 'i':
+                       inputfile = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               progname, argv[optind - 1]);
+                       return -EINVAL;
+               }
        }
-       if (!S_ISREG(stbuf.st_mode)) {
-               fprintf(stderr, "%s: '%s' is not a regular file.\n",
-                       progname, fname);
-               rc = -EINVAL;
-               goto error;
+
+       if (argc == optind) {
+               fprintf(stderr, "%s %s: no mirrored file provided\n",
+                       progname, argv[0]);
+               return rc;
+       } else if (argc > optind + 1) {
+               fprintf(stderr, "%s %s: too many files\n", progname, argv[0]);
+               return rc;
        }
 
-       fd = open(fname, O_DIRECT | O_RDWR);
-       if (fd < 0) {
-               fprintf(stderr, "%s: cannot open '%s': %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto error;
+       if (mirror_id == 0) {
+               fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+                       progname, argv[0]);
+               return rc;
        }
 
-       ioc->lil_mode = LL_LEASE_WRLCK;
-       ioc->lil_flags = LL_LEASE_RESYNC;
-       rc = llapi_lease_set(fd, ioc);
-       if (rc < 0) {
-               fprintf(stderr, "%s: '%s' llapi_lease_set resync failed: "
-                       "%s.\n", progname, fname, strerror(errno));
-               goto close_fd;
+       /* open mirror file */
+       fname = argv[optind];
+
+       if (inputfile) {
+               rc = check_same_file(fname, inputfile);
+               if (rc == 0) {
+                       fprintf(stderr,
+                       "%s %s: input file cannot be the mirrored file\n",
+                               progname, argv[0]);
+                       return -EINVAL;
+               }
+               if (rc < 0)
+                       return rc;
        }
 
-       layout = llapi_layout_get_by_fd(fd, 0);
-       if (layout == NULL) {
-               fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
-               goto close_fd;
+       fd = open(fname, O_DIRECT | O_WRONLY);
+       if (fd < 0) {
+               fprintf(stderr, "%s %s: cannot open '%s': %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               return rc;
        }
 
-       rc = llapi_layout_flags_get(layout, &flr_state);
+       /* verify mirror id */
+       rc = verify_mirror_id_by_fd(fd, mirror_id);
        if (rc) {
-               fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n",
-                       progname, fname, strerror(errno));
-               rc = -errno;
+               fprintf(stderr,
+                       "%s %s: cannot find mirror with ID %u in '%s'\n",
+                       progname, argv[0], mirror_id, fname);
                goto close_fd;
        }
 
-       flr_state &= LCM_FL_FLR_MASK;
-       switch (flr_state) {
-       case LCM_FL_NOT_FLR:
-               rc = -EINVAL;
-       case LCM_FL_RDONLY:
-               fprintf(stderr, "%s: '%s' file state error: %s.\n",
-                       progname, fname, lcm_flags_string(flr_state));
-               goto close_fd;
-       default:
-               break;
+       /* open input file */
+       if (inputfile) {
+               inputfd = open(inputfile, O_RDONLY, 0644);
+               if (inputfd < 0) {
+                       fprintf(stderr, "%s %s: cannot open file '%s': %s\n",
+                               progname, argv[0], inputfile, strerror(errno));
+                       rc = -errno;
+                       goto close_fd;
+               }
+       } else {
+               inputfd = STDIN_FILENO;
        }
 
-       /* get stale component info */
-       comp_size = llapi_mirror_find_stale(layout, comp_array,
-                                           ARRAY_SIZE(comp_array),
-                                           mirror_ids, ids_nr);
-       if (comp_size < 0) {
-               rc = comp_size;
-               goto close_fd;
+       /* allocate buffer */
+       rc = posix_memalign(&buf, page_size, buflen);
+       if (rc) {
+               fprintf(stderr, "%s %s: posix_memalign returns %d\n",
+                       progname, argv[0], rc);
+               goto close_inputfd;
        }
 
-       idx = 0;
-       while (idx < comp_size) {
-               ssize_t result;
-               uint64_t end;
-               __u16 mirror_id;
-               int i;
+       /* prepare target mirror components instantiation */
+       ioc.lil_mode = LL_LEASE_WRLCK;
+       ioc.lil_flags = LL_LEASE_RESYNC;
+       ioc.lil_mirror_id = mirror_id;
+       rc = llapi_lease_set(fd, (struct ll_ioc_lease *)&ioc);
+       if (rc < 0) {
+               fprintf(stderr,
+                       "%s %s: '%s' llapi_lease_get_ext failed: %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               goto free_buf;
+       }
+
+       pos = 0;
+       while (1) {
+               ssize_t bytes_read;
+               ssize_t written;
+               size_t to_write;
 
                rc = llapi_lease_check(fd);
                if (rc != LL_LEASE_WRLCK) {
-                       fprintf(stderr, "%s: '%s' lost lease lock.\n",
-                               progname, fname);
-                       goto close_fd;
+                       fprintf(stderr, "%s %s: '%s' lost lease lock\n",
+                               progname, argv[0], fname);
+                       goto free_buf;
                }
 
-               mirror_id = comp_array[idx].lrc_mirror_id;
-               end = comp_array[idx].lrc_end;
-
-               /* try to combine adjacent component */
-               for (i = idx + 1; i < comp_size; i++) {
-                       if (mirror_id != comp_array[i].lrc_mirror_id ||
-                           end != comp_array[i].lrc_start)
-                               break;
-                       end = comp_array[i].lrc_end;
+               bytes_read = read(inputfd, buf, buflen);
+               if (bytes_read < 0) {
+                       rc = bytes_read;
+                       fprintf(stderr,
+                               "%s %s: fail to read data from '%s': %s\n",
+                               progname, argv[0], inputfile ? : "STDIN",
+                               strerror(errno));
+                       rc = -errno;
+                       goto free_buf;
                }
 
-               result = llapi_mirror_resync_one(fd, layout, mirror_id,
-                                                comp_array[idx].lrc_start,
-                                                end);
-               if (result < 0) {
-                       fprintf(stderr, "%s: '%s' llapi_mirror_resync_one: "
-                               "%ld.\n", progname, fname, result);
-                       rc = result;
-                       goto close_fd;
-               } else if (result > 0) {
-                       int j;
+               /* EOF reached */
+               if (bytes_read == 0)
+                       break;
 
-                       /* mark synced components */
-                       for (j = idx; j < i; j++)
-                               comp_array[j].lrc_synced = true;
+               /* round up to page align to make direct IO happy. */
+               to_write = (bytes_read + page_size - 1) & ~(page_size - 1);
+
+               written = llapi_mirror_write(fd, mirror_id, buf, to_write,
+                                            pos);
+               if (written < 0) {
+                       rc = written;
+                       fprintf(stderr,
+                             "%s %s: fail to write to mirror %u: %s\n",
+                               progname, argv[0], mirror_id,
+                               strerror(-rc));
+                       goto free_buf;
                }
 
-               idx = i;
+               pos += bytes_read;
        }
 
-       /* prepare ioc for lease put */
-       ioc->lil_mode = LL_LEASE_UNLCK;
-       ioc->lil_flags = LL_LEASE_RESYNC_DONE;
-       ioc->lil_count = 0;
-       for (idx = 0; idx < comp_size; idx++) {
-               if (comp_array[idx].lrc_synced) {
-                       ioc->lil_ids[ioc->lil_count] = comp_array[idx].lrc_id;
-                       ioc->lil_count++;
-               }
+       if (pos & (page_size - 1)) {
+               rc = llapi_mirror_truncate(fd, mirror_id, pos);
+               if (rc < 0)
+                       goto free_buf;
        }
 
-       llapi_layout_free(layout);
-
-       rc = llapi_lease_set(fd, ioc);
+       ioc.lil_mode = LL_LEASE_UNLCK;
+       ioc.lil_flags = LL_LEASE_RESYNC_DONE;
+       ioc.lil_count = 0;
+       rc = llapi_lease_set(fd, (struct ll_ioc_lease *)&ioc);
        if (rc <= 0) {
-               if (rc == 0) /* lost lease lock */
+               if (rc == 0)
                        rc = -EBUSY;
-               fprintf(stderr, "%s: resync file '%s' failed: %s.\n",
-                       progname, fname, strerror(errno));
-               goto close_fd;
+               fprintf(stderr,
+                       "%s %s: release lease lock of '%s' failed: %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               goto free_buf;
        }
-       /**
-        * llapi_lease_set returns lease mode when it request to unlock
-        * the lease lock
-        */
+
        rc = 0;
 
+free_buf:
+       free(buf);
+close_inputfd:
+       if (inputfile)
+               close(inputfd);
 close_fd:
        close(fd);
-error:
+
        return rc;
 }
 
-static inline int lfs_mirror_resync(int argc, char **argv)
+struct collect_ids_data {
+       __u16   *cid_ids;
+       int     cid_count;
+       __u16   cid_exclude;
+};
+
+static int collect_mirror_id(struct llapi_layout *layout, void *cbdata)
 {
-       struct ll_ioc_lease *ioc = NULL;
-       __u16 mirror_ids[128] = { 0 };
-       int ids_nr = 0;
+       struct collect_ids_data *cid = cbdata;
+       uint32_t id;
+       int rc;
+
+       rc = llapi_layout_mirror_id_get(layout, &id);
+       if (rc < 0)
+               return rc;
+
+       if ((__u16)id != cid->cid_exclude) {
+               int i;
+
+               for (i = 0; i < cid->cid_count; i++) {
+                       /* already collected the mirror id */
+                       if (id == cid->cid_ids[i])
+                               return LLAPI_LAYOUT_ITER_CONT;
+               }
+               cid->cid_ids[cid->cid_count] = id;
+               cid->cid_count++;
+       }
+
+       return LLAPI_LAYOUT_ITER_CONT;
+}
+
+static inline int get_other_mirror_ids(int fd, __u16 *ids, __u16 exclude_id)
+{
+       struct llapi_layout *layout;
+       struct collect_ids_data cid = { .cid_ids = ids,
+                                       .cid_count = 0,
+                                       .cid_exclude = exclude_id, };
+       int rc;
+
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "could not get layout\n");
+               return -EINVAL;
+       }
+
+       rc = llapi_layout_comp_iterate(layout, collect_mirror_id, &cid);
+       if (rc < 0) {
+               fprintf(stderr, "failed to iterate layout\n");
+               llapi_layout_free(layout);
+
+               return rc;
+       }
+       llapi_layout_free(layout);
+
+       return cid.cid_count;
+}
+
+static inline int lfs_mirror_copy(int argc, char **argv)
+{
+       int rc = CMD_HELP;
+       __u16 read_mirror_id = 0;
+       __u16 ids[128] = { 0 };
+       int count = 0;
+       struct llapi_layout *layout = NULL;
+       struct llapi_resync_comp comp_array[1024] = { { 0 } };
+       int comp_size = 0;
+       char *fname;
+       int fd = 0;
        int c;
-       int rc = 0;
+       int i;
+       ssize_t copied;
+       struct ll_ioc_lease *ioc = NULL;
+       struct ll_ioc_lease_id *resync_ioc;
 
        struct option long_opts[] = {
-       { .val = 'o',   .name = "only",         .has_arg = required_argument },
+       { .val = 'i',   .name = "read-mirror",  .has_arg = required_argument },
+       { .val = 'o',   .name = "write-mirror", .has_arg = required_argument },
        { .name = NULL } };
 
-       while ((c = getopt_long(argc, argv, "o:", long_opts, NULL)) >= 0) {
+       while ((c = getopt_long(argc, argv, "i:o:", long_opts, NULL)) >= 0) {
+               char *end;
+
                switch (c) {
-               case 'o':
-                       rc = parse_mirror_ids(mirror_ids,
-                                       sizeof(mirror_ids) / sizeof(__u16),
-                                       optarg);
-                       if (rc < 0) {
+               case 'i':
+                       read_mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || read_mirror_id == 0) {
                                fprintf(stderr,
-                                       "%s: bad mirror ids '%s'.\n",
-                                       argv[0], optarg);
-                               goto error;
+                                       "%s %s: invalid read mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
+                               return rc;
+                       }
+                       break;
+               case 'o':
+                       if (!strcmp(optarg, "-1")) {
+                               /* specify all other mirrors */
+                               ids[0] = (__u16)-1;
+                               count = 1;
+                       } else {
+                               count = parse_mirror_ids((__u16 *)ids,
+                                                        ARRAY_SIZE(ids),
+                                                        optarg);
+                               if (count < 0)
+                                       return rc;
                        }
-                       ids_nr = rc;
                        break;
                default:
-                       fprintf(stderr, "%s: options '%s' unrecognized.\n",
-                               argv[0], argv[optind - 1]);
-                       rc = -EINVAL;
-                       goto error;
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               progname, argv[optind - 1]);
+                       return -EINVAL;
                }
        }
 
        if (argc == optind) {
-               fprintf(stderr, "%s: no file name given.\n", argv[0]);
-               rc = CMD_HELP;
-               goto error;
+               fprintf(stderr, "%s %s: no mirrored file provided\n",
+                       progname, argv[0]);
+               return rc;
+       } else if (argc > optind + 1) {
+               fprintf(stderr, "%s %s: too many files\n", progname, argv[0]);
+               return rc;
        }
 
-       if (ids_nr > 0 && argc > optind + 1) {
-               fprintf(stderr, "%s: option '--only' cannot be used upon "
-                       "multiple files.\n", argv[0]);
-               rc = CMD_HELP;
-               goto error;
+       if (read_mirror_id == 0) {
+               fprintf(stderr,
+                       "%s %s: no valid read mirror ID %d is provided\n",
+                       progname, argv[0], read_mirror_id);
+               return rc;
+       }
 
+       if (count == 0) {
+               fprintf(stderr,
+                       "%s %s: no write mirror ID is provided\n",
+                       progname, argv[0]);
+               return rc;
        }
 
-       if (ids_nr > 0) {
-               rc = verify_mirror_ids(argv[optind], mirror_ids, ids_nr);
-               if (rc < 0)
-                       goto error;
+       for (i = 0; i < count; i++) {
+               if (read_mirror_id == ids[i]) {
+                       fprintf(stderr,
+                       "%s %s: read and write mirror ID cannot be the same\n",
+                               progname, argv[0]);
+                       return rc;
+               }
+       }
+
+       /* open mirror file */
+       fname = argv[optind];
+
+       fd = open(fname, O_DIRECT | O_RDWR);
+       if (fd < 0) {
+               fprintf(stderr, "%s %s: cannot open '%s': %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               return rc;
+       }
+
+       /* write to all other mirrors */
+       if (ids[0] == (__u16)-1) {
+               count = get_other_mirror_ids(fd, ids, read_mirror_id);
+               if (count <= 0) {
+                       rc = count;
+                       fprintf(stderr,
+                       "%s %s: failed to get other mirror ids in '%s': %d\n",
+                               progname, argv[0], fname, rc);
+                       goto close_fd;
+               }
+       }
+
+       /* verify mirror id */
+       rc = verify_mirror_id_by_fd(fd, read_mirror_id);
+       if (rc) {
+               fprintf(stderr,
+                       "%s %s: cannot find mirror with ID %u in '%s'\n",
+                       progname, argv[0], read_mirror_id, fname);
+               goto close_fd;
+       }
+
+       for (i = 0; i < count; i++) {
+               rc = verify_mirror_id_by_fd(fd, ids[i]);
+               if (rc) {
+                       fprintf(stderr,
+                       "%s %s: cannot find mirror with ID %u in '%s'\n",
+                               progname, argv[0], ids[i], fname);
+                       goto close_fd;
+               }
        }
 
-       /* set the lease on the file */
        ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1);
        if (ioc == NULL) {
-               fprintf(stderr, "%s: cannot alloc id array for ioc: %s.\n",
-                       argv[0], strerror(errno));
+               fprintf(stderr,
+                       "%s %s: cannot alloc comp id array for ioc: %s\n",
+                       progname, argv[0], strerror(errno));
                rc = -errno;
-               goto error;
+               goto close_fd;
        }
 
-       for (; optind < argc; optind++) {
-               rc = lfs_mirror_resync_file(argv[optind], ioc,
-                                           mirror_ids, ids_nr);
-               if (rc)
-                       fprintf(stderr, "%s: resync file '%s' failed: %d\n",
-                               argv[0], argv[optind], rc);
-               /* ignore previous file's error, continue with next file */
+       /* get stale component info */
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "%s %s: failed to get layout of '%s': %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               rc = -errno;
+               goto free_ioc;
+       }
+       comp_size = llapi_mirror_find_stale(layout, comp_array,
+                                           ARRAY_SIZE(comp_array),
+                                           ids, count);
+       llapi_layout_free(layout);
+       if (comp_size < 0) {
+               rc = comp_size;
+               goto free_ioc;
+       }
 
-               /* reset ioc */
-               memset(ioc, 0, sizeof(__u32) * 4096);
+       /* prepare target mirror components instantiation */
+       resync_ioc = (struct ll_ioc_lease_id *)ioc;
+       resync_ioc->lil_mode = LL_LEASE_WRLCK;
+       resync_ioc->lil_flags = LL_LEASE_RESYNC;
+       if (count == 1)
+               resync_ioc->lil_mirror_id = ids[0];
+       else
+               resync_ioc->lil_mirror_id = read_mirror_id | MIRROR_ID_NEG;
+       rc = llapi_lease_set(fd, ioc);
+       if (rc < 0) {
+               fprintf(stderr,
+                       "%s %s: '%s' llapi_lease_get_ext failed: %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               goto free_ioc;
+       }
+
+       copied = llapi_mirror_copy_many(fd, read_mirror_id, ids, count);
+       if (copied < 0) {
+               rc = copied;
+               fprintf(stderr, "%s %s: copy error: %d\n",
+                       progname, argv[0], rc);
+               goto free_ioc;
+       }
+
+       fprintf(stdout, "mirror copied successfully: ");
+       for (i = 0; i < copied; i++)
+               fprintf(stdout, "%d ", ids[i]);
+       fprintf(stdout, "\n");
+
+       ioc->lil_mode = LL_LEASE_UNLCK;
+       ioc->lil_flags = LL_LEASE_RESYNC_DONE;
+       ioc->lil_count = 0;
+       for (i = 0; i < comp_size; i++) {
+               int j;
+
+               for (j = 0; j < copied; j++) {
+                       if (comp_array[i].lrc_mirror_id != ids[j])
+                               continue;
+
+                       ioc->lil_ids[ioc->lil_count] = comp_array[i].lrc_id;
+                       ioc->lil_count++;
+               }
+       }
+       rc = llapi_lease_set(fd, ioc);
+       if (rc <= 0) {
+               if (rc == 0)
+                       rc = -EBUSY;
+               fprintf(stderr,
+                       "%s %s: release lease lock of '%s' failed: %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               goto free_ioc;
        }
 
+       rc = 0;
+
+free_ioc:
        free(ioc);
-error:
+close_fd:
+       close(fd);
+
        return rc;
 }
-
 /**
  * struct verify_chunk - Mirror chunk to be verified.
  * @chunk:        [start, end) of the chunk.
@@ -7474,8 +9525,6 @@ int lfs_mirror_verify_chunk(int fd, size_t file_size,
                for (i = 1; i < chunk->mirror_count; i++) {
                        if (crc_array[i] != crc_array[0]) {
                                rc = -EINVAL;
-                               if (!verbose)
-                                       goto error;
 
                                fprintf(stderr,
                                        "%s: chunk "DEXT" has different checksum value on mirror %u and mirror %u.\n",
@@ -7566,9 +9615,9 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr,
                goto error;
        }
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        if (rc < 0) {
-               fprintf(stderr, "%s: '%s' llapi_lease_get failed: %s.\n",
+               fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n",
                        progname, fname, strerror(errno));
                goto close_fd;
        }
@@ -7578,7 +9627,7 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr,
                fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
                        progname, fname, strerror(errno));
                rc = -errno;
-               llapi_lease_put(fd);
+               llapi_lease_release(fd);
                goto close_fd;
        }
 
@@ -7592,10 +9641,10 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr,
 
        flr_state &= LCM_FL_FLR_MASK;
        switch (flr_state) {
-       case LCM_FL_NOT_FLR:
+       case LCM_FL_NONE:
                rc = -EINVAL;
                fprintf(stderr, "%s: '%s' file state error: %s.\n",
-                       progname, fname, lcm_flags_string(flr_state));
+                       progname, fname, llapi_layout_flags_string(flr_state));
                goto free_layout;
        default:
                break;
@@ -7675,7 +9724,7 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr,
 
 free_layout:
        llapi_layout_free(layout);
-       llapi_lease_put(fd);
+       llapi_lease_release(fd);
 close_fd:
        close(fd);
 error:
@@ -7734,7 +9783,7 @@ static inline int lfs_mirror_verify(int argc, char **argv)
                        verbose++;
                        break;
                default:
-                       fprintf(stderr, "%s: options '%s' unrecognized.\n",
+                       fprintf(stderr, "%s: option '%s' unrecognized.\n",
                                progname, argv[optind - 1]);
                        rc = -EINVAL;
                        goto error;
@@ -7803,6 +9852,94 @@ static int lfs_mirror(int argc, char **argv)
        return rc < 0 ? -rc : rc;
 }
 
+static void lustre_som_swab(struct lustre_som_attrs *attrs)
+{
+#if __BYTE_ORDER == __BIG_ENDIAN
+       __swab16s(&attrs->lsa_valid);
+       __swab64s(&attrs->lsa_size);
+       __swab64s(&attrs->lsa_blocks);
+#endif
+}
+
+enum lfs_som_type {
+       LFS_SOM_SIZE = 0x1,
+       LFS_SOM_BLOCKS = 0x2,
+       LFS_SOM_FLAGS = 0x4,
+       LFS_SOM_ATTR_ALL = LFS_SOM_SIZE | LFS_SOM_BLOCKS |
+                          LFS_SOM_FLAGS,
+};
+
+static int lfs_getsom(int argc, char **argv)
+{
+       const char *path;
+       struct lustre_som_attrs *attrs;
+       char buf[sizeof(*attrs) + 64];
+       enum lfs_som_type type = LFS_SOM_ATTR_ALL;
+       int rc = 0, c;
+
+       while ((c = getopt(argc, argv, "sbf")) != -1) {
+               switch (c) {
+               case 's':
+                       type = LFS_SOM_SIZE;
+                       break;
+               case 'b':
+                       type = LFS_SOM_BLOCKS;
+                       break;
+               case 'f':
+                       type = LFS_SOM_FLAGS;
+                       break;
+               default:
+                       fprintf(stderr, "%s: invalid option '%c'\n",
+                               progname, optopt);
+                       return CMD_HELP;
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (argc != 1) {
+               fprintf(stderr, "%s: %s\n",
+                       progname, argc == 0 ? "miss file target" :
+                       "input more than 2 files");
+               return CMD_HELP;
+       }
+
+       path = argv[0];
+       attrs = (void *)buf;
+       rc = lgetxattr(path, "trusted.som", attrs, sizeof(buf));
+       if (rc < 0) {
+               rc = -errno;
+               fprintf(stderr, "%s failed to get som xattr: %s (%d)\n",
+                       argv[0], strerror(errno), errno);
+               return rc;
+       }
+
+       lustre_som_swab(attrs);
+
+       switch (type) {
+       case LFS_SOM_ATTR_ALL:
+               printf("file: %s size: %llu blocks: %llu flags: %x\n",
+                      path, attrs->lsa_size, attrs->lsa_blocks,
+                      attrs->lsa_valid);
+               break;
+       case LFS_SOM_SIZE:
+               printf("%llu\n", attrs->lsa_size);
+               break;
+       case LFS_SOM_BLOCKS:
+               printf("%llu\n", attrs->lsa_blocks);
+               break;
+       case LFS_SOM_FLAGS:
+               printf("%x\n", attrs->lsa_valid);
+               break;
+       default:
+               fprintf(stderr, "%s: unknown option\n", progname);
+               return CMD_HELP;
+       }
+
+       return 0;
+}
+
 /**
  * lfs_mirror_list_commands() - List lfs mirror commands.
  * @argc: The count of command line arguments.