Whamcloud - gitweb
LU-11367 som: integrate LSOM with lfs find
[fs/lustre-release.git] / lustre / utils / lfs.c
index fbddb03..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>
@@ -96,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);
@@ -116,15 +116,22 @@ 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_SPLIT,
@@ -159,10 +166,11 @@ static inline int lfs_mirror_split(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"                   \
-       "                 [--yaml|-y <yaml_template_file>]\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" \
@@ -185,7 +193,10 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\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"
+       "\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"  \
@@ -224,28 +235,28 @@ static inline int lfs_mirror_split(int argc, char **argv)
 
 #define MIGRATE_USAGE                                                  \
        SSM_CMD_COMMON("migrate  ")                                     \
-       "                 [--block|-b]\n"                               \
-       "                 [--non-block|-n]\n"                           \
-       "                 [--non-direct|-D]\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" \
-       "\tnon-direct:   Do not use direct I/O to copy file contents\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.
@@ -265,14 +276,28 @@ command_t mirror_cmdlist[] = {
          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>> [--destroy|-d] "
-       "[-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"
-       "\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" },
+       "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[,...]>] "
@@ -282,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" },
@@ -304,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"
@@ -326,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"
@@ -356,9 +386,9 @@ command_t cmdlist[] = {
        {"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] [--maxdepth|-D N]\n"
-        "     [[!] --mdt-index|--mdt|-m <uuid|index,...>]\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"
@@ -376,6 +406,7 @@ command_t cmdlist[] = {
         "     [[!] --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"
@@ -383,9 +414,9 @@ command_t cmdlist[] = {
         "\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 "
@@ -410,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"
@@ -425,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"
@@ -440,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]]"},
@@ -503,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"
@@ -524,8 +570,8 @@ command_t cmdlist[] = {
         "\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, "
@@ -545,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"},
@@ -572,9 +635,10 @@ static int check_hashtype(const char *hashtype)
 static const char *error_loc = "syserror";
 
 enum {
-       MIGRATION_NONBLOCK      = 1 << 0,
-       MIGRATION_MIRROR        = 1 << 1,
-       MIGRATION_NONDIRECT     = 1 << 2,
+       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,
@@ -1076,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;
 }
 
@@ -1235,12 +1302,14 @@ static inline int mirror_sanity_check_one(struct llapi_layout *layout)
  *            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 {
        MF_NO_VERIFY    = 0x1,
        MF_DESTROY      = 0x2,
+       MF_COMP_ID      = 0x4,
 };
 
 /**
@@ -1399,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);
@@ -1661,7 +1730,7 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list,
        return rc;
 }
 
-static int verify_id(struct llapi_layout *layout, void *cbdata)
+static int find_mirror_id(struct llapi_layout *layout, void *cbdata)
 {
        uint32_t id;
        int rc;
@@ -1676,7 +1745,21 @@ static int verify_id(struct llapi_layout *layout, void *cbdata)
        return LLAPI_LAYOUT_ITER_CONT;
 }
 
-static int mirror_split(const char *fname, __u16 mirror_id,
+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;
@@ -1690,7 +1773,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        int fd, fdv;
        int rc;
 
-       /* check fname contains mirror with mirror_id */
+       /* check fname contains mirror with mirror_id/comp_id */
        layout = llapi_layout_get_by_path(fname, 0);
        if (!layout) {
                fprintf(stderr,
@@ -1717,7 +1800,12 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                goto free_layout;
        }
 
-       rc = llapi_layout_comp_iterate(layout, verify_id, &mirror_id);
+       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);
@@ -1725,7 +1813,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
                fprintf(stderr,
                     "error %s: file '%s' does not contain mirror with id %u\n",
-                       progname, fname, mirror_id);
+                       progname, fname, id);
                goto free_layout;
        }
 
@@ -1742,7 +1830,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                fprintf(stderr, "error %s: file name of '%s' too long\n",
                        progname, fname);
                rc = -ERANGE;
-               goto free_layout;
+               goto close_fd;
        }
        strncpy(parent, fname, sizeof(parent));
        ptr = strrchr(parent, '/');
@@ -1751,7 +1839,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                        fprintf(stderr, "error %s: getcwd failed: %s\n",
                                progname, strerror(errno));
                        rc = -errno;
-                       goto free_layout;
+                       goto close_fd;
                }
        } else {
                if (ptr == parent)
@@ -1763,7 +1851,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        if (rc < 0) {
                fprintf(stderr, "%s: cannot get MDT index of '%s'\n",
                        progname, fname);
-               goto free_layout;
+               goto close_fd;
        }
 
        if (victim_file == NULL) {
@@ -1773,7 +1861,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                                                        O_LOV_DELAY_CREATE);
                } else {
                        snprintf(victim, sizeof(victim), "%s.mirror~%u",
-                                fname, mirror_id);
+                                fname, id);
                        fdv = open(victim, flags, S_IRUSR | S_IWUSR);
                }
        } else {
@@ -1808,7 +1896,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
        data->lil_count = 2;
        data->lil_ids[0] = fdv;
-       data->lil_ids[1] = mirror_id;
+       data->lil_ids[1] = id;
        rc = llapi_lease_set(fd, data);
        if (rc <= 0) {
                if (rc == 0) /* lost lease lock */
@@ -2187,59 +2275,74 @@ static int build_layout_from_yaml_node(struct cYAML *node,
        int rc = 0;
 
        while (node) {
-               string = node->cy_string;
-               /* skip leading lmm_ if present, to simplify parsing */
-               if (string != NULL && 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 (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++;
-                       }
-               } else if (node->cy_type == CYAML_TYPE_OBJECT) {
+               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;
        }
@@ -2459,6 +2562,8 @@ enum {
        LFS_MIRROR_FLAGS_OPT,
        LFS_MIRROR_ID_OPT,
        LFS_MIRROR_STATE_OPT,
+       LFS_LAYOUT_COPY,
+       LFS_MIRROR_INDEX_OPT,
 };
 
 /* functions */
@@ -2477,12 +2582,12 @@ static int lfs_setstripe_internal(int argc, char **argv,
        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;
@@ -2498,9 +2603,11 @@ static int lfs_setstripe_internal(int argc, char **argv,
        __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 },
@@ -2528,8 +2635,11 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        .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},
@@ -2542,7 +2652,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
 /* 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},
@@ -2582,8 +2693,9 @@ static int lfs_setstripe_internal(int argc, char **argv,
 
        snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
        progname = cmd;
-       while ((c = getopt_long(argc, argv, "bc:dDE:f:i:I:m:N::no:p:L:s:S:vy:",
-                               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. */
@@ -2657,6 +2769,10 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
                        break;
                }
+               case LFS_LAYOUT_COPY:
+                       from_copy = true;
+                       template = optarg;
+                       break;
                case 'b':
                        if (!migrate_mode) {
                                fprintf(stderr,
@@ -2728,6 +2844,20 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                }
                        }
                        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') {
@@ -2800,11 +2930,24 @@ static int lfs_setstripe_internal(int argc, char **argv,
                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) {
@@ -2863,8 +3006,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                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,
@@ -2873,9 +3016,9 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                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)
@@ -2905,6 +3048,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                goto usage_error;
                        }
                        migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
+                       migration_flags = MIGRATION_VERBOSE;
                        break;
                case 'y':
                        from_yaml = true;
@@ -3033,20 +3177,21 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        goto error;
        }
 
-       if (from_yaml && (setstripe_args_specified(&lsa) || layout != NULL)) {
+       if (from_yaml && from_copy) {
+               fprintf(stderr,
+                       "%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 (mdt_idx_arg != NULL && optind > 3) {
-               fprintf(stderr,
-                       "%s %s: option -m cannot be used with other options\n",
-                       progname, argv[0]);
-               goto usage_error;
-       }
-
        if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) {
                fprintf(stderr,
                        "%s %s: options --non-block and --block are mutually exclusive\n",
@@ -3054,21 +3199,67 @@ static int lfs_setstripe_internal(int argc, char **argv,
                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 */
@@ -3111,25 +3302,33 @@ static int lfs_setstripe_internal(int argc, char **argv,
 
                        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, osts);
+                                                  &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,
@@ -3150,18 +3349,22 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        result = mirror_extend(fname, mirror_list,
                                               mirror_flags);
                } else if (opc == SO_MIRROR_SPLIT) {
-                       if (mirror_id == 0) {
+                       if (mirror_id == 0 && comp_id == 0) {
                                fprintf(stderr,
-                                       "%s %s: no mirror id is specified\n",
+                       "%s %s: no mirror id or component id is specified\n",
                                        progname, argv[0]);
                                goto usage_error;
                        }
-                       result = mirror_split(fname, mirror_id, mirror_flags,
+                       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;
@@ -3169,7 +3372,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                } else {
                        result = llapi_file_open_param(fname,
                                                       O_CREAT | O_WRONLY,
-                                                      0644, param);
+                                                      0666, param);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -3184,6 +3387,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
        }
 
        free(param);
+       free(migrate_mdt_param.fp_lmv_md);
        llapi_layout_free(layout);
        lfs_mirror_list_free(mirror_list);
        return result2;
@@ -3203,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;
@@ -3309,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,
@@ -3373,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;
@@ -3386,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,
-                       "-0A:c:C:D:E:g:G:H:i:L:m:M:n: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;
@@ -3440,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;
@@ -3846,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;
@@ -3886,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,
@@ -3898,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 }*/
@@ -3919,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 },
@@ -3936,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;
@@ -3994,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;
@@ -4046,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;
@@ -4069,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;
@@ -4083,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,
@@ -4109,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;
@@ -4124,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)
@@ -4138,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",
@@ -4225,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':
@@ -4298,16 +4663,22 @@ enum mntdf_flags {
 #define RSF     "%4s"
 #define RDF     "%3d%%"
 
-static inline int obd_statfs_ratio(const struct obd_statfs *st)
+static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes)
 {
        double avail, used, ratio = 0;
 
-       avail = st->os_bavail;
-       used  = st->os_blocks - st->os_bfree;
+       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 + 0.5;
+               ratio = used / (used + avail) * 100;
 
-       return (int)ratio;
+       /* Round up to match df(1) usage percentage */
+       return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio;
 }
 
 static int showdf(char *mntdir, struct obd_statfs *stat,
@@ -4341,7 +4712,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        total = (stat->os_blocks * stat->os_bsize) >> shift;
                }
 
-               ratio = obd_statfs_ratio(stat);
+               ratio = obd_statfs_ratio(stat, flags & MNTDF_INODES);
 
                if (flags & MNTDF_COOKED) {
                        int i;
@@ -4482,6 +4853,8 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
        }
 
        for (tp = types; tp->st_name != NULL; tp++) {
+               bool have_ost = false;
+
                if (!(tp->st_op & ops))
                        continue;
 
@@ -4503,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)
@@ -4526,20 +4913,21 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
                                       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 (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;
                }
        }
 
@@ -4568,8 +4956,8 @@ static int ll_statfs_data_comp(const void *sd1, const void *sd2)
                                                sd_st;
        const struct obd_statfs *st2 = &((const struct ll_statfs_data *)sd2)->
                                                sd_st;
-       int r1 = obd_statfs_ratio(st1);
-       int r2 = obd_statfs_ratio(st2);
+       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 */
@@ -4610,7 +4998,13 @@ static int lfs_setdirstripe(int argc, char **argv)
        { .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
@@ -4662,6 +5056,9 @@ static int lfs_setdirstripe(int argc, char **argv)
                        }
                        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,
@@ -4682,7 +5079,7 @@ static int lfs_setdirstripe(int argc, char **argv)
                        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)
+#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");
@@ -4849,8 +5246,8 @@ static int lfs_setdirstripe(int argc, char **argv)
 
                                /* don't use server whose usage is above 90% */
                                while (nr != param->lsp_stripe_count &&
-                                      obd_statfs_ratio(&lsb->sb_buf[nr].sd_st)
-                                      > 90)
+                                      obd_statfs_ratio(&lsb->sb_buf[nr].sd_st,
+                                                       false) > 90)
                                        nr = MAX(param->lsp_stripe_count,
                                                 nr / 2);
 
@@ -4918,14 +5315,16 @@ static int lfs_rmentry(int argc, char **argv)
 
 static int lfs_mv(int argc, char **argv)
 {
-       struct  find_param param = {
+       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;
+       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 } };
@@ -4938,10 +5337,10 @@ static int lfs_mv(int argc, char **argv)
                                ", use '--mdt-index' or '-m' instead\n");
 #endif
                case 'm':
-                       param.fp_mdt_index = strtoul(optarg, &end, 0);
+                       lmu.lum_stripe_offset = strtoul(optarg, &end, 0);
                        if (*end != '\0') {
-                               fprintf(stderr, "%s: invalid MDT index'%s'\n",
-                                       argv[0], optarg);
+                               fprintf(stderr, "%s mv: bad MDT index '%s'\n",
+                                       progname, optarg);
                                return CMD_HELP;
                        }
                        break;
@@ -4949,27 +5348,31 @@ static int lfs_mv(int argc, char **argv)
                        param.fp_verbose = VERBOSE_DETAIL;
                        break;
                default:
-                       fprintf(stderr, "error: %s: unrecognized option '%s'\n",
-                               argv[0], argv[optind - 1]);
+                       fprintf(stderr, "%s mv: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
-       if (param.fp_mdt_index == -1) {
-               fprintf(stderr, "%s: MDT index must be specified\n", argv[0]);
+       if (lmu.lum_stripe_offset == -1) {
+               fprintf(stderr, "%s mv: MDT index must be specified\n",
+                       progname);
                return CMD_HELP;
        }
 
        if (optind >= argc) {
-               fprintf(stderr, "%s: missing operand path\n", argv[0]);
+               fprintf(stderr, "%s mv: DIR must be specified\n", progname);
                return CMD_HELP;
        }
 
+
+       /* 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: cannot migrate '%s' to MDT%04x: %s\n",
-                       argv[0], argv[optind], param.fp_mdt_index,
+               fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n",
+                       progname, argv[optind], param.fp_mdt_index,
                        strerror(-rc));
        return rc;
 }
@@ -5084,12 +5487,13 @@ static int lfs_getname(int argc, char **argv)
 
 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];
+       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;
 
        if (argc != 2) {
                fprintf(stderr, "%s check: server type must be specified\n",
@@ -5097,17 +5501,23 @@ static int lfs_check(int argc, char **argv)
                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");
+       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]);
@@ -5300,6 +5710,12 @@ quota_type:
                 return CMD_HELP;
         }
 
+       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;
+       }
+
         mnt = argv[optind];
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
@@ -5320,25 +5736,30 @@ quota_type:
 
 int lfs_setquota(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[] = {
+       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;
+       unsigned limit_mask = 0;
+       char *endptr;
+       bool use_default = false;
        int qtype;
 
        if (has_times_option(argc, argv))
@@ -5350,37 +5771,65 @@ int lfs_setquota(int argc, char **argv)
                                  * 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:g:i:I:p:u:",
+       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 (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);
+                                       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);
@@ -5443,13 +5892,29 @@ quota_type:
                return CMD_HELP;
        }
 
-       if (limit_mask == 0) {
+       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",
@@ -5459,42 +5924,50 @@ quota_type:
 
         mnt = argv[optind];
 
-        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 (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 & 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;
-                }
-        }
+               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;
+       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);
+       rc = llapi_quotactl(mnt, &qctl);
        if (rc) {
                if (*obd_type)
                        fprintf(stderr,
@@ -5563,15 +6036,22 @@ static void diff2str(time_t seconds, char *buf, time_t now)
 }
 
 static void print_quota_title(char *name, struct if_quotactl *qctl,
-                             bool human_readable)
+                             bool human_readable, bool show_default)
 {
-       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");
+       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)
@@ -5598,20 +6078,21 @@ static void kbytes2str(__u64 num, char *buf, int buflen, bool h)
 
 #define STRBUF_LEN     32
 static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
-                       int rc, bool h)
+                       int rc, bool h, bool show_default)
 {
-        time_t now;
+       time_t now;
 
-        time(&now);
+       time(&now);
 
-        if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) {
+       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 &&
+               if (dqb->dqb_bhardlimit &&
                    lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
                         bover = 1;
                 } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
@@ -5641,6 +6122,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
 
                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);
@@ -5661,15 +6145,23 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ?
                        "%s" : "[%s]", strbuf);
 
-               printf(" %7s%c %6s %7s %7s",
-                      numbuf[0], bover ? '*' : ' ', numbuf[1],
-                      numbuf[2], bover > 1 ? timebuf : "-");
+               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);
 
-               sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
-                       "%ju" : "[%ju]", (uintmax_t)dqb->dqb_curinodes);
+               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) ?
@@ -5681,7 +6173,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
                        "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit);
 
-               if (type != QC_OSTIDX)
+               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 : "-");
@@ -5732,7 +6226,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
                 }
 
                print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
-                           qctl->qc_valid, 0, h);
+                           qctl->qc_valid, 0, h, false);
                *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
                                   qctl->qc_dqblk.dqb_bhardlimit;
        }
@@ -5742,12 +6236,15 @@ out:
 }
 
 static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
-                          int verbose, int quiet, bool human_readable)
+                          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);
@@ -5769,8 +6266,31 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                }
        }
 
-       if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
-               print_quota_title(name, qctl, human_readable);
+       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);
@@ -5782,10 +6302,10 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
                 (QIF_LIMITS|QIF_USAGE));
 
-       print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable);
+       print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default);
 
-       if (qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO &&
-           verbose) {
+       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,
@@ -5799,6 +6319,14 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                       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. "
@@ -5973,16 +6501,23 @@ static int lfs_quota(int argc, char **argv)
        char *endptr;
        __u32 valid = QC_GENERAL, idx = 0;
        bool human_readable = false;
+       bool show_default = false;
        int qtype;
 
-       while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) {
+       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:
@@ -6039,7 +6574,7 @@ quota_type:
 
         /* 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) {
+           optind == argc - 1 && !show_default) {
 
                qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
                qctl.qc_valid = valid;
@@ -6058,35 +6593,45 @@ quota_type:
                                name = "<unknown>";
                        mnt = argv[optind];
                        rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
-                                             human_readable);
+                                             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 (optind + 2 != argc || qctl.qc_type == ALLQUOTA) {
+               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;
                }
 
-               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 (!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;
                }
+
                if (rc) {
                        qctl.qc_id = strtoul(name, &endptr, 10);
                        if (*endptr != '\0') {
@@ -6095,15 +6640,15 @@ quota_type:
                                return CMD_HELP;
                        }
                }
-               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;
        }
 
+       mnt = argv[optind];
+       rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
+                            human_readable, show_default);
        return rc;
 }
 #endif /* HAVE_SYS_QUOTA_H! */
@@ -6176,20 +6721,6 @@ static int lfs_flushctx(int argc, char **argv)
         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;
@@ -6208,16 +6739,18 @@ static int lfs_changelog(int argc, char **argv)
                 case 'f':
                         follow++;
                         break;
-                case '?':
-                        return CMD_HELP;
                 default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
+                       fprintf(stderr,
+                               "%s changelog: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                         return CMD_HELP;
                 }
         }
-        if (optind >= argc)
-                return CMD_HELP;
+       if (optind >= argc) {
+               fprintf(stderr, "%s changelog: mdtname must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
         mdd = argv[optind++];
         if (argc > optind)
@@ -6232,8 +6765,8 @@ static int lfs_changelog(int argc, char **argv)
                                   (follow ? CHANGELOG_FLAG_FOLLOW : 0),
                                   mdd, startrec);
        if (rc < 0) {
-               fprintf(stderr, "Can't start changelog: %s\n",
-                       strerror(errno = -rc));
+               fprintf(stderr, "%s changelog: cannot start changelog: %s\n",
+                       progname, strerror(errno = -rc));
                return rc;
        }
 
@@ -6243,8 +6776,9 @@ static int lfs_changelog(int argc, char **argv)
                                        CHANGELOG_EXTRA_FLAG_OMODE |
                                        CHANGELOG_EXTRA_FLAG_XATTR);
        if (rc < 0) {
-               fprintf(stderr, "Can't set xflags for changelog: %s\n",
-                       strerror(errno = -rc));
+               fprintf(stderr,
+                       "%s changelog: cannot set xflags for changelog: %s\n",
+                       progname, strerror(errno = -rc));
                return rc;
        }
 
@@ -6309,10 +6843,10 @@ static int lfs_changelog(int argc, char **argv)
                                if (omd->cr_openflags & MDS_FMODE_EXEC) {
                                        mode[2] = 'x';
                                } else {
-                                       if (omd->cr_openflags & FMODE_READ)
+                                       if (omd->cr_openflags & MDS_FMODE_READ)
                                                mode[0] = 'r';
                                        if (omd->cr_openflags &
-                                           (FMODE_WRITE |
+                                           (MDS_FMODE_WRITE |
                                             MDS_OPEN_TRUNC |
                                             MDS_OPEN_APPEND))
                                                mode[1] = 'w';
@@ -6350,14 +6884,15 @@ static int lfs_changelog(int argc, char **argv)
                printf("\n");
 
                llapi_changelog_free(&rec);
-        }
+       }
 
-        llapi_changelog_fini(&changelog_priv);
+       llapi_changelog_fini(&changelog_priv);
 
-        if (rc < 0)
-                fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc));
+       if (rc < 0)
+               fprintf(stderr, "%s changelog: cannot access changelog: %s\n",
+                       progname, strerror(errno = -rc));
 
-        return (rc == 1 ? 0 : rc);
+       return (rc == 1 ? 0 : rc);
 }
 
 static int lfs_changelog_clear(int argc, char **argv)
@@ -6402,36 +6937,55 @@ static int lfs_fid2path(int argc, char **argv)
        int lnktmp;
        int printcur = 0;
        int rc = 0;
+       char *endptr = NULL;
 
        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;
-                }
-        }
+               switch (rc) {
+               case 'c':
+                       printcur++;
+                       break;
+               case 'l':
+                       linkno = strtol(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
+                               fprintf(stderr,
+                                       "%s fid2path: invalid linkno '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'r':
+                       recno = strtoll(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
+                               fprintf(stderr,
+                                       "%s fid2path: invalid recno '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               default:
+                       fprintf(stderr,
+                               "%s fid2path: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
 
-       if (argc < 3)
+       if (argc < 3) {
+               fprintf(stderr,
+                       "%s fid2path: <fsname|rootpath> and <fid>... must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
 
        device = argv[optind++];
        path = calloc(1, PATH_MAX);
        if (path == NULL) {
-               fprintf(stderr, "error: Not enough memory\n");
-               return -errno;
+               rc = -errno;
+               fprintf(stderr,
+                       "%s fid2path: cannot allocate memory for path: %s\n",
+                       progname, strerror(-rc));
+               return rc;
        }
 
        rc = 0;
@@ -6446,8 +7000,9 @@ static int lfs_fid2path(int argc, char **argv)
                        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));
+                               fprintf(stderr,
+                                       "%s fid2path: cannot find '%s': %s\n",
+                                       progname, fid, strerror(errno = -rc2));
                                if (rc == 0)
                                        rc = rc2;
                                break;
@@ -6496,14 +7051,18 @@ static int lfs_path2fid(int argc, char **argv)
                        show_parents = true;
                        break;
                default:
-                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                               argv[0], argv[optind - 1]);
+                       fprintf(stderr,
+                               "%s path2fid: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
-       if (optind > argc - 1)
+       if (optind > argc - 1) {
+               fprintf(stderr, "%s path2fid: FILE... must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
        else if (optind < argc - 1)
                sep = ": ";
 
@@ -6538,8 +7097,9 @@ static int lfs_path2fid(int argc, char **argv)
                }
 
                if (err) {
-                       fprintf(stderr, "%s: can't get %sfid for %s: %s\n",
-                               argv[0], show_parents ? "parent " : "", *path,
+                       fprintf(stderr,
+                               "%s path2fid: cannot get %sfid for '%s': %s\n",
+                               progname, show_parents ? "parent " : "", *path,
                                strerror(-err));
                        if (rc == 0) {
                                rc = err;
@@ -6560,8 +7120,11 @@ static int lfs_data_version(int argc, char **argv)
        int c;
        int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
 
-       if (argc < 2)
+       if (argc < 2) {
+               fprintf(stderr, "%s data_version: FILE must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
 
        while ((c = getopt(argc, argv, "nrw")) != -1) {
                switch (c) {
@@ -6575,20 +7138,32 @@ static int lfs_data_version(int argc, char **argv)
                        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)
+       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)
-               err(errno, "cannot open file %s", path);
+       if (fd < 0) {
+               rc = -errno;
+               fprintf(stderr, "%s data_version: cannot open file '%s': %s\n",
+                       progname, path, strerror(-rc));
+               return rc;
+       }
 
        rc = llapi_get_data_version(fd, &data_version, data_version_flags);
        if (rc < 0)
-               err(errno, "cannot get version for %s", path);
+               fprintf(stderr,
+                       "%s data_version: cannot get version for '%s': %s\n",
+                       progname, path, strerror(-rc));
        else
                printf("%ju" "\n", (uintmax_t)data_version);
 
@@ -7344,6 +7919,131 @@ next:
        return rc;
 }
 
+
+static const char *const heat_names[] = LU_HEAT_NAMES;
+
+static int lfs_heat_get(int argc, char **argv)
+{
+       struct lu_heat  *heat;
+       int              rc = 0, rc2;
+       char            *path;
+       int              fd;
+       int              i;
+
+       if (argc <= 1)
+               return CMD_HELP;
+
+       heat = calloc(sizeof(*heat) + sizeof(__u64) * OBD_HEAT_COUNT, 1);
+       if (!heat) {
+               fprintf(stderr, "%s: memory allocation failed\n", argv[0]);
+               return -ENOMEM;
+       }
+
+       optind = 1;
+       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;
+               }
+
+               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;
+               }
+
+               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_heat_set(int argc, char **argv)
+{
+       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 'c':
+                       flags |= LU_HEAT_FLAG_CLEAR;
+                       break;
+               case 'o':
+                       flags |= LU_HEAT_FLAG_CLEAR;
+                       flags |= LU_HEAT_FLAG_OFF;
+                       break;
+               case 'O':
+                       flags &= ~LU_HEAT_FLAG_OFF;
+                       break;
+               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".
  */
@@ -7585,6 +8285,8 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
        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;
@@ -7657,51 +8359,29 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                goto free_layout;
        }
 
-       idx = 0;
-       while (idx < comp_size) {
-               ssize_t result;
-               uint64_t end;
-               __u16 mirror_id;
-               int i;
-
-               rc = llapi_lease_check(fd);
-               if (rc != LL_LEASE_WRLCK) {
-                       fprintf(stderr, "%s: '%s' lost lease lock.\n",
-                               progname, fname);
-                       goto free_layout;
-               }
-
-               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;
-               }
-
-               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 unlock;
-               } else if (result > 0) {
-                       int j;
-
-                       /* mark synced components */
-                       for (j = idx; j < i; j++)
-                               comp_array[j].lrc_synced = true;
-               }
+       /* 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;
+       }
 
-               idx = i;
+       rc = llapi_lease_check(fd);
+       if (rc != LL_LEASE_WRLCK) {
+               fprintf(stderr, "%s: '%s' lost lease lock.\n",
+                       progname, fname);
+               goto free_layout;
        }
 
-unlock:
+       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);
+
        /* prepare ioc for lease put */
        ioc->lil_mode = LL_LEASE_UNLCK;
        ioc->lil_flags = LL_LEASE_RESYNC_DONE;
@@ -7805,7 +8485,7 @@ static inline int lfs_mirror_resync(int argc, char **argv)
                /* ignore previous file's error, continue with next file */
 
                /* reset ioc */
-               memset(ioc, 0, sizeof(__u32) * 4096);
+               memset(ioc, 0, sizeof(*ioc) + sizeof(__u32) * 4096);
        }
 
        free(ioc);
@@ -7813,45 +8493,741 @@ error:
        return rc;
 }
 
-/**
- * struct verify_chunk - Mirror chunk to be verified.
- * @chunk:        [start, end) of the chunk.
- * @mirror_count: Number of mirror ids in @mirror_id array.
- * @mirror_id:    Array of valid mirror ids that cover the chunk.
- */
-struct verify_chunk {
-       struct lu_extent chunk;
-       unsigned int mirror_count;
-       __u16 mirror_id[LUSTRE_MIRROR_COUNT_MAX];
-};
-
-/**
- * print_chunks() - Print chunk information.
- * @fname:       Mirrored file name.
- * @chunks:      Array of chunks.
- * @chunk_count: Number of chunks in @chunks array.
- *
- * This function prints [start, end) of each chunk in @chunks
- * for mirrored file @fname, and also prints the valid mirror ids
- * that cover the chunk.
- *
- * Return: void.
- */
-static inline
-void print_chunks(const char *fname, struct verify_chunk *chunks,
-                 int chunk_count)
+static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id)
 {
-       int i;
-       int j;
+       struct llapi_layout *layout;
+       int rc;
 
-       fprintf(stdout, "Chunks to be verified in %s:\n", fname);
-       for (i = 0; i < chunk_count; i++) {
-               fprintf(stdout, DEXT, PEXT(&chunks[i].chunk));
+       layout = llapi_layout_get_by_fd(fd, 0);
+       if (layout == NULL) {
+               fprintf(stderr, "could not get layout.\n");
+               return  -EINVAL;
+       }
 
-               if (chunks[i].mirror_count == 0)
-                       fprintf(stdout, "\t[");
-               else {
-                       fprintf(stdout, "\t[%u", chunks[i].mirror_id[0]);
+       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);
+
+               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);
+
+               return -EINVAL;
+       }
+       llapi_layout_free(layout);
+
+       return 0;
+}
+
+/**
+ * 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 check_same_file(const char *f1, const char *f2)
+{
+       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 (stat(f2, &stbuf2) < 0) {
+               fprintf(stderr, "%s: cannot stat file '%s': %s\n",
+                       progname, f2, strerror(errno));
+               return -errno;
+       }
+
+       if (stbuf1.st_rdev == stbuf2.st_rdev &&
+           stbuf1.st_ino == stbuf2.st_ino)
+               return 0;
+
+       return 1;
+}
+
+static inline int lfs_mirror_read(int argc, char **argv)
+{
+       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 } };
+
+       while ((c = getopt_long(argc, argv, "N:o:", 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 'o':
+                       outfile = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized.\n",
+                               progname, argv[optind - 1]);
+                       return -EINVAL;
+               }
+       }
+
+       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;
+       }
+
+       if (mirror_id == 0) {
+               fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+                       progname, argv[0]);
+               return rc;
+       }
+
+       /* 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;
+       }
+
+       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;
+       }
+
+       /* 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;
+       }
+
+       /* 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;
+       }
+
+       pos = 0;
+       while (1) {
+               ssize_t bytes_read;
+               ssize_t written = 0;
+
+               bytes_read = llapi_mirror_read(fd, mirror_id, buf, buflen, pos);
+               if (bytes_read < 0) {
+                       rc = bytes_read;
+                       fprintf(stderr,
+                               "%s %s: fail to read data from mirror %u: %s\n",
+                               progname, argv[0], mirror_id, strerror(-rc));
+                       goto free_buf;
+               }
+
+               /* 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: written %ld bytes does not match with %ld read.\n",
+                               progname, argv[0], written, bytes_read);
+                       rc = -EIO;
+                       goto free_buf;
+               }
+
+               pos += bytes_read;
+       }
+
+       fsync(outfd);
+       rc = 0;
+
+free_buf:
+       free(buf);
+close_outfd:
+       if (outfile)
+               close(outfd);
+close_fd:
+       close(fd);
+
+       return rc;
+}
+
+static inline int lfs_mirror_write(int argc, char **argv)
+{
+       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;
+
+       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 (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;
+       }
+
+       if (mirror_id == 0) {
+               fprintf(stderr, "%s %s: no valid mirror ID is provided\n",
+                       progname, argv[0]);
+               return rc;
+       }
+
+       /* 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;
+       }
+
+       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;
+       }
+
+       /* 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;
+       }
+
+       /* 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;
+       }
+
+       /* 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;
+       }
+
+       /* 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: '%s' lost lease lock\n",
+                               progname, argv[0], fname);
+                       goto free_buf;
+               }
+
+               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;
+               }
+
+               /* EOF reached */
+               if (bytes_read == 0)
+                       break;
+
+               /* 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;
+               }
+
+               pos += bytes_read;
+       }
+
+       if (pos & (page_size - 1)) {
+               rc = llapi_mirror_truncate(fd, mirror_id, pos);
+               if (rc < 0)
+                       goto free_buf;
+       }
+
+       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)
+                       rc = -EBUSY;
+               fprintf(stderr,
+                       "%s %s: release lease lock of '%s' failed: %s\n",
+                       progname, argv[0], fname, strerror(errno));
+               goto free_buf;
+       }
+
+       rc = 0;
+
+free_buf:
+       free(buf);
+close_inputfd:
+       if (inputfile)
+               close(inputfd);
+close_fd:
+       close(fd);
+
+       return rc;
+}
+
+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 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 i;
+       ssize_t copied;
+       struct ll_ioc_lease *ioc = NULL;
+       struct ll_ioc_lease_id *resync_ioc;
+
+       struct option long_opts[] = {
+       { .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, "i:o:", long_opts, NULL)) >= 0) {
+               char *end;
+
+               switch (c) {
+               case 'i':
+                       read_mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || read_mirror_id == 0) {
+                               fprintf(stderr,
+                                       "%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;
+                       }
+                       break;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               progname, argv[optind - 1]);
+                       return -EINVAL;
+               }
+       }
+
+       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;
+       }
+
+       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;
+       }
+
+       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;
+               }
+       }
+
+       ioc = calloc(sizeof(*ioc) + sizeof(__u32) * 4096, 1);
+       if (ioc == NULL) {
+               fprintf(stderr,
+                       "%s %s: cannot alloc comp id array for ioc: %s\n",
+                       progname, argv[0], strerror(errno));
+               rc = -errno;
+               goto close_fd;
+       }
+
+       /* 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;
+       }
+
+       /* 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);
+close_fd:
+       close(fd);
+
+       return rc;
+}
+/**
+ * struct verify_chunk - Mirror chunk to be verified.
+ * @chunk:        [start, end) of the chunk.
+ * @mirror_count: Number of mirror ids in @mirror_id array.
+ * @mirror_id:    Array of valid mirror ids that cover the chunk.
+ */
+struct verify_chunk {
+       struct lu_extent chunk;
+       unsigned int mirror_count;
+       __u16 mirror_id[LUSTRE_MIRROR_COUNT_MAX];
+};
+
+/**
+ * print_chunks() - Print chunk information.
+ * @fname:       Mirrored file name.
+ * @chunks:      Array of chunks.
+ * @chunk_count: Number of chunks in @chunks array.
+ *
+ * This function prints [start, end) of each chunk in @chunks
+ * for mirrored file @fname, and also prints the valid mirror ids
+ * that cover the chunk.
+ *
+ * Return: void.
+ */
+static inline
+void print_chunks(const char *fname, struct verify_chunk *chunks,
+                 int chunk_count)
+{
+       int i;
+       int j;
+
+       fprintf(stdout, "Chunks to be verified in %s:\n", fname);
+       for (i = 0; i < chunk_count; i++) {
+               fprintf(stdout, DEXT, PEXT(&chunks[i].chunk));
+
+               if (chunks[i].mirror_count == 0)
+                       fprintf(stdout, "\t[");
+               else {
+                       fprintf(stdout, "\t[%u", chunks[i].mirror_id[0]);
                        for (j = 1; j < chunks[i].mirror_count; j++)
                                fprintf(stdout, ", %u", chunks[i].mirror_id[j]);
                }
@@ -8149,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",
@@ -8409,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;
@@ -8478,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.