Whamcloud - gitweb
LU-13559 utils: fix lfs mirror delete error message
[fs/lustre-release.git] / lustre / utils / lfs.c
index 089284d..1753019 100644 (file)
 #include <libcfs/util/string.h>
 #include <libcfs/util/ioctl.h>
 #include <libcfs/util/parser.h>
+#include <libcfs/util/string.h>
 #include <lustre/lustreapi.h>
 #include <linux/lustre/lustre_ver.h>
 #include <linux/lustre/lustre_param.h>
 #include <linux/lnet/nidstr.h>
-#include <cyaml.h>
+#include <lnetconfig/cyaml.h>
 
 #ifndef ARRAY_SIZE
 # define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
@@ -98,13 +99,12 @@ 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);
 static int lfs_fid2path(int argc, char **argv);
 static int lfs_path2fid(int argc, char **argv);
+static int lfs_rmfid(int argc, char **argv);
 static int lfs_data_version(int argc, char **argv);
 static int lfs_hsm_state(int argc, char **argv);
 static int lfs_hsm_set(int argc, char **argv);
@@ -119,6 +119,8 @@ 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);
@@ -126,6 +128,18 @@ 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);
+static int lfs_pcc_attach(int argc, char **argv);
+static int lfs_pcc_attach_fid(int argc, char **argv);
+static int lfs_pcc_detach(int argc, char **argv);
+static int lfs_pcc_detach_fid(int argc, char **argv);
+static int lfs_pcc_state(int argc, char **argv);
+static int lfs_pcc(int argc, char **argv);
+static int lfs_pcc_list_commands(int argc, char **argv);
+static int lfs_migrate_to_dom(int fd, int fdv, char *name,
+                             __u64 migration_flags,
+                             struct llapi_stripe_param *param,
+                             struct llapi_layout *layout);
 
 enum setstripe_origin {
        SO_SETSTRIPE,
@@ -134,6 +148,7 @@ enum setstripe_origin {
        SO_MIRROR_CREATE,
        SO_MIRROR_EXTEND,
        SO_MIRROR_SPLIT,
+       SO_MIRROR_DELETE,
 };
 static int lfs_setstripe_internal(int argc, char **argv,
                                  enum setstripe_origin opc);
@@ -158,25 +173,39 @@ static inline int lfs_mirror_split(int argc, char **argv)
 {
        return lfs_setstripe_internal(argc, argv, SO_MIRROR_SPLIT);
 }
+static inline int lfs_mirror_delete(int argc, char **argv)
+{
+       return lfs_setstripe_internal(argc, argv, SO_MIRROR_DELETE);
+}
 
 /* Setstripe and migrate share mostly the same parameters */
 #define SSM_CMD_COMMON(cmd) \
        "usage: "cmd" [--component-end|-E <comp_end>]\n"                \
        "                 [--stripe-count|-c <stripe_count>]\n"         \
+       "                 [--overstripe-count|-C <stripe_count>]\n"     \
        "                 [--stripe-index|-i <start_ost_idx>]\n"        \
        "                 [--stripe-size|-S <stripe_size>]\n"           \
+       "                 [--extension-size|--ext-size|-z]\n"           \
        "                 [--layout|-L <pattern>]\n"                    \
-       "                 [--pool|-p <pool_name>]\n"                    \
+       "                 [--mirror_count|-N[mirror_count]]\n"          \
        "                 [--ost|-o <ost_indices>]\n"                   \
+       "                 [--pool|-p <pool_name>]\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" \
+       "\t              Using -C instead of -c allows overstriping, which\n" \
+       "\t              will place more than one stripe per OST if\n" \
+       "\t              stripe_count is greater than the number of OSTs\n" \
        "\tstart_ost_idx: OST index of first stripe (-1=default round robin)\n"\
        "\tstripe_size:  Number of bytes on each OST (0=fs default)\n" \
        "\t              Can be specified with K, M or G (for KB, MB, GB\n" \
        "\t              respectively)\n"                               \
+       "\textension_size:\n"                                           \
+       "\t              Number of bytes the previous component is extended\n" \
+       "\t              each time. Can be specified with K, M, G (for KB,\n" \
+       "\t              MB, GB respectively)\n"                        \
        "\tpool_name:    Name of OST pool to use (default none)\n"      \
        "\tlayout:       stripe pattern type: raid0, mdt (default raid0)\n"\
        "\tost_indices:  List of OST indices, can be repeated multiple times\n"\
@@ -184,7 +213,7 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\t                -o <ost_1>,<ost_i>-<ost_j>,<ost_n>\n"        \
        "\t              Or:\n"                                         \
        "\t                -o <ost_1> -o <ost_i>-<ost_j> -o <ost_n>\n"  \
-       "\t              If --pool is set with --ost, then the OSTs\n"  \
+       "\t              If --pool is set with --ost then the OSTs\n"   \
        "\t              must be the members of the pool.\n"            \
        "\tcomp_end:     Extent end of component, start after previous end.\n"\
        "\t              Can be specified with K, M or G (for KB, MB, GB\n" \
@@ -204,7 +233,7 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\t              it must follow the option without a space.\n"         \
        "\t              The option can also be repeated multiple times to\n"  \
        "\t              separate mirrors that have different layouts.\n"      \
-       "\tsetstripe options: Mirror layout\n"                                 \
+       "\tSETSTRIPE_OPTIONS: Mirror layout as with 'setstripe'\n"             \
        "\t              It can be a plain layout or a composite layout.\n"    \
        "\t              If not specified, the stripe options inherited\n"     \
        "\t              from the previous component will be used.\n"          \
@@ -221,8 +250,8 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\t              file.\n"
 
 #define MIRROR_EXTEND_USAGE                                                   \
-       "                 <--mirror-count|-N[mirror_count]>\n"                 \
-       "                 [setstripe options|-f <victim_file>]\n"              \
+       "                 {--mirror-count|-N[mirror_count]}\n"                 \
+       "                 [SETSTRIPE_OPTIONS|-f|--file <victim_file>]\n"       \
        "                 [--no-verify]\n"
 
 #define SETSTRIPE_USAGE                                                        \
@@ -246,16 +275,22 @@ static inline int lfs_mirror_split(int argc, char **argv)
 
 #define SETDIRSTRIPE_USAGE                                             \
        "               [--mdt-count|-c stripe_count>\n"                \
-       "               [--mdt-index|-i mdt_index[,mdt_index,...]\n"    \
        "               [--mdt-hash|-H mdt_hash]\n"                     \
-       "               [--default|-D] [--mode|-m mode] <dir>\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"            \
+       "       crush     CRUSH hash algorithm (default)\n" \
+       "       fnv_1a_64 FNV-1a hash algorithm\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" \
+       "To create dir with a foreign (free format) layout :\n" \
+       "setdirstripe|mkdir --foreign[=<foreign_type>] -x|-xattr <string> " \
+               "[--mode|-o mode] [--flags <hex>] <dir>\n" \
+       "\tmode: the mode of the directory\n" \
+       "\tforeign_type: none or daos\n"
 
 /**
  * command_t mirror_cmdlist - lfs mirror commands.
@@ -265,22 +300,29 @@ command_t mirror_cmdlist[] = {
          .pc_help = "Create a mirrored file.\n"
                "usage: lfs mirror create "
                "<--mirror-count|-N[mirror_count]> "
-               "[setstripe options] ... <filename|directory>\n"
+               "[SETSTRIPE_OPTIONS] ... <filename|directory> ...\n"
          MIRROR_CREATE_HELP },
+       { .pc_name = "delete", .pc_func = lfs_mirror_delete,
+         .pc_help = "Delete a mirror from a file.\n"
+       "usage: lfs mirror delete {--mirror-id <mirror_id> |\n"
+       "\t               --component-id|--comp-id|-I <comp_id> |\n"
+       "\t               -p <pool>} <mirrored_file> ...\n"
+       },
        { .pc_name = "extend", .pc_func = lfs_mirror_extend,
          .pc_help = "Extend a mirrored file.\n"
                "usage: lfs mirror extend "
                "<--mirror-count|-N[mirror_count]> [--no-verify] "
-               "[setstripe options|-f <victim_file>] ... <filename>\n"
+               "[SETSTRIPE_OPTIONS|-f <victim_file>] ... <filename> ...\n"
          MIRROR_EXTEND_HELP },
        { .pc_name = "split", .pc_func = lfs_mirror_split,
          .pc_help = "Split a mirrored file.\n"
-       "usage: lfs mirror split <--mirror-id <mirror_id> | \n"
-       "\t             <--component-id|-I <comp_id>> [--destroy|-d] \n"
-       "\t             [-f <new_file>] <mirrored file>\n"
+       "usage: lfs mirror split <--mirror-id <mirror_id> |\n"
+       "\t             --component-id|-I <comp_id>|-p <pool>> [--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"
+       "\tpool:        Components on specified pool.\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"
@@ -293,6 +335,10 @@ command_t mirror_cmdlist[] = {
          .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[,...]>] "
@@ -310,22 +356,54 @@ command_t mirror_cmdlist[] = {
        { .pc_help = NULL }
 };
 
+/**
+ * command_t pcc_cmdlist - lfs pcc commands.
+ */
+command_t pcc_cmdlist[] = {
+       { .pc_name = "attach", .pc_func = lfs_pcc_attach,
+         .pc_help = "Attach given files to the Persistent Client Cache.\n"
+               "usage: lfs pcc attach <--id|-i NUM> <file> ...\n"
+               "\t-i: archive id for RW-PCC\n" },
+       { .pc_name = "attach_fid", .pc_func = lfs_pcc_attach_fid,
+         .pc_help = "Attach given files into PCC by FID(s).\n"
+               "usage: lfs pcc attach_id <--id|-i NUM> <--mnt|-m mnt> "
+               "<fid> ...\n"
+               "\t-i: archive id for RW-PCC\n"
+               "\t-m: Lustre mount point\n" },
+       { .pc_name = "state", .pc_func = lfs_pcc_state,
+         .pc_help = "Display the PCC state for given files.\n"
+               "usage: lfs pcc state <file> ...\n" },
+       { .pc_name = "detach", .pc_func = lfs_pcc_detach,
+         .pc_help = "Detach given files from the Persistent Client Cache.\n"
+               "usage: lfs pcc detach <file> ...\n" },
+       { .pc_name = "detach_fid", .pc_func = lfs_pcc_detach_fid,
+         .pc_help = "Detach given files from PCC by FID(s).\n"
+               "usage: lfs pcc detach_fid <mntpath> <fid>...\n" },
+       { .pc_name = "list-commands", .pc_func = lfs_pcc_list_commands,
+         .pc_help = "list commands supported by lfs pcc"},
+       { .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" },
+       { .pc_name = "exit", .pc_func = Parser_quit, .pc_help = "quit" },
+       { .pc_name = "quit", .pc_func = Parser_quit, .pc_help = "quit" },
+       { .pc_help = NULL }
+};
+
 /* all available commands */
 command_t cmdlist[] = {
        {"setstripe", lfs_setstripe, 0,
         "To create a file with specified striping/composite layout, or\n"
         "create/replace the default layout on an existing directory:\n"
         SSM_CMD_COMMON("setstripe")
+        "                 [--mode <mode>]\n"
         "                 <directory|filename>\n"
         " or\n"
         "To add component(s) to an existing composite file:\n"
         SSM_CMD_COMMON("setstripe --component-add")
         SSM_HELP_COMMON
         "To totally delete the default striping from an existing directory:\n"
-        "usage: setstripe -d <directory>\n"
+        "usage: setstripe [--delete|-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"
+        "usage: setstripe {--mirror-count|-N}[mirror_count] [SETSTRIPE_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"
@@ -335,7 +413,11 @@ command_t cmdlist[] = {
         "\tcomp_id:     Unique component ID to delete\n"
         "\tcomp_flags:  'init' indicating all instantiated components\n"
         "\t             '^init' indicating all uninstantiated components\n"
-        "\t-I and -F cannot be specified at the same time\n"},
+        "\t-I and -F cannot be specified at the same time\n"
+        "To create a file with a foreign (free format) layout:\n"
+        "usage: setstripe --foreign[=<foreign_type>]\n"
+        "                 --xattr|-x <layout_string> [--flags <hex>]\n"
+        "                 [--mode <mode>] <filename>\n"},
        {"getstripe", lfs_getstripe, 0,
         "To list the layout pattern for a given file or files in a\n"
         "directory or recursively for all files in a directory tree.\n"
@@ -347,14 +429,15 @@ command_t cmdlist[] = {
         "                 [--component-id[=comp_id]|-I[comp_id]]\n"
         "                 [--component-flags[=comp_flags]]\n"
         "                 [--component-count]\n"
+        "                 [--extension-size|--ext-size|-z]\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"
-        "be done on MDT0 with the right of administrator.\n"
+        "Create striped directory on specified MDT, same as mkdir.\n"
+        "May be restricted to root or group users, depending on settings.\n"
         "usage: setdirstripe [OPTION] <directory>\n"
         SETDIRSTRIPE_USAGE},
        {"getdirstripe", lfs_getdirstripe, 0,
@@ -363,10 +446,9 @@ command_t cmdlist[] = {
         "usage: getdirstripe [--mdt-count|-c] [--mdt-index|-m|-i]\n"
         "                    [--mdt-hash|-H] [--obd|-O <uuid>]\n"
         "                    [--recursive|-r] [--yaml|-y]\n"
-        "                    [--default|-D] <dir> ..."},
+        "                    [--verbose|-v] [--default|-D] <dir> ..."},
        {"mkdir", lfs_setdirstripe, 0,
-        "To create a striped directory on a specified MDT. This can only\n"
-        "be done on MDT0 with the right of administrator.\n"
+        "Create striped directory on specified MDT, same as setdirstripe.\n"
         "usage: mkdir [OPTION] <directory>\n"
         SETDIRSTRIPE_USAGE},
        {"rm_entry", lfs_rmentry, 0,
@@ -381,60 +463,67 @@ 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] [[!] --blocks|-b N]\n"
-        "     [[!] --mdt-index|--mdt|-m <uuid|index,...>]\n"
+        "     [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n"
+        "     [[!] --mtime|-M [+-]N[smhdwy]]\n"
+        "     [[!] --btime|--Btime|-B [+-]N[smhdwy]]\n"
+        "     [[!] --newer[XY] <reference>] [[!] --blocks|-b N]\n"
+        "     [--maxdepth|-D N] [[!] --mdt-index|--mdt|-m <uuid|index,...>]\n"
         "     [[!] --name|-n <pattern>] [[!] --ost|-O <uuid|index,...>]\n"
         "     [--print|-P] [--print0|-0] [[!] --size|-s [+-]N[bkMGTPE]]\n"
         "     [[!] --stripe-count|-c [+-]<stripes>]\n"
         "     [[!] --stripe-index|-i <index,...>]\n"
         "     [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
+        "     [[!] --extension-size|--ext-size|-z [+-]N[kMGT]]\n"
         "     [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
         "     [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
         "     [[!] --projid <projid>]\n"
+        "     [[!] --foreign[=<foreign_type>]]\n"
         "     [[!] --layout|-L released,raid0,mdt]\n"
+        "     [[!] --foreign[=<foreign_type>]]\n"
         "     [[!] --component-count [+-]<comp_cnt>]\n"
         "     [[!] --component-start [+-]N[kMGTPE]]\n"
         "     [[!] --component-end|-E [+-]N[kMGTPE]]\n"
-        "     [[!] --component-flags <comp_flags>]\n"
+        "     [[!] --component-flags {init,stale,prefer,offline,nosync,extension}]\n"
         "     [[!] --mirror-count|-N [+-]<n>]\n"
         "     [[!] --mirror-state <[^]state>]\n"
         "     [[!] --mdt-count|-T [+-]<stripes>]\n"
         "     [[!] --mdt-hash|-H <hashtype>\n"
+        "     [[!] --mdt-index|-m <uuid|index,...>]\n"
          "\t !: used before an option indicates 'NOT' requested attribute\n"
          "\t -: used before a value indicates less than requested value\n"
          "\t +: used before a value indicates more than requested value\n"
         "\thashtype:   hash type of the striped directory.\n"
         "\t            fnv_1a_64 FNV-1a hash algorithm\n"
         "\t            all_char  sum of characters % MDT_COUNT\n"},
-        {"check", lfs_check, 0,
+       {"check", lfs_check, 0,
         "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 "
-         "[for specified path only]\n" "usage: mdts [path]"},
-        {"df", lfs_df, 0,
-         "report filesystem disk space usage or inodes usage"
-         "of each MDS and all OSDs or a batch belonging to a specific pool .\n"
-         "Usage: df [-i] [-h] [--lazy|-l] [--pool|-p <fsname>[.<pool>] [path]"},
-        {"getname", lfs_getname, 0, "list instances and specified mount points "
-         "[for specified path only]\n"
-         "Usage: getname [-h]|[path ...] "},
+       {"osts", lfs_osts, 0, "list OSTs connected to client "
+        "[for specified path only]\n" "usage: osts [path]"},
+       {"mdts", lfs_mdts, 0, "list MDTs connected to client "
+        "[for specified path only]\n" "usage: mdts [path]"},
+       {"df", lfs_df, 0,
+        "report filesystem disk space usage or inodes usage "
+        "of each MDS and all OSDs or a batch belonging to a specific pool.\n"
+        "Usage: df [--inodes|-i] [--human-readable|-h] [--lazy|-l]\n"
+        "          [--pool|-p <fsname>[.<pool>]] [path]"},
+       {"getname", lfs_getname, 0,
+        "list instances and specified mount points [for specified path only]\n"
+        "Usage: getname [--help|-h] [--instance|-i] [--fsname|-n] [path ...]"},
 #ifdef HAVE_SYS_QUOTA_H
-        {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
+       {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
         "usage: setquota <-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>\n"
-         "                -b <block-softlimit> -B <block-hardlimit>\n"
-         "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
+        "                -b <block-softlimit> -B <block-hardlimit>\n"
+        "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
         "       setquota <-u|--user|-g|--group|-p|--projid> <uname>|<uid>|<gname>|<gid>|<projid>\n"
          "                [--block-softlimit <block-softlimit>]\n"
          "                [--block-hardlimit <block-hardlimit>]\n"
          "                [--inode-softlimit <inode-softlimit>]\n"
          "                [--inode-hardlimit <inode-hardlimit>] <filesystem>\n"
         "       setquota [-t] <-u|--user|-g|--group|-p|--projid>\n"
-         "                [--block-grace <block-grace>]\n"
-         "                [--inode-grace <inode-grace>] <filesystem>\n"
+        "                [--block-grace 'notify'|<block-grace>]\n"
+        "                [--inode-grace 'notify'|<inode-grace>] <filesystem>\n"
         "       setquota <-U|-G|-P>\n"
         "                -b <block-softlimit> -B <block-hardlimit>\n"
         "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
@@ -457,8 +546,11 @@ command_t cmdlist[] = {
         "      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"
-        "      quota space."},
-        {"quota", lfs_quota, 0, "Display disk usage and limits.\n"
+        "      quota space.\n\n"
+        "      When setting the grace time, 'notify' can be used as grace to\n"
+        "      be notified after the quota is over soft limit but prevents\n"
+        "      the soft limit from becoming the hard limit."},
+       {"quota", lfs_quota, 0, "Display disk usage and limits.\n"
         "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"
@@ -478,12 +570,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]]"},
@@ -495,13 +581,13 @@ command_t cmdlist[] = {
        {"fid2path", lfs_fid2path, 0,
         "Resolve the full path(s) for given FID(s). For a specific hardlink "
         "specify link number <linkno>.\n"
-       /* "For a historical link name, specify changelog record <recno>.\n" */
-        "usage: fid2path [--link <linkno>] <fsname|rootpath> <fid> ..."
-               /* [ --rec <recno> ] */ },
+        "usage: fid2path [-c] [--link|-l <linkno>] <fsname|root> <fid> ..."},
        {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n"
         "usage: path2fid [--parents] <path> ..."},
+       {"rmfid", lfs_rmfid, 0, "Remove file(s) by FID(s)\n"
+        "usage: rmfid <fsname|rootpath> <fid> ..."},
        {"data_version", lfs_data_version, 0, "Display file data version for "
-        "a given path.\n" "usage: data_version -[n|r|w] <path>"},
+        "a given path.\n" "usage: data_version [-n|-r|-w] <path>"},
        {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, "
         "undergoing actions) for given files.\n usage: hsm_state <file> ..."},
        {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n"
@@ -541,22 +627,24 @@ command_t cmdlist[] = {
         "usage: swap_layouts <path1> <path2>"},
        {"migrate", lfs_setstripe_migrate, 0,
         "migrate a directory between MDTs.\n"
-        "usage: migrate [--mdt|-m] <start_mdt_index>\n"
-        "               [--mdt-count|-c] <stripe_count>\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"
+        "              all_char  (type 1)sum of characters % MDT_COUNT\n"
+        "              fnv_1a_64 (type 2)FNV-1a hash algorithm (default)\n"
+        "              crush     (type 3)CRUSH hash algorithm\n"
         "\n"
         "migrate file objects from one OST "
         "layout\nto another (may be not safe with concurent writes).\n"
         "usage: migrate  "
         "[--stripe-count|-c] <stripe_count>\n"
+        "[--overstripe-count|-C] <stripe_count>\n"
         "              [--stripe-index|-i] <start_ost_index>\n"
         "              [--stripe-size|-S] <stripe_size>\n"
         "              [--pool|-p] <pool_name>\n"
@@ -566,12 +654,15 @@ command_t cmdlist[] = {
         "              [--non-direct|-D]\n"
         "              <file|directory>\n"
         "\tstripe_count:     number of OSTs to stripe a file over\n"
+        "\t              Using -C instead of -c allows overstriping, which\n"
+        "\t              will place more than one stripe per OST if\n"
+        "\t              stripe_count is greater than the number of OSTs\n"
         "\tstripe_ost_index: index of the first OST to stripe a file over\n"
         "\tstripe_size:      number of bytes to store before moving to the next OST\n"
         "\tpool_name:        name of the predefined pool of OSTs\n"
         "\tost_indices:      OSTs to stripe over, in order\n"
-        "\tblock:            wait for the operation to return before continuing\n"
-        "\tnon-block:        do not wait for the operation to return\n"
+        "\tblock:        Block file access during data migration (default)\n"
+        "\tnon-block:    Abort migrations if concurrent access is detected\n"
         "\tnon-direct:       do not use direct I/O to copy file contents.\n"},
        {"mv", lfs_mv, 0,
         "To move directories between MDTs. This command is deprecated, "
@@ -593,12 +684,29 @@ command_t cmdlist[] = {
         "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"},
+       {"pcc", lfs_pcc, pcc_cmdlist,
+        "lfs commands used to interact with PCC features:\n"
+        "lfs pcc attach - attach given files to Persistent Client Cache\n"
+        "lfs pcc attach_fid - attach given files into PCC by FID(s)\n"
+        "lfs pcc state  - display the PCC state for given files\n"
+        "lfs pcc detach - detach given files from Persistent Client Cache\n"
+        "lfs pcc detach_fid - detach given files from PCC by FID(s)\n"},
        {"help", Parser_help, 0, "help"},
        {"exit", Parser_quit, 0, "quit"},
        {"quit", Parser_quit, 0, "quit"},
@@ -612,8 +720,14 @@ command_t cmdlist[] = {
 
 static int check_hashtype(const char *hashtype)
 {
+       int type_num = atoi(hashtype);
        int i;
 
+       /* numeric hash type */
+       if (hashtype && strlen(hashtype) == 1 &&
+           (type_num > 0 && type_num < LMV_HASH_TYPE_MAX))
+               return type_num;
+       /* string hash type */
        for (i = LMV_HASH_TYPE_ALL_CHARS; i < LMV_HASH_TYPE_MAX; i++)
                if (strcmp(hashtype, mdt_hash_name[i]) == 0)
                        return i;
@@ -621,6 +735,20 @@ static int check_hashtype(const char *hashtype)
        return 0;
 }
 
+static uint32_t check_foreign_type_name(const char *foreign_type_name)
+{
+       uint32_t i;
+
+       for (i = 0; i < LU_FOREIGN_TYPE_UNKNOWN; i++) {
+               if (lu_foreign_types[i].lft_name == NULL)
+                       break;
+               if (strcmp(foreign_type_name,
+                          lu_foreign_types[i].lft_name) == 0)
+                       return lu_foreign_types[i].lft_type;
+       }
+
+       return LU_FOREIGN_TYPE_UNKNOWN;
+}
 
 static const char *error_loc = "syserror";
 
@@ -708,12 +836,12 @@ migrate_open_files(const char *name, __u64 migration_flags,
                }
 
                /* create, open a volatile file, use caching (ie no directio) */
-               if (param != NULL)
-                       fdv = llapi_file_open_param(volatile_file, open_flags,
-                                                   open_mode, param);
-               else
+               if (layout)
                        fdv = lfs_component_create(volatile_file, open_flags,
                                                   open_mode, layout);
+               else
+                       fdv = llapi_file_open_param(volatile_file, open_flags,
+                                                   open_mode, param);
        } while (fdv < 0 && (rc = fdv) == -EEXIST);
 
        if (rc < 0) {
@@ -990,16 +1118,31 @@ static int lfs_component_set(char *fname, int comp_id,
        }
 
        if (neg_flags) {
+               if (neg_flags & LCME_FL_STALE) {
+                       fprintf(stderr, "%s: cannot clear 'stale' flags from "
+                               "component. Please use lfs-mirror-resync(1) "
+                               "instead\n", progname);
+                       return -EINVAL;
+               }
+
                ids[count] = comp_id;
                flags_array[count] = neg_flags | LCME_FL_NEG;
                ++count;
        }
 
        rc = llapi_layout_file_comp_set(fname, ids, flags_array, count);
-       if (rc)
-               fprintf(stderr,
-                       "%s: cannot change the flags of component '%#x' of file '%s': %x / ^(%x)\n",
-                       progname, comp_id, fname, flags, neg_flags);
+       if (rc) {
+               if (errno == EUCLEAN) {
+                       rc = -errno;
+                       fprintf(stderr,
+                               "%s: cannot set 'stale' flag on component '%#x' of the last non-stale mirror of '%s'\n",
+                               progname, comp_id, fname);
+               } else {
+                       fprintf(stderr,
+                               "%s: cannot change the flags of component '%#x' of file '%s': %x / ^(%x)\n",
+                               progname, comp_id, fname, flags, neg_flags);
+               }
+       }
 
        return rc;
 }
@@ -1018,7 +1161,6 @@ static int lfs_component_del(char *fname, __u32 comp_id,
        if ((flags && comp_id) || (!flags && !comp_id))
                return -EINVAL;
 
-       /* LCME_FL_INIT is the only supported flag in PFL */
        if (flags) {
                if (flags & ~LCME_KNOWN_FLAGS) {
                        fprintf(stderr,
@@ -1081,6 +1223,8 @@ static int lfs_migrate(char *name, __u64 migration_flags,
                       struct llapi_stripe_param *param,
                       struct llapi_layout *layout)
 {
+       struct llapi_layout *existing;
+       uint64_t dom_new, dom_cur;
        int fd = -1;
        int fdv = -1;
        int rc;
@@ -1090,6 +1234,36 @@ static int lfs_migrate(char *name, __u64 migration_flags,
        if (rc < 0)
                goto out;
 
+       rc = llapi_layout_dom_size(layout, &dom_new);
+       if (rc) {
+               error_loc = "cannot get new layout DoM size";
+               goto out;
+       }
+       /* special case for migration to DOM layout*/
+       existing = llapi_layout_get_by_fd(fd, 0);
+       if (!existing) {
+               error_loc = "cannot get existing layout";
+               goto out;
+       }
+
+       rc = llapi_layout_dom_size(existing, &dom_cur);
+       if (rc) {
+               error_loc = "cannot get current layout DoM size";
+               goto out;
+       }
+
+       /* if file has DoM layout already then migration is possible to
+        * the new layout with the same DoM component via swap layout,
+        * if new layout used bigger DOM size, then mirroring is used
+        */
+       if (dom_new > dom_cur) {
+               rc = lfs_migrate_to_dom(fd, fdv, name, migration_flags, param,
+                                       layout);
+               if (rc)
+                       error_loc = "cannot migrate to DOM layout";
+               goto out_closed;
+       }
+
        if (!(migration_flags & MIGRATION_NONBLOCK)) {
                /* Blocking mode (forced if servers do not support file lease).
                 * It is also the default mode, since we cannot distinguish
@@ -1126,7 +1300,7 @@ out:
 
        if (fdv >= 0)
                close(fdv);
-
+out_closed:
        if (rc < 0)
                fprintf(stderr, "error: %s: %s: %s: %s\n",
                        progname, name, error_loc, strerror(-rc));
@@ -1221,71 +1395,9 @@ struct mirror_args {
        struct llapi_layout     *m_layout;
        const char              *m_file;
        struct mirror_args      *m_next;
+       bool                    m_inherit;
 };
 
-static int mirror_sanity_check_flags(struct llapi_layout *layout, void *unused)
-{
-       uint32_t flags;
-       int rc;
-
-       rc = llapi_layout_comp_flags_get(layout, &flags);
-       if (rc)
-               return -errno;
-
-       if (flags & LCME_FL_NEG) {
-               fprintf(stderr, "error: %s: negative flags are not supported\n",
-                       progname);
-               return -EINVAL;
-       }
-
-       if (flags & LCME_FL_STALE) {
-               fprintf(stderr, "error: %s: setting '%s' is not supported\n",
-                       progname, comp_flags_table[LCME_FL_STALE].cfn_name);
-               return -EINVAL;
-       }
-
-       return LLAPI_LAYOUT_ITER_CONT;
-}
-
-static inline int mirror_sanity_check_one(struct llapi_layout *layout)
-{
-       uint64_t start, end;
-       uint64_t pattern;
-       int rc;
-
-       /* LU-10112: do not support dom+flr in phase 1 */
-       rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST);
-       if (rc)
-               return -errno;
-
-       rc = llapi_layout_pattern_get(layout, &pattern);
-       if (rc)
-               return -errno;
-
-       if (pattern == LOV_PATTERN_MDT || pattern == LLAPI_LAYOUT_MDT) {
-               fprintf(stderr, "error: %s: doesn't support dom+flr for now\n",
-                       progname);
-               return -ENOTSUP;
-       }
-
-       rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_LAST);
-       if (rc)
-               return -errno;
-
-       rc = llapi_layout_comp_extent_get(layout, &start, &end);
-       if (rc)
-               return -errno;
-
-       if (end != LUSTRE_EOF) {
-               fprintf(stderr, "error: %s: mirror layout doesn't reach eof\n",
-                       progname);
-               return -EINVAL;
-       }
-
-       rc = llapi_layout_comp_iterate(layout, mirror_sanity_check_flags, NULL);
-       return rc;
-}
-
 /**
  * enum mirror_flags - Flags for extending a mirrored file.
  * @MF_NO_VERIFY: Indicates not to verify the mirror(s) from victim file(s)
@@ -1300,6 +1412,7 @@ enum mirror_flags {
        MF_NO_VERIFY    = 0x1,
        MF_DESTROY      = 0x2,
        MF_COMP_ID      = 0x4,
+       MF_COMP_POOL    = 0x8,
 };
 
 /**
@@ -1332,11 +1445,14 @@ static int mirror_create_sanity_check(const char *fname,
                        return -ENODATA;
                }
 
-               rc = mirror_sanity_check_one(layout);
+               rc = llapi_layout_sanity(layout, false, true);
+
                llapi_layout_free(layout);
 
-               if (rc)
+               if (rc) {
+                       llapi_layout_sanity_perror(rc);
                        return rc;
+               }
        }
 
        while (list != NULL) {
@@ -1361,9 +1477,11 @@ static int mirror_create_sanity_check(const char *fname,
                        }
                }
 
-               rc = mirror_sanity_check_one(list->m_layout);
-               if (rc)
+               rc = llapi_layout_sanity(list->m_layout, false, true);
+               if (rc) {
+                       llapi_layout_sanity_perror(rc);
                        return rc;
+               }
 
                list = list->m_next;
        }
@@ -1629,14 +1747,36 @@ out:
        return rc;
 }
 
-static int mirror_extend_layout(char *name, struct llapi_layout *layout)
+static int mirror_extend_layout(char *name, struct llapi_layout *m_layout,
+                               bool inherit)
 {
+       struct llapi_layout *f_layout = NULL;
        struct ll_ioc_lease *data = NULL;
        int fd = -1;
        int fdv = -1;
-       int rc;
+       int rc = 0;
 
-       rc = migrate_open_files(name, 0, NULL, layout, &fd, &fdv);
+       if (inherit) {
+               f_layout = llapi_layout_get_by_path(name, 0);
+               if (f_layout == NULL) {
+                       fprintf(stderr, "%s: cannot get layout\n", progname);
+                       goto out;
+               }
+               rc = llapi_layout_get_last_init_comp(f_layout);
+               if (rc) {
+                       fprintf(stderr, "%s: cannot get the last init comp\n",
+                               progname);
+                       goto out;
+               }
+               rc = llapi_layout_mirror_inherit(f_layout, m_layout);
+               if (rc) {
+                       fprintf(stderr,
+                               "%s: cannot inherit from the last init comp\n",
+                               progname);
+                       goto out;
+               }
+       }
+       rc = migrate_open_files(name, 0, NULL, m_layout, &fd, &fdv);
        if (rc < 0)
                goto out;
 
@@ -1704,7 +1844,8 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list,
 
                        while (mirror_count > 0) {
                                rc = mirror_extend_layout(fname,
-                                                       mirror_list->m_layout);
+                                                       mirror_list->m_layout,
+                                                       mirror_list->m_inherit);
                                if (rc)
                                        break;
 
@@ -1749,7 +1890,99 @@ static int find_comp_id(struct llapi_layout *layout, void *cbdata)
 
        return LLAPI_LAYOUT_ITER_CONT;
 }
-static int mirror_split(const char *fname, __u32 id,
+
+struct pool_to_id_cbdata {
+       const char *pool;
+       __u32 id;
+};
+static int find_comp_id_by_pool(struct llapi_layout *layout, void *cbdata)
+{
+       char buf[LOV_MAXPOOLNAME + 1];
+       struct pool_to_id_cbdata *d = (void *)cbdata;
+       uint32_t id;
+       int rc;
+
+       rc = llapi_layout_pool_name_get(layout, buf, sizeof(buf));
+       if (rc < 0)
+               return rc;
+       if (strcmp(d->pool, buf))
+               return LLAPI_LAYOUT_ITER_CONT;
+
+       rc = llapi_layout_mirror_id_get(layout, &id);
+       if (rc < 0)
+               return rc;
+       d->id = id;
+
+       return LLAPI_LAYOUT_ITER_STOP;
+}
+
+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;
+}
+
+/**
+ * last_non_stale_mirror() - Check if a mirror is the last non-stale mirror.
+ * @mirror_id: Mirror id to be checked.
+ * @layout:    Mirror component list.
+ *
+ * This function checks if a mirror with specified @mirror_id is the last
+ * non-stale mirror of a layout @layout.
+ *
+ * Return: true or false.
+ */
+static inline
+bool last_non_stale_mirror(__u16 mirror_id, struct llapi_layout *layout)
+{
+       __u16 mirror_ids[128] = { 0 };
+       struct collect_ids_data cid = { .cid_ids = mirror_ids,
+                                       .cid_count = 0,
+                                       .cid_exclude = mirror_id, };
+       int i;
+
+       llapi_layout_comp_iterate(layout, collect_mirror_id, &cid);
+
+       for (i = 0; i < cid.cid_count; i++) {
+               struct llapi_resync_comp comp_array[1024] = { { 0 } };
+               int comp_size = 0;
+
+               comp_size = llapi_mirror_find_stale(layout, comp_array,
+                                                   ARRAY_SIZE(comp_array),
+                                                   &mirror_ids[i], 1);
+               if (comp_size == 0)
+                       return false;
+       }
+
+       return true;
+}
+
+static int mirror_split(const char *fname, __u32 id, const char *pool,
                        enum mirror_flags mflags, const char *victim_file)
 {
        struct llapi_layout *layout;
@@ -1759,6 +1992,7 @@ static int mirror_split(const char *fname, __u32 id,
        char *ptr;
        struct ll_ioc_lease *data;
        uint16_t mirror_count;
+       __u32 mirror_id;
        int mdt_index;
        int fd, fdv;
        int rc;
@@ -1772,9 +2006,11 @@ static int mirror_split(const char *fname, __u32 id,
                return -EINVAL;
        }
 
-       rc = mirror_sanity_check_one(layout);
-       if (rc)
+       rc = llapi_layout_sanity(layout, false, true);
+       if (rc) {
+               llapi_layout_sanity_perror(rc);
                goto free_layout;
+       }
 
        rc = llapi_layout_mirror_count_get(layout, &mirror_count);
        if (rc) {
@@ -1790,21 +2026,40 @@ static int mirror_split(const char *fname, __u32 id,
                goto free_layout;
        }
 
-       if (mflags & MF_COMP_ID) {
+       if (mflags & MF_COMP_POOL) {
+               struct pool_to_id_cbdata data = { .pool = pool };
+
+               rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool,
+                                              &data);
+               mirror_id = data.id;
+       } else if (mflags & MF_COMP_ID) {
                rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
-               id = mirror_id_of(id);
+               mirror_id = mirror_id_of(id);
        } else {
                rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+               mirror_id = id;
        }
        if (rc < 0) {
                fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
                        progname, fname);
                goto free_layout;
        } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
-               fprintf(stderr,
-                    "error %s: file '%s' does not contain mirror with id %u\n",
-                       progname, fname, id);
-               goto free_layout;
+               if (mflags & MF_COMP_POOL) {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with pool '%s'\n",
+                               progname, fname, pool);
+                       goto free_layout;
+               } else if (mflags & MF_COMP_ID) {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with comp-id %u\n",
+                               progname, fname, id);
+                       goto free_layout;
+               } else {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with id %u\n",
+                               progname, fname, id);
+                       goto free_layout;
+               }
        }
 
        fd = open(fname, O_RDWR);
@@ -1847,11 +2102,19 @@ static int mirror_split(const char *fname, __u32 id,
        if (victim_file == NULL) {
                /* use a temp file to store the splitted layout */
                if (mflags & MF_DESTROY) {
+                       if (last_non_stale_mirror(mirror_id, layout)) {
+                               rc = -EUCLEAN;
+                               fprintf(stderr,
+                                       "%s: cannot destroy the last non-stale mirror of file '%s'\n",
+                                       progname, fname);
+                               goto close_fd;
+                       }
+
                        fdv = llapi_create_volatile_idx(parent, mdt_index,
                                                        O_LOV_DELAY_CREATE);
                } else {
                        snprintf(victim, sizeof(victim), "%s.mirror~%u",
-                                fname, id);
+                                fname, mirror_id);
                        fdv = open(victim, flags, S_IRUSR | S_IWUSR);
                }
        } else {
@@ -1886,7 +2149,7 @@ static int mirror_split(const char *fname, __u32 id,
        data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
        data->lil_count = 2;
        data->lil_ids[0] = fdv;
-       data->lil_ids[1] = id;
+       data->lil_ids[1] = mirror_id;
        rc = llapi_lease_set(fd, data);
        if (rc <= 0) {
                if (rc == 0) /* lost lease lock */
@@ -1908,6 +2171,72 @@ free_layout:
        return rc;
 }
 
+static inline
+int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
+                          __u16 *mirror_ids, int ids_nr);
+
+static int lfs_migrate_to_dom(int fd, int fdv, char *name,
+                             __u64 migration_flags,
+                             struct llapi_stripe_param *param,
+                             struct llapi_layout *layout)
+{
+       struct ll_ioc_lease *data = NULL;
+       int rc;
+
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
+       if (rc < 0) {
+               error_loc = "cannot get lease";
+               goto out_close;
+       }
+
+       /* Atomically put lease, merge layouts, resync and close. */
+       data = calloc(1, offsetof(typeof(*data), lil_ids[1024]));
+       if (!data) {
+               error_loc = "memory allocation";
+               goto out_close;
+       }
+       data->lil_mode = LL_LEASE_UNLCK;
+       data->lil_flags = LL_LEASE_LAYOUT_MERGE;
+       data->lil_count = 1;
+       data->lil_ids[0] = fdv;
+       rc = llapi_lease_set(fd, data);
+       if (rc < 0) {
+               error_loc = "cannot merge layout";
+               goto out_close;
+       } else if (rc == 0) {
+               rc = -EBUSY;
+               error_loc = "lost lease lock";
+               goto out_close;
+       }
+       close(fd);
+       close(fdv);
+
+       rc = lfs_mirror_resync_file(name, data, NULL, 0);
+       if (rc) {
+               error_loc = "cannot resync file";
+               goto out;
+       }
+
+       /* delete first mirror now */
+       rc = mirror_split(name, 1, NULL, MF_DESTROY, NULL);
+       if (rc < 0)
+               error_loc = "cannot delete old layout";
+       goto out;
+
+out_close:
+       close(fd);
+       close(fdv);
+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);
+       if (data)
+               free(data);
+       return rc;
+}
+
 /**
  * Parse a string containing an target index list into an array of integers.
  *
@@ -1915,20 +2244,23 @@ free_layout:
  * indices and ranges, for example "1,2-4,7". Add the indices into the
  * \a tgts array and remove duplicates.
  *
- * \param[out] tgts    array to store indices in
- * \param[in] size     size of \a tgts array
- * \param[in] offset   starting index in \a tgts
- * \param[in] arg      string containing OST index list
+ * \param[out] tgts            array to store indices in
+ * \param[in] size             size of \a tgts array
+ * \param[in] offset           starting index in \a tgts
+ * \param[in] arg              string containing OST index list
+ * \param[in/out] overstriping index list may contain duplicates
  *
  * \retval positive    number of indices in \a tgts
  * \retval -EINVAL     unable to parse \a arg
  */
-static int parse_targets(__u32 *tgts, int size, int offset, char *arg)
+static int parse_targets(__u32 *tgts, int size, int offset, char *arg,
+                        unsigned long long *pattern)
 {
        int rc;
        int nr = offset;
        int slots = size - offset;
        char *ptr = NULL;
+       bool overstriped = false;
        bool end_of_loop;
 
        if (arg == NULL)
@@ -1936,8 +2268,8 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg)
 
        end_of_loop = false;
        while (!end_of_loop) {
-               int start_index;
-               int end_index;
+               int start_index = 0;
+               int end_index = 0;
                int i;
                char *endptr = NULL;
 
@@ -1968,14 +2300,21 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg)
 
                        /* remove duplicate */
                        for (j = 0; j < offset; j++) {
-                               if (tgts[j] == i)
-                                       break;
+                               if (tgts[j] == i && pattern &&
+                                   *pattern == LLAPI_LAYOUT_OVERSTRIPING)
+                                       overstriped = true;
+                               else if (tgts[j] == i)
+                                       return -EINVAL;
                        }
-                       if (j == offset) { /* no duplicate */
+
+                       j = offset;
+
+                       if (j == offset) { /* check complete */
                                tgts[nr++] = i;
                                --slots;
                        }
                }
+
                if (slots == 0 && i < end_index)
                        break;
 
@@ -1987,12 +2326,16 @@ static int parse_targets(__u32 *tgts, int size, int offset, char *arg)
        if (!end_of_loop && ptr != NULL)
                *ptr = ',';
 
+       if (!overstriped && pattern)
+               *pattern = LLAPI_LAYOUT_DEFAULT;
+
        return rc < 0 ? rc : nr;
 }
 
 struct lfs_setstripe_args {
        unsigned long long       lsa_comp_end;
        unsigned long long       lsa_stripe_size;
+       unsigned long long       lsa_extension_size;
        long long                lsa_stripe_count;
        long long                lsa_stripe_off;
        __u32                    lsa_comp_flags;
@@ -2001,6 +2344,7 @@ struct lfs_setstripe_args {
        unsigned int             lsa_mirror_count;
        int                      lsa_nr_tgts;
        bool                     lsa_first_comp;
+       bool                     lsa_extension_comp;
        __u32                   *lsa_tgts;
        char                    *lsa_pool_name;
 };
@@ -2054,7 +2398,6 @@ static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa)
                lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT ||
                lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT ||
                lsa->lsa_pattern != LLAPI_LAYOUT_RAID0 ||
-               lsa->lsa_pool_name != NULL ||
                lsa->lsa_comp_end != 0);
 }
 
@@ -2074,16 +2417,20 @@ static int comp_args_to_layout(struct llapi_layout **composite,
 {
        struct llapi_layout *layout = *composite;
        uint64_t prev_end = 0;
+       uint64_t size;
        int i = 0, rc;
 
+new_comp:
        if (layout == NULL) {
                layout = llapi_layout_alloc();
                if (layout == NULL) {
                        fprintf(stderr, "Alloc llapi_layout failed. %s\n",
                                strerror(errno));
-                       return -ENOMEM;
+                       errno = ENOMEM;
+                       return -1;
                }
                *composite = layout;
+               lsa->lsa_first_comp = true;
        } else {
                uint64_t start;
 
@@ -2096,31 +2443,44 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        return rc;
                }
 
-               if (lsa->lsa_first_comp)
+               if (lsa->lsa_first_comp) {
                        prev_end = 0;
-
-               if (lsa->lsa_first_comp)
                        rc = llapi_layout_add_first_comp(layout);
-               else
+               } else {
                        rc = llapi_layout_comp_add(layout);
+               }
                if (rc) {
                        fprintf(stderr, "Add component failed. %s\n",
                                strerror(errno));
                        return rc;
                }
        }
-       /* reset lsa_first_comp */
-       lsa->lsa_first_comp = false;
 
-       if (set_extent) {
-               rc = llapi_layout_comp_extent_set(layout, prev_end,
-                                                 lsa->lsa_comp_end);
-               if (rc) {
-                       fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
-                               prev_end, lsa->lsa_comp_end, strerror(errno));
-                       return rc;
-               }
-       }
+       rc = llapi_layout_comp_flags_set(layout, lsa->lsa_comp_flags);
+       if (rc) {
+               fprintf(stderr, "Set flags 0x%x failed: %s\n",
+                       lsa->lsa_comp_flags, strerror(errno));
+               return rc;
+       }
+
+       if (set_extent) {
+               uint64_t comp_end = lsa->lsa_comp_end;
+
+               /* The extendable component is 0-length, so it can be removed
+                * if there is insufficient space to extend it. */
+               if (lsa->lsa_extension_comp)
+                       comp_end = prev_end;
+
+               rc = llapi_layout_comp_extent_set(layout, prev_end,
+                                                 comp_end);
+               if (rc) {
+                       fprintf(stderr, "Set extent [%lu, %lu) failed. %s\n",
+                               prev_end, comp_end, strerror(errno));
+                       return rc;
+               }
+       }
+       /* reset lsa_first_comp */
+       lsa->lsa_first_comp = false;
 
        /* Data-on-MDT component setting */
        if (lsa->lsa_pattern == LLAPI_LAYOUT_MDT) {
@@ -2130,47 +2490,68 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        fprintf(stderr, "Option 'stripe-count' can't be "
                                "specified with Data-on-MDT component: %lld\n",
                                lsa->lsa_stripe_count);
-                       return -EINVAL;
+                       errno = EINVAL;
+                       return -1;
                }
                if (lsa->lsa_stripe_size != LLAPI_LAYOUT_DEFAULT) {
                        fprintf(stderr, "Option 'stripe-size' can't be "
                                "specified with Data-on-MDT component: %llu\n",
                                lsa->lsa_stripe_size);
-                       return -EINVAL;
+                       errno = EINVAL;
+                       return -1;
                }
                if (lsa->lsa_nr_tgts != 0) {
                        fprintf(stderr, "Option 'ost-list' can't be specified "
                                "with Data-on-MDT component: '%i'\n",
                                lsa->lsa_nr_tgts);
-                       return -EINVAL;
+                       errno = EINVAL;
+                       return -1;
                }
                if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) {
                        fprintf(stderr, "Option 'stripe-offset' can't be "
                                "specified with Data-on-MDT component: %lld\n",
                                lsa->lsa_stripe_off);
-                       return -EINVAL;
+                       errno = EINVAL;
+                       return -1;
                }
                if (lsa->lsa_pool_name != 0) {
                        fprintf(stderr, "Option 'pool' can't be specified "
                                "with Data-on-MDT component: '%s'\n",
                                lsa->lsa_pool_name);
-                       return -EINVAL;
+                       errno = EINVAL;
+                       return -1;
                }
 
                rc = llapi_layout_pattern_set(layout, lsa->lsa_pattern);
                if (rc) {
                        fprintf(stderr, "Set stripe pattern %#llx failed. %s\n",
-                               lsa->lsa_pattern, strerror(errno));
+                               lsa->lsa_pattern,
+                               strerror(errno));
                        return rc;
                }
                /* Data-on-MDT component has always single stripe up to end */
                lsa->lsa_stripe_size = lsa->lsa_comp_end;
+       } else if (lsa->lsa_pattern == LLAPI_LAYOUT_OVERSTRIPING) {
+               rc = llapi_layout_pattern_set(layout, lsa->lsa_pattern);
+               if (rc) {
+                       fprintf(stderr, "Set stripe pattern %#llx failed. %s\n",
+                               lsa->lsa_pattern,
+                               strerror(errno));
+                       return rc;
+               }
        }
 
-       rc = llapi_layout_stripe_size_set(layout, lsa->lsa_stripe_size);
+       size = lsa->lsa_comp_flags & LCME_FL_EXTENSION ?
+               lsa->lsa_extension_size : lsa->lsa_stripe_size;
+
+       if (lsa->lsa_comp_flags & LCME_FL_EXTENSION)
+               rc = llapi_layout_extension_size_set(layout, size);
+       else
+               rc = llapi_layout_stripe_size_set(layout, size);
+
        if (rc) {
-               fprintf(stderr, "Set stripe size %llu failed: %s\n",
-                       lsa->lsa_stripe_size, strerror(errno));
+               fprintf(stderr, "Set stripe size %lu failed: %s\n",
+                       size, strerror(errno));
                return rc;
        }
 
@@ -2181,13 +2562,6 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                return rc;
        }
 
-       rc = llapi_layout_comp_flags_set(layout, lsa->lsa_comp_flags);
-       if (rc) {
-               fprintf(stderr, "Set flags 0x%x failed: %s\n",
-                       lsa->lsa_comp_flags, strerror(errno));
-               return rc;
-       }
-
        if (lsa->lsa_pool_name != NULL) {
                rc = llapi_layout_pool_name_set(layout, lsa->lsa_pool_name);
                if (rc) {
@@ -2210,8 +2584,10 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                    lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
                    lsa->lsa_nr_tgts != lsa->lsa_stripe_count) {
                        fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n",
-                               lsa->lsa_stripe_count, lsa->lsa_nr_tgts);
-                       return -EINVAL;
+                               lsa->lsa_stripe_count,
+                               lsa->lsa_nr_tgts);
+                       errno = EINVAL;
+                       return -1;
                }
                for (i = 0; i < lsa->lsa_nr_tgts; i++) {
                        rc = llapi_layout_ost_index_set(layout, i,
@@ -2229,7 +2605,14 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                return rc;
        }
 
-       return 0;
+       /* Create the second, virtual component of extension space */
+       if (lsa->lsa_extension_comp) {
+               lsa->lsa_comp_flags |= LCME_FL_EXTENSION;
+               lsa->lsa_extension_comp = false;
+               goto new_comp;
+       }
+
+       return rc;
 }
 
 static int build_component(struct llapi_layout **layout,
@@ -2256,26 +2639,75 @@ static int build_component(struct llapi_layout **layout,
        return rc;
 }
 
+static int build_prev_component(struct llapi_layout **layout,
+                               struct lfs_setstripe_args *prev,
+                               struct lfs_setstripe_args *lsa,
+                               bool set_extent)
+{
+       int extension = lsa->lsa_comp_flags & LCME_FL_EXTENSION;
+       int rc;
+
+       if (prev->lsa_stripe_size) {
+               if (extension) {
+                       prev->lsa_comp_end = lsa->lsa_comp_end;
+                       prev->lsa_extension_size = lsa->lsa_extension_size;
+                       prev->lsa_extension_comp = true;
+               }
+
+               rc = build_component(layout, prev, true);
+               if (rc)
+                       return rc;
+       }
+
+       /* Copy lsa to previous lsa;
+        * if this is an extension component, make the previous invalid; */
+       if (extension)
+               prev->lsa_stripe_size = 0;
+       else
+               *prev = *lsa;
+
+       return 0;
+}
+
 static int build_layout_from_yaml_node(struct cYAML *node,
                                       struct llapi_layout **layout,
                                       struct lfs_setstripe_args *lsa,
-                                      __u32 *osts)
+                                      struct lfs_setstripe_args *prevp)
 {
+       struct lfs_setstripe_args prev = { 0 };
+       __u32 *osts = lsa->lsa_tgts;
        char *string;
        int rc = 0;
 
+       if (prevp == NULL)
+               prevp = &prev;
+
        while (node) {
+               string = node->cy_string;
+
                if (node->cy_type == CYAML_TYPE_OBJECT) {
                        /* go deep to sub blocks */
+                       if (string && !strncmp(string, "component", 9) &&
+                           strncmp(string, "component0", 10) &&
+                           strncmp(string, "components", 10)) {
+                               rc = build_prev_component(layout, prevp, lsa, true);
+                               if (rc)
+                                       return rc;
+
+                               /* initialize lsa. */
+                               setstripe_args_init(lsa);
+                               lsa->lsa_first_comp = false;
+                               lsa->lsa_tgts = osts;
+                       }
+
                        rc = build_layout_from_yaml_node(node->cy_child, layout,
-                                                        lsa, osts);
+                                                        lsa, prevp);
                        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;
@@ -2290,23 +2722,27 @@ static int build_layout_from_yaml_node(struct cYAML *node,
                                } else if (!strcmp(string, "pattern")) {
                                        if (!strcmp(node->cy_valuestring, "mdt"))
                                                lsa->lsa_pattern = LLAPI_LAYOUT_MDT;
+                                       if (!strcmp(node->cy_valuestring,
+                                                   "raid0,overstriped"))
+                                               lsa->lsa_pattern =
+                                                       LLAPI_LAYOUT_OVERSTRIPING;
+                               } 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;
@@ -2316,6 +2752,9 @@ static int build_layout_from_yaml_node(struct cYAML *node,
                                        lsa->lsa_stripe_count = node->cy_valueint;
                                } else if (!strcmp(string, "stripe_size")) {
                                        lsa->lsa_stripe_size = node->cy_valueint;
+                               } else if (!strcmp(string, "extension_size")) {
+                                       lsa->lsa_extension_size = node->cy_valueint;
+                                       lsa->lsa_extension_comp = true;
                                } else if (!strcmp(string, "stripe_offset")) {
                                        lsa->lsa_stripe_off = node->cy_valueint;
                                } else if (!strcmp(string, "l_ost_idx")) {
@@ -2327,6 +2766,15 @@ static int build_layout_from_yaml_node(struct cYAML *node,
                node = node->cy_next;
        }
 
+       if (prevp == &prev) {
+               rc = build_prev_component(layout, prevp, lsa, true);
+               if (rc)
+                       return rc;
+
+               if (!(lsa->lsa_comp_flags & LCME_FL_EXTENSION))
+                       rc = build_component(layout, lsa, *layout != NULL);
+       }
+
        return rc;
 }
 
@@ -2354,13 +2802,11 @@ static int lfs_comp_create_from_yaml(char *template,
        setstripe_args_init(lsa);
        lsa->lsa_tgts = osts;
 
-       rc = build_layout_from_yaml_node(tree, layout, lsa, osts);
+       rc = build_layout_from_yaml_node(tree, layout, lsa, NULL);
        if (rc) {
                fprintf(stderr, "%s: cannot build layout from YAML file %s.\n",
                        progname, template);
                goto err;
-       } else {
-               rc = build_component(layout, lsa, *layout != NULL);
        }
        /* clean clean lsa */
        setstripe_args_init(lsa);
@@ -2371,50 +2817,133 @@ err:
        return rc;
 }
 
-/* In 'lfs setstripe --component-add' mode, we need to fetch the extent
- * end of the last component in the existing file, and adjust the
- * first extent start of the components to be added accordingly. */
-static int adjust_first_extent(char *fname, struct llapi_layout *layout)
+/**
+ * Get the extension size from the next (SEL) component and extend the
+ * current component on it. The start of the next component is to be
+ * adjusted as well.
+ *
+ * \param[in] layout   the current layout
+ * \param[in] start    the start of the current component
+ * \param[in,out] end  the end of the current component
+ * \param[in] offset   the offset to adjust the end position to instead of
+ *                     extension size
+ *
+ * \retval 0           - extended successfully
+ * \retval < 0         - error
+ */
+static int layout_extend_comp(struct llapi_layout *layout,
+                             uint64_t start, uint64_t *end,
+                             uint64_t offset)
 {
-       struct llapi_layout *head;
-       uint64_t start, end, stripe_size, prev_end = 0;
+       uint64_t size, next_start, next_end;
        int rc;
 
-       if (layout == NULL) {
-               fprintf(stderr,
-                       "%s setstripe: layout must be specified\n",
-                       progname);
-               return -EINVAL;
+       rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_NEXT);
+       if (rc < 0) {
+               fprintf(stderr, "%s setstripe: cannot move component cursor: "
+                       "%s\n", progname, strerror(errno));
+               return rc;
        }
 
-       errno = 0;
-       head = llapi_layout_get_by_path(fname, 0);
-       if (head == NULL) {
-               fprintf(stderr,
-                       "%s setstripe: cannot read layout from '%s': %s\n",
-                       progname, fname, strerror(errno));
-               return -EINVAL;
-       } else if (errno == ENODATA) {
-               /* file without LOVEA, this component-add will be turned
-                * into a component-create. */
-               llapi_layout_free(head);
-               return -ENODATA;
-       } else if (!llapi_layout_is_composite(head)) {
-               fprintf(stderr, "%s setstripe: '%s' not a composite file\n",
-                       progname, fname);
-               llapi_layout_free(head);
-               return -EINVAL;
+       /* Even if the @size will not be used below, this will fail if
+        * this is not a SEL component - a good confirmation we are
+        * working on right components. */
+       rc = llapi_layout_extension_size_get(layout, &size);
+       if (rc < 0) {
+               fprintf(stderr, "%s setstripe: cannot get component ext size: "
+                       "%s\n", progname, strerror(errno));
+               return rc;
        }
 
-       rc = llapi_layout_comp_extent_get(head, &start, &prev_end);
+       rc = llapi_layout_comp_extent_get(layout, &next_start, &next_end);
        if (rc) {
-               fprintf(stderr, "%s setstripe: cannot get prev extent: %s\n",
+               fprintf(stderr, "%s setstripe: cannot get extent: %s\n",
+                       progname, strerror(errno));
+               return rc;
+       }
+
+       next_start += offset ?: size;
+       rc = llapi_layout_comp_extent_set(layout, next_start, next_end);
+       if (rc) {
+               fprintf(stderr, "%s setstripe: cannot set extent: %s\n",
+                       progname, strerror(errno));
+               return rc;
+       }
+
+       rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_PREV);
+       if (rc < 0) {
+               fprintf(stderr, "%s setstripe: cannot move component cursor: "
+                       "%s\n", progname, strerror(errno));
+               return rc;
+       }
+
+       *end += offset ?: size;
+       rc = llapi_layout_comp_extent_set(layout, start, *end);
+       if (rc) {
+               fprintf(stderr, "%s setstripe: cannot set extent: %s\n",
                        progname, strerror(errno));
-               llapi_layout_free(head);
                return rc;
        }
 
-       llapi_layout_free(head);
+       return 0;
+}
+
+/**
+ * In 'lfs setstripe --component-add' mode, we need to fetch the extent
+ * end of the last component in the existing file, and adjust the
+ * first extent start of the components to be added accordingly.
+ *
+ * In the create mode, we need to check if the first component is an extendable
+ * SEL component and extend its length to the extension size (first component
+ * of the PFL file is initialised at the create time, cannot be 0-lenght.
+ */
+static int layout_adjust_first_extent(char *fname, struct llapi_layout *layout,
+                                     bool comp_add)
+{
+       struct llapi_layout *head;
+       uint64_t start = 0, prev_end = 0;
+       uint64_t end;
+       int rc, ret = 0;
+
+       if (layout == NULL || !(comp_add || llapi_layout_is_composite(layout)))
+               return 0;
+
+       errno = 0;
+       while (comp_add) {
+               head = llapi_layout_get_by_path(fname, 0);
+               if (head == NULL) {
+                       fprintf(stderr,
+                               "%s setstripe: cannot read layout from '%s': "
+                               "%s\n", progname, fname, strerror(errno));
+                       return -EINVAL;
+               } else if (errno == ENODATA) {
+                       /* file without LOVEA, this component-add will be turned
+                        * into a component-create. */
+                       llapi_layout_free(head);
+                       ret = -ENODATA;
+
+                       /* the new layout will be added to an empty one, it
+                        * still needs to be adjusted below */
+                       comp_add = 0;
+                       break;
+               } else if (!llapi_layout_is_composite(head)) {
+                       fprintf(stderr, "%s setstripe: '%s' not a composite "
+                               "file\n", progname, fname);
+                       llapi_layout_free(head);
+                       return -EINVAL;
+               }
+
+               rc = llapi_layout_comp_extent_get(head, &start, &prev_end);
+               if (rc) {
+                       fprintf(stderr, "%s setstripe: cannot get prev "
+                               "extent: %s\n", progname, strerror(errno));
+                       llapi_layout_free(head);
+                       return rc;
+               }
+
+               llapi_layout_free(head);
+               break;
+       }
 
        /* Make sure we use the first component of the layout to be added. */
        rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST);
@@ -2432,37 +2961,46 @@ static int adjust_first_extent(char *fname, struct llapi_layout *layout)
                return rc;
        }
 
-       if (start > prev_end || end <= prev_end) {
-               fprintf(stderr,
-                       "%s setstripe: first extent [%lu, %lu) not adjacent with extent end %lu\n",
-                       progname, start, end, prev_end);
-               return -EINVAL;
-       }
-
-       rc = llapi_layout_stripe_size_get(layout, &stripe_size);
-       if (rc) {
-               fprintf(stderr, "%s setstripe: cannot get stripe size: %s\n",
-                       progname, strerror(errno));
-               return rc;
+       if (start == 0 && end == 0) {
+               rc = layout_extend_comp(layout, start, &end,
+                                       comp_add ? prev_end : 0);
+               if (rc)
+                       return rc;
        }
 
-       if (stripe_size != LLAPI_LAYOUT_DEFAULT &&
-           (prev_end & (stripe_size - 1))) {
-               fprintf(stderr,
-                       "%s setstripe: stripe size %lu not aligned with %lu\n",
-                       progname, stripe_size, prev_end);
+       if (start > prev_end || end < prev_end) {
+               fprintf(stderr, "%s setstripe: first extent [%lu, %lu) not "
+                       "adjacent with extent end %lu\n",
+                       progname, start, end, prev_end);
                return -EINVAL;
        }
 
        rc = llapi_layout_comp_extent_set(layout, prev_end, end);
        if (rc) {
-               fprintf(stderr,
-                       "%s setstripe: cannot set component extent [%lu, %lu): %s\n",
+               fprintf(stderr, "%s setstripe: cannot set component extent "
+                       "[%lu, %lu): %s\n",
                        progname, prev_end, end, strerror(errno));
                return rc;
        }
 
-       return 0;
+       return ret;
+}
+
+static int mirror_adjust_first_extents(struct mirror_args *list)
+{
+       int rc = 0;
+
+       if (list == NULL)
+               return 0;
+
+       while (list != NULL) {
+               rc = layout_adjust_first_extent(NULL, list->m_layout, false);
+               if (rc)
+                       break;
+               list = list->m_next;
+       }
+
+       return rc;
 }
 
 static inline bool arg_is_eof(char *arg)
@@ -2484,8 +3022,10 @@ static struct mirror_args *lfs_mirror_alloc(void)
 
        while (1) {
                mirror = calloc(1, sizeof(*mirror));
-               if (mirror != NULL)
+               if (mirror != NULL) {
+                       mirror->m_inherit = false;
                        break;
+               }
 
                sleep(1);
        }
@@ -2539,11 +3079,14 @@ enum {
        LFS_COMP_ADD_OPT,
        LFS_COMP_NO_VERIFY_OPT,
        LFS_PROJID_OPT,
-       LFS_MIRROR_FLAGS_OPT,
+       LFS_LAYOUT_FLAGS_OPT, /* used for mirror and foreign flags */
        LFS_MIRROR_ID_OPT,
        LFS_MIRROR_STATE_OPT,
        LFS_LAYOUT_COPY,
        LFS_MIRROR_INDEX_OPT,
+       LFS_LAYOUT_FOREIGN_OPT,
+       LFS_MODE_OPT,
+       LFS_NEWERXY_OPT,
 };
 
 /* functions */
@@ -2565,6 +3108,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
        unsigned long long               size_units = 1;
        bool                             migrate_mode = false;
        bool                             migrate_mdt_mode = false;
+       bool                             setstripe_mode = false;
        bool                             migration_block = false;
        __u64                            migration_flags = 0;
        __u32                            tgts[LOV_MAX_STRIPE_COUNT] = { 0 };
@@ -2585,12 +3129,19 @@ static int lfs_setstripe_internal(int argc, char **argv,
        bool from_yaml = false;
        bool from_copy = false;
        char *template = NULL;
+       bool foreign_mode = false;
+       char *xattr = NULL;
+       uint32_t type = LU_FOREIGN_TYPE_NONE, flags = 0;
+       char *mode_opt = NULL;
+       mode_t previous_umask = 0;
+       mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
 
        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 },
+/* find        { .val = 'B',   .name = "btime",        .has_arg = required_argument }*/
        { .val = LFS_COMP_ADD_OPT,
                        .name = "comp-add",     .has_arg = no_argument },
        { .val = LFS_COMP_ADD_OPT,
@@ -2611,16 +3162,21 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                                .has_arg = no_argument},
        { .val = LFS_COMP_NO_VERIFY_OPT,
                        .name = "no-verify",    .has_arg = no_argument},
-       { .val = LFS_MIRROR_FLAGS_OPT,
+       { .val = LFS_LAYOUT_FLAGS_OPT,
                        .name = "flags",        .has_arg = required_argument},
+       { .val = LFS_LAYOUT_FOREIGN_OPT,
+                       .name = "foreign",      .has_arg = optional_argument},
        { .val = LFS_MIRROR_ID_OPT,
                        .name = "mirror-id",    .has_arg = required_argument},
+       { .val = LFS_MODE_OPT,
+                       .name = "mode",         .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 = 'C',   .name = "overstripe-count",
+                                               .has_arg = required_argument},
        { .val = 'd',   .name = "delete",       .has_arg = no_argument},
        { .val = 'd',   .name = "destroy",      .has_arg = no_argument},
        /* --non-direct is only valid in migrate mode */
@@ -2638,6 +3194,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
        { .val = 'i',   .name = "stripe_index", .has_arg = required_argument},
        { .val = 'I',   .name = "comp-id",      .has_arg = required_argument},
        { .val = 'I',   .name = "component-id", .has_arg = required_argument},
+/* find { .val = 'l',  .name = "lazy",         .has_arg = no_argument }, */
        { .val = 'L',   .name = "layout",       .has_arg = required_argument },
        { .val = 'm',   .name = "mdt",          .has_arg = required_argument},
        { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument},
@@ -2663,19 +3220,28 @@ static int lfs_setstripe_internal(int argc, char **argv,
 /* find        { .val = 'U',   .name = "user",         .has_arg = required_argument }*/
        /* --verbose is only valid in migrate mode */
        { .val = 'v',   .name = "verbose",      .has_arg = no_argument},
+       { .val = 'x',   .name = "xattr",        .has_arg = required_argument },
        { .val = 'y',   .name = "yaml",         .has_arg = required_argument },
+       { .val = 'z',   .name = "ext-size",     .has_arg = required_argument},
+       { .val = 'z',   .name = "extension-size", .has_arg = required_argument},
        { .name = NULL } };
 
        setstripe_args_init(&lsa);
 
        migrate_mode = (opc == SO_MIGRATE);
        mirror_mode = (opc == SO_MIRROR_CREATE || opc == SO_MIRROR_EXTEND);
+       setstripe_mode = (opc == SO_SETSTRIPE);
+       if (opc == SO_MIRROR_DELETE) {
+               delete = 1;
+               mirror_flags = MF_DESTROY;
+       }
 
        snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
        progname = cmd;
        while ((c = getopt_long(argc, argv,
-                               "bc:dDE:f:H:i:I:m:N::no:p:L:s:S:vy:", long_opts,
-                               NULL)) >= 0) {
+                               "bc:C:dDE:f:H:i:I:m:N::no:p:L:s:S:vx:y:z:",
+                               long_opts, NULL)) >= 0) {
+               size_units = 1;
                switch (c) {
                case 0:
                        /* Long options. */
@@ -2696,14 +3262,6 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                        progname);
                                goto usage_error;
                        }
-                       if (lsa.lsa_comp_neg_flags & LCME_FL_STALE) {
-                               fprintf(stderr,
-                                       "%s: cannot clear 'stale' flags from component. Please use lfs-mirror-resync(1) instead\n",
-                                       progname);
-                               result = -EINVAL;
-                               goto error;
-                       }
-
                        break;
                case LFS_COMP_SET_OPT:
                        comp_set = 1;
@@ -2720,8 +3278,20 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                goto usage_error;
                        }
                        break;
-               case LFS_MIRROR_FLAGS_OPT: {
-                       __u32 flags;
+               case LFS_LAYOUT_FLAGS_OPT: {
+                       uint32_t neg_flags;
+
+                       /* check for numeric flags (foreign and mirror cases) */
+                       if (setstripe_mode && !mirror_mode && !last_mirror) {
+                               flags = strtoul(optarg, &end, 16);
+                               if (*end != '\0') {
+                                       fprintf(stderr,
+                                               "%s %s: bad flags '%s'\n",
+                                               progname, argv[0], optarg);
+                                       return CMD_HELP;
+                               }
+                               break;
+                       }
 
                        if (!mirror_mode || !last_mirror) {
                                fprintf(stderr, "error: %s: --flags must be specified with --mirror-count|-N option\n",
@@ -2730,17 +3300,17 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
 
                        result = comp_str2flags(optarg, &last_mirror->m_flags,
-                                               &flags);
+                                               &neg_flags);
                        if (result != 0)
                                goto usage_error;
 
-                       if (flags) {
+                       if (neg_flags) {
                                fprintf(stderr, "%s: inverted flags are not supported\n",
                                        progname);
                                result = -EINVAL;
                                goto usage_error;
                        }
-                       if (last_mirror->m_flags & ~LCME_USER_FLAGS) {
+                       if (last_mirror->m_flags & ~LCME_USER_MIRROR_FLAGS) {
                                fprintf(stderr,
                                        "%s: unsupported mirror flags: %s\n",
                                        progname, optarg);
@@ -2749,6 +3319,37 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
                        break;
                }
+               case LFS_LAYOUT_FOREIGN_OPT:
+                       if (optarg != NULL) {
+                               /* check pure numeric */
+                               type = strtoul(optarg, &end, 0);
+                               if (*end) {
+                                       /* check name */
+                                       type = check_foreign_type_name(optarg);
+                                       if (type == LU_FOREIGN_TYPE_UNKNOWN) {
+                                               fprintf(stderr,
+                                                       "%s %s: unrecognized foreign type '%s'\n",
+                                                       progname, argv[0],
+                                                       optarg);
+                                               return CMD_HELP;
+                                       }
+                               }
+                       }
+                       foreign_mode = true;
+                       break;
+               case LFS_MODE_OPT:
+                       mode_opt = optarg;
+                       if (mode_opt != NULL) {
+                               mode = strtoul(mode_opt, &end, 8);
+                               if (*end != '\0') {
+                                       fprintf(stderr,
+                                               "%s %s: bad mode '%s'\n",
+                                               progname, argv[0], mode_opt);
+                                       return CMD_HELP;
+                               }
+                               previous_umask = umask(0);
+                       }
+                       break;
                case LFS_LAYOUT_COPY:
                        from_copy = true;
                        template = optarg;
@@ -2762,6 +3363,15 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
                        migration_block = true;
                        break;
+               case 'C':
+                       if (lsa.lsa_pattern == LLAPI_LAYOUT_MDT) {
+                               fprintf(stderr,
+                                       "%s %s: -C|--overstripe-count incompatible with DoM layout\n",
+                                       progname, argv[0]);
+                               goto usage_error;
+                       }
+                       lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING;
+                       /* fall through */
                case 'c':
                        lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
                        if (*end != '\0') {
@@ -2801,9 +3411,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        if (lsa.lsa_comp_end != 0) {
                                result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
-                                       fprintf(stderr,
-                                               "%s %s: invalid layout\n",
-                                               progname, argv[0]);
+                                       fprintf(stderr, "%s: invalid layout\n",
+                                               progname);
                                        goto usage_error;
                                }
 
@@ -2910,14 +3519,14 @@ static int lfs_setstripe_internal(int argc, char **argv,
                case 'm':
                        if (!migrate_mode) {
                                fprintf(stderr,
-                                       "%s %s: -m|--mdt is valid only for migrate command\n",
+                                       "%s %s: -m|--mdt-index is valid only for migrate command\n",
                                        progname, argv[0]);
                                goto usage_error;
                        }
                        migrate_mdt_mode = true;
                        lsa.lsa_nr_tgts = parse_targets(tgts,
                                                sizeof(tgts) / sizeof(__u32),
-                                               lsa.lsa_nr_tgts, optarg);
+                                               lsa.lsa_nr_tgts, optarg, NULL);
                        if (lsa.lsa_nr_tgts < 0) {
                                fprintf(stderr,
                                        "%s %s: invalid MDT target(s) '%s'\n",
@@ -2963,6 +3572,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
 
                        if (last_mirror != NULL) {
                                /* wrap up last mirror */
+                               if (!setstripe_args_specified(&lsa))
+                                       last_mirror->m_inherit = true;
                                if (lsa.lsa_comp_end == 0)
                                        lsa.lsa_comp_end = LUSTRE_EOF;
 
@@ -2986,9 +3597,21 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                fprintf(stderr, "warning: '--ost-list' is "
                                        "deprecated, use '--ost' instead\n");
 #endif
+                       if (lsa.lsa_pattern == LLAPI_LAYOUT_MDT) {
+                               fprintf(stderr,
+                                       "%s %s: -o|--ost incompatible with DoM layout\n",
+                                       progname, argv[0]);
+                               goto usage_error;
+                       }
+                       /* -o allows overstriping, and must note it because
+                        * parse_targets is shared with MDT striping, which
+                        * does not allow duplicates
+                        */
+                       lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING;
                        lsa.lsa_nr_tgts = parse_targets(tgts,
                                                sizeof(tgts) / sizeof(__u32),
-                                               lsa.lsa_nr_tgts, optarg);
+                                               lsa.lsa_nr_tgts, optarg,
+                                               &lsa.lsa_pattern);
                        if (lsa.lsa_nr_tgts < 0) {
                                fprintf(stderr,
                                        "%s %s: invalid OST target(s) '%s'\n",
@@ -3030,10 +3653,26 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
                        migration_flags = MIGRATION_VERBOSE;
                        break;
+               case 'x':
+                       xattr = optarg;
+                       break;
                case 'y':
                        from_yaml = true;
                        template = optarg;
                        break;
+               case 'z':
+                       result = llapi_parse_size(optarg,
+                                                 &lsa.lsa_extension_size,
+                                                 &size_units, 0);
+                       if (result) {
+                               fprintf(stderr,
+                                       "%s %s: invalid extension size '%s'\n",
+                                       progname, argv[0], optarg);
+                               goto usage_error;
+                       }
+
+                       lsa.lsa_extension_comp = true;
+                       break;
                default:
                        fprintf(stderr, "%s %s: unrecognized option '%s'\n",
                                progname, argv[0], argv[optind - 1]);
@@ -3049,6 +3688,34 @@ static int lfs_setstripe_internal(int argc, char **argv,
                goto usage_error;
        }
 
+       /* lfs migrate $filename should keep the file's layout by default */
+       if (migrate_mode && !setstripe_args_specified(&lsa) && !layout &&
+           !from_yaml)
+               from_copy = true;
+
+       if (xattr && !foreign_mode) {
+               /* only print a warning as this is harmless and will be ignored
+                */
+               fprintf(stderr,
+                       "%s %s: xattr has been specified for non-foreign layout\n",
+                       progname, argv[0]);
+       } else if (foreign_mode && !xattr) {
+               fprintf(stderr,
+                       "%s %s: xattr must be provided in foreign mode\n",
+                       progname, argv[0]);
+               goto usage_error;
+       }
+
+       if (foreign_mode && (!setstripe_mode || comp_add | comp_del ||
+           comp_set || comp_id || delete || from_copy ||
+           setstripe_args_specified(&lsa) || lsa.lsa_nr_tgts ||
+           lsa.lsa_tgts)) {
+               fprintf(stderr,
+                       "%s %s: only --xattr/--flags/--mode options are valid with --foreign\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
        if (mirror_mode && mirror_count == 0) {
                fprintf(stderr,
                        "error: %s: --mirror-count|-N option is required\n",
@@ -3058,14 +3725,20 @@ static int lfs_setstripe_internal(int argc, char **argv,
        }
 
        if (mirror_mode) {
+               if (!setstripe_args_specified(&lsa))
+                       last_mirror->m_inherit = true;
                if (lsa.lsa_comp_end == 0)
                        lsa.lsa_comp_end = LUSTRE_EOF;
        }
 
        if (lsa.lsa_comp_end != 0) {
                result = comp_args_to_layout(lpp, &lsa, true);
-               if (result)
+               if (result) {
+                       fprintf(stderr, "error: %s: invalid layout\n",
+                               progname);
+                       result = -EINVAL;
                        goto error;
+               }
        }
 
        if (mirror_flags & MF_NO_VERIFY) {
@@ -3084,9 +3757,6 @@ static int lfs_setstripe_internal(int argc, char **argv,
                }
        }
 
-       /* Only LCME_FL_INIT flags is used in PFL, and it shouldn't be
-        * altered by user space tool, so we don't need to support the
-        * --component-set for this moment. */
        if (comp_set && !comp_id) {
                fprintf(stderr, "%s %s: --component-set doesn't have component-id set\n",
                        progname, argv[0]);
@@ -3149,12 +3819,6 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                progname, argv[0]);
                        goto usage_error;
                }
-
-               result = adjust_first_extent(fname, layout);
-               if (result == -ENODATA)
-                       comp_add = 0;
-               else if (result != 0)
-                       goto error;
        }
 
        if (from_yaml && from_copy) {
@@ -3166,8 +3830,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
 
        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",
+               fprintf(stderr, "error: %s: can't specify --yaml or --copy with"
+                       " -c, -S, -i, -o, -p or -E options.\n",
                        argv[0]);
                goto error;
        }
@@ -3179,11 +3843,11 @@ static int lfs_setstripe_internal(int argc, char **argv,
                goto usage_error;
        }
 
-       if (!comp_del && !comp_set && (opc != SO_MIRROR_SPLIT) &&
-           comp_id != 0) {
+       if (!comp_del && !comp_set && opc != SO_MIRROR_SPLIT &&
+           opc != SO_MIRROR_DELETE && comp_id != 0) {
                fprintf(stderr,
-               "%s %s: option -I can only be used with --component-del or --component-set or lfs mirror split\n",
-                       progname, argv[0]);
+                       "%s: option -I can only be used with --component-del or --component-set or lfs mirror split\n",
+                       progname);
                goto usage_error;
        }
 
@@ -3213,10 +3877,12 @@ static int lfs_setstripe_internal(int argc, char **argv,
                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)
+                       lmu->lum_hash_type = LMV_HASH_TYPE_UNKNOWN;
+               if (lsa.lsa_pool_name) {
                        strncpy(lmu->lum_pool_name, lsa.lsa_pool_name,
-                               sizeof(lmu->lum_pool_name));
+                               sizeof(lmu->lum_pool_name) - 1);
+                       lmu->lum_pool_name[sizeof(lmu->lum_pool_name) - 1] = 0;
+               }
                if (lsa.lsa_nr_tgts > 1) {
                        int i;
 
@@ -3226,7 +3892,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                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);
+                                       lsa.lsa_nr_tgts);
                                free(lmu);
                                goto usage_error;
                        }
@@ -3265,6 +3931,14 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        param->lsp_stripe_offset = -1;
                else
                        param->lsp_stripe_offset = lsa.lsa_stripe_off;
+               param->lsp_stripe_pattern =
+                               llapi_pattern_to_lov(lsa.lsa_pattern);
+               if (param->lsp_stripe_pattern == EINVAL) {
+                       fprintf(stderr, "error: %s: invalid stripe pattern\n",
+                               argv[0]);
+                       free(param);
+                       goto usage_error;
+               }
                param->lsp_pool = lsa.lsa_pool_name;
                param->lsp_is_specific = false;
                if (lsa.lsa_nr_tgts > 0) {
@@ -3272,9 +3946,9 @@ static int lfs_setstripe_internal(int argc, char **argv,
                            lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
                            lsa.lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
                            lsa.lsa_nr_tgts != lsa.lsa_stripe_count) {
-                               fprintf(stderr, "error: %s: stripe count %lld "
-                                       "doesn't match the number of OSTs: %d\n"
-                                       argv[0], lsa.lsa_stripe_count,
+                               fprintf(stderr,
+                                       "error: %s: stripe count %lld doesn't match the number of OSTs: %d\n",
+                                       argv[0], lsa.lsa_stripe_count,
                                        lsa.lsa_nr_tgts);
                                free(param);
                                goto usage_error;
@@ -3297,17 +3971,34 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                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);
+       }
+
+       if (layout != NULL || mirror_list != NULL) {
+               if (mirror_list)
+                       result = mirror_adjust_first_extents(mirror_list);
+               else
+                       result = layout_adjust_first_extent(fname, layout,
+                                                           comp_add);
+               if (result == -ENODATA)
+                       comp_add = 0;
+               else if (result != 0) {
+                       fprintf(stderr, "error: %s: invalid layout\n",
+                               progname);
                        goto error;
                }
        }
 
        for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
+               if (from_copy) {
+                       layout = llapi_layout_get_by_path(template ?: fname, 0);
+                       if (layout == NULL) {
+                               fprintf(stderr, "%s: can't create composite "
+                                       "layout from file %s.\n",
+                                       progname, template ?: fname);
+                               goto error;
+                       }
+               }
+
                if (migrate_mdt_mode) {
                        result = llapi_migrate_mdt(fname, &migrate_mdt_param);
                } else if (migrate_mode) {
@@ -3328,23 +4019,33 @@ static int lfs_setstripe_internal(int argc, char **argv,
                } else if (opc == SO_MIRROR_EXTEND) {
                        result = mirror_extend(fname, mirror_list,
                                               mirror_flags);
-               } else if (opc == SO_MIRROR_SPLIT) {
-                       if (mirror_id == 0 && comp_id == 0) {
+               } else if (opc == SO_MIRROR_SPLIT || opc == SO_MIRROR_DELETE) {
+                       if (!mirror_id && !comp_id && !lsa.lsa_pool_name) {
                                fprintf(stderr,
-                       "%s %s: no mirror id or component id is specified\n",
-                                       progname, argv[0]);
+                                       "%s: no mirror specified to delete from '%s'\n",
+                                       progname, fname);
                                goto usage_error;
                        }
-                       if (mirror_id != 0)
+                       if (lsa.lsa_pool_name)
+                               mirror_flags |= MF_COMP_POOL;
+                       else if (mirror_id != 0)
                                comp_id = mirror_id;
                        else
                                mirror_flags |= MF_COMP_ID;
-                       result = mirror_split(fname, comp_id, mirror_flags,
+                       result = mirror_split(fname, comp_id, lsa.lsa_pool_name,
+                                             mirror_flags,
                                              has_m_file ? mirror_list->m_file :
                                              NULL);
                } else if (layout != NULL) {
                        result = lfs_component_create(fname, O_CREAT | O_WRONLY,
-                                                     0666, layout);
+                                                     mode, layout);
+                       if (result >= 0) {
+                               close(result);
+                               result = 0;
+                       }
+               } else if (foreign_mode) {
+                       result = llapi_file_create_foreign(fname, mode, type,
+                                                          flags, xattr);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -3352,7 +4053,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                } else {
                        result = llapi_file_open_param(fname,
                                                       O_CREAT | O_WRONLY,
-                                                      0666, param);
+                                                      mode, param);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -3366,6 +4067,9 @@ static int lfs_setstripe_internal(int argc, char **argv,
                }
        }
 
+       if (mode_opt != NULL)
+               umask(previous_umask);
+
        free(param);
        free(migrate_mdt_param.fp_lmv_md);
        llapi_layout_free(layout);
@@ -3387,11 +4091,13 @@ 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;
+       long long t = 0;
        int res = 0;
-       char *endptr;
+       char *endptr = "AD";
+       char *timebuf;
 
        if (str[0] == '+')
                res = 1;
@@ -3401,23 +4107,48 @@ static int set_time(time_t *time, time_t *set, char *str)
        if (res)
                str++;
 
-       t = strtol(str, &endptr, 0);
-       if (*endptr != '\0') {
-               fprintf(stderr,
-                       "%s find: bad time '%s': %s\n",
-                       progname, str, strerror(EINVAL));
-               return INT_MAX;
+       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 (param->fp_time_margin == 0 ||
+                   (*endptr && unit < param->fp_time_margin))
+                       param->fp_time_margin = unit;
+
+               t += val * unit;
        }
-       if (*time < t * 24 * 60 * 60) {
+       if (*time < t) {
                if (res != 0)
                        str--;
-               fprintf(stderr,
-                       "%s find: bad time '%s': too large\n",
+               fprintf(stderr, "%s find: bad time '%s': too large\n",
                        progname, str);
-               return INT_MAX;
+               return LONG_MAX;
        }
 
-       *set = *time - t * 24 * 60 * 60;
+       *set = *time - t;
+
        return res;
 }
 
@@ -3489,6 +4220,8 @@ static int name2layout(__u32 *layout, char *name)
                        *layout |= LOV_PATTERN_RAID0;
                else if (strcmp(layout_name, "mdt") == 0)
                        *layout |= LOV_PATTERN_MDT;
+               else if (strcmp(layout_name, "overstriping") == 0)
+                       *layout |= LOV_PATTERN_OVERSTRIPING;
                else
                        return -1;
        }
@@ -3503,10 +4236,13 @@ 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 = 'B',   .name = "btime",        .has_arg = required_argument },
+       { .val = 'B',   .name = "Btime",        .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -3524,6 +4260,60 @@ static int lfs_find(int argc, char **argv)
                                                .has_arg = required_argument },
        { .val = LFS_MIRROR_STATE_OPT,
                        .name = "mirror-state", .has_arg = required_argument },
+       { .val = LFS_LAYOUT_FOREIGN_OPT,
+                       .name = "foreign",      .has_arg = optional_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newer",        .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "neweraa",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "neweram",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerac",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerab",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerma",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newermm",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newermc",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newermb",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerca",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newercm",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newercc",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newercb",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerba",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerbm",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerbc",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerbb",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerBa",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerBm",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerBc",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerBB",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerat",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newermt",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerct",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerbt",      .has_arg = required_argument},
+       { .val = LFS_NEWERXY_OPT,
+                       .name = "newerBt",      .has_arg = required_argument},
        { .val = 'c',   .name = "stripe-count", .has_arg = required_argument },
        { .val = 'c',   .name = "stripe_count", .has_arg = required_argument },
        { .val = 'C',   .name = "ctime",        .has_arg = required_argument },
@@ -3533,12 +4323,15 @@ static int lfs_find(int argc, char **argv)
        { .val = 'E',   .name = "component-end",
                                                .has_arg = required_argument },
 /* find        { .val = 'F',   .name = "fid",          .has_arg = no_argument }, */
+       { .val = LFS_LAYOUT_FOREIGN_OPT,
+                       .name = "foreign",      .has_arg = optional_argument},
        { .val = 'g',   .name = "gid",          .has_arg = required_argument },
        { .val = 'G',   .name = "group",        .has_arg = required_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 },
 /* getstripe { .val = 'I', .name = "comp-id",  .has_arg = required_argument }*/
+       { .val = 'l',   .name = "lazy",         .has_arg = no_argument },
        { .val = 'L',   .name = "layout",       .has_arg = required_argument },
        { .val = 'm',   .name = "mdt",          .has_arg = required_argument },
        { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
@@ -3566,23 +4359,28 @@ static int lfs_find(int argc, char **argv)
        { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
        { .val = 'u',   .name = "uid",          .has_arg = required_argument },
        { .val = 'U',   .name = "user",         .has_arg = required_argument },
+       { .val = 'z',   .name = "extension-size",
+                                               .has_arg = required_argument },
+       { .val = 'z',   .name = "ext-size",     .has_arg = required_argument },
 /* getstripe { .val = 'v', .name = "verbose",  .has_arg = no_argument }, */
 /* getstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
        { .name = NULL } };
-        int pathstart = -1;
-        int pathend = -1;
-        int neg_opt = 0;
-        time_t *xtime;
-        int *xsign;
-        int isoption;
-        char *endptr;
+       int optidx = 0;
+       int pathstart = -1;
+       int pathend = -1;
+       int pathbad = -1;
+       int neg_opt = 0;
+       time_t *xtime;
+       int *xsign;
+       int isoption;
+       char *endptr;
 
-        time(&t);
+       time(&t);
 
        /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
        while ((c = getopt_long_only(argc, argv,
-                       "-0A:b:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:v",
-                       long_opts, NULL)) >= 0) {
+               "-0A:b:B:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:",
+               long_opts, &optidx)) >= 0) {
                 xtime = NULL;
                 xsign = NULL;
                 if (neg_opt)
@@ -3621,6 +4419,13 @@ static int lfs_find(int argc, char **argv)
                        xtime = &param.fp_atime;
                        xsign = &param.fp_asign;
                        param.fp_exclude_atime = !!neg_opt;
+                       /* no break, this falls through to 'B' for btime */
+               case 'B':
+                       if (c == 'B') {
+                               xtime = &param.fp_btime;
+                               xsign = &param.fp_bsign;
+                               param.fp_exclude_btime = !!neg_opt;
+                       }
                        /* no break, this falls through to 'C' for ctime */
                case 'C':
                        if (c == 'C') {
@@ -3635,8 +4440,8 @@ 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;
                        }
@@ -3780,6 +4585,176 @@ static int lfs_find(int argc, char **argv)
                        param.fp_check_comp_end = 1;
                        param.fp_exclude_comp_end = !!neg_opt;
                        break;
+               case LFS_LAYOUT_FOREIGN_OPT: {
+                       /* all types by default */
+                       uint32_t type = LU_FOREIGN_TYPE_UNKNOWN;
+
+                       if (optarg != NULL) {
+                               /* check pure numeric */
+                               type = strtoul(optarg, &endptr, 0);
+                               if (*endptr) {
+                                       /* check name */
+                                       type = check_foreign_type_name(optarg);
+                                       if (type == LU_FOREIGN_TYPE_UNKNOWN) {
+                                               fprintf(stderr,
+                                                       "%s %s: unknown foreign type '%s'\n",
+                                                       progname, argv[0],
+                                                       optarg);
+                                               return CMD_HELP;
+                                       }
+                               }
+                       }
+                       param.fp_foreign_type = type;
+                       param.fp_check_foreign = 1;
+                       param.fp_exclude_foreign = !!neg_opt;
+                       break;
+               }
+               case LFS_NEWERXY_OPT: {
+                       char x = 'm';
+                       char y = 'm';
+                       int xidx;
+                       int negidx;
+                       time_t *newery;
+                       time_t ref = time(NULL);
+
+                       /* no need to check bad options, they won't get here */
+                       if (strlen(long_opts[optidx].name) == 7) {
+                               x = long_opts[optidx].name[5];
+                               y = long_opts[optidx].name[6];
+                       }
+
+                       if (y == 't') {
+                               static const char *const fmts[] = {
+                                       "%Y-%m-%d %H:%M:%S",
+                                       "%Y-%m-%d %H:%M",
+                                       "%Y-%m-%d",
+                                       "%H:%M:%S", /* sometime today */
+                                       "%H:%M",
+                                       "@%s",
+                                       "%s",
+                                       NULL };
+                               struct tm tm;
+                               bool found = false;
+                               int i;
+
+                               for (i = 0; fmts[i] != NULL; i++) {
+                                       char *ptr;
+
+                                       /* Init for times relative to today */
+                                       if (strncmp(fmts[i], "%H", 2) == 0)
+                                               localtime_r(&ref, &tm);
+                                       else
+                                               memset(&tm, 0, sizeof(tm));
+                                       ptr = strptime(optarg, fmts[i], &tm);
+                                       /* Skip spaces */
+                                       while (ptr && isspace(*ptr))
+                                               ptr++;
+                                       if (ptr == optarg + strlen(optarg)) {
+                                               found = true;
+                                               break;
+                                       }
+                               }
+
+                               if (!found) {
+                                       fprintf(stderr,
+                                               "%s: invalid time '%s'\n",
+                                               progname, optarg);
+                                       fprintf(stderr,
+                                               "supported formats are:\n  ");
+                                       for (i = 0; fmts[i] != NULL; i++)
+                                               fprintf(stderr, "'%s', ",
+                                                       fmts[i]);
+                                       fprintf(stderr, "\n");
+                                       ret = -EINVAL;
+                                       goto err;
+                               }
+
+                               ref = mktime(&tm);
+                       } else if (y == 'b' || y == 'B') {
+                               lstatx_t stx;
+
+                               rc = llapi_get_lum_file(optarg, NULL, &stx,
+                                                       NULL, 0);
+                               if (rc || !(stx.stx_mask & STATX_BTIME)) {
+                                       if (!(stx.stx_mask & STATX_BTIME))
+                                               ret = -EOPNOTSUPP;
+                                       else
+                                               ret = -errno;
+                                       fprintf(stderr,
+                                               "%s: get btime failed '%s': %s\n",
+                                               progname, optarg,
+                                               strerror(-ret));
+                                       goto err;
+                               }
+
+                               ref = stx.stx_btime.tv_sec;
+                       } else {
+                               struct stat statbuf;
+
+                               if (stat(optarg, &statbuf) < 0) {
+                                       fprintf(stderr,
+                                               "%s: cannot stat file '%s': %s\n",
+                                               progname, optarg,
+                                               strerror(errno));
+                                       ret = -errno;
+                                       goto err;
+                               }
+
+                               switch (y) {
+                               case 'a':
+                                       ref = statbuf.st_atime;
+                                       break;
+                               case 'm':
+                                       ref = statbuf.st_mtime;
+                                       break;
+                               case 'c':
+                                       ref = statbuf.st_ctime;
+                                       break;
+                               default:
+                                       fprintf(stderr,
+                                               "%s: invalid Y argument: '%c'\n",
+                                               progname, x);
+                                       ret = -EINVAL;
+                                       goto err;
+                               }
+                       }
+
+                       switch (x) {
+                       case 'a':
+                               xidx = NEWERXY_ATIME;
+                               break;
+                       case 'm':
+                               xidx = NEWERXY_MTIME;
+                               break;
+                       case 'c':
+                               xidx = NEWERXY_CTIME;
+                               break;
+                       case 'b':
+                       case 'B':
+                               xidx = NEWERXY_BTIME;
+                               break;
+                       default:
+                               fprintf(stderr,
+                                       "%s: invalid X argument: '%c'\n",
+                                       progname, x);
+                               ret = -EINVAL;
+                               goto err;
+                       }
+
+                       negidx = !!neg_opt;
+                       newery = &param.fp_newery[xidx][negidx];
+
+                       if (*newery == 0) {
+                               *newery = ref;
+                       } else {
+                               if (negidx)
+                                       *newery = *newery > ref ? ref : *newery;
+                               else
+                                       *newery = *newery > ref ? *newery : ref;
+                       }
+                       param.fp_newerxy = 1;
+                       break;
+               }
                case 'g':
                case 'G':
                        rc = name2gid(&param.fp_gid, optarg);
@@ -3806,6 +4781,9 @@ static int lfs_find(int argc, char **argv)
                        param.fp_check_hash_type = 1;
                        param.fp_exclude_hash_type = !!neg_opt;
                        break;
+               case 'l':
+                       param.fp_lazy = 1;
+                       break;
                case 'L':
                        ret = name2layout(&param.fp_layout, optarg);
                        if (ret)
@@ -4061,31 +5039,55 @@ err_free:
                        param.fp_check_mdt_count = 1;
                        param.fp_exclude_mdt_count = !!neg_opt;
                        break;
-                default:
-                        ret = CMD_HELP;
-                        goto err;
-                };
-        }
+               case 'z':
+                       if (optarg[0] == '+') {
+                               param.fp_ext_size_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.fp_ext_size_sign =  1;
+                               optarg++;
+                       }
 
-        if (pathstart == -1) {
-                fprintf(stderr, "error: %s: no filename|pathname\n",
-                        argv[0]);
-                ret = CMD_HELP;
-                goto err;
-        } else if (pathend == -1) {
-                /* no options */
-                pathend = argc;
-        }
+                       ret = llapi_parse_size(optarg, &param.fp_ext_size,
+                                              &param.fp_ext_size_units, 0);
+                       if (ret) {
+                               fprintf(stderr, "error: bad ext-size '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.fp_ext_size /= SEL_UNIT_SIZE;
+                       param.fp_ext_size_units /= SEL_UNIT_SIZE;
+                       param.fp_check_ext_size = 1;
+                       param.fp_exclude_ext_size = !!neg_opt;
+                       break;
+               default:
+                       ret = CMD_HELP;
+                       goto err;
+               };
+       }
+
+       if (pathstart == -1) {
+               fprintf(stderr, "error: %s: no filename|pathname\n",
+                       argv[0]);
+               ret = CMD_HELP;
+               goto err;
+       } else if (pathend == -1) {
+               /* no options */
+               pathend = argc;
+       }
 
        do {
                rc = llapi_find(argv[pathstart], &param);
-               if (rc != 0 && ret == 0)
+               if (rc && !ret) {
                        ret = rc;
+                       pathbad = pathstart;
+               }
        } while (++pathstart < pathend);
 
-        if (ret)
-                fprintf(stderr, "error: %s failed for %s.\n",
-                        argv[0], argv[optind - 1]);
+       if (ret)
+               fprintf(stderr, "%s: failed for '%s': %s\n",
+                       progname, argv[pathbad], strerror(-rc));
+
 err:
        if (param.fp_obd_uuid && param.fp_num_alloc_obds)
                free(param.fp_obd_uuid);
@@ -4102,6 +5104,8 @@ 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 }*/
+/* find        { .val = 'B',   .name = "btime",        .has_arg = required_argument }*/
+/* find        { .val = 'B',   .name = "Btime",        .has_arg = required_argument }*/
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = no_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -4133,6 +5137,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
        { .val = 'i',   .name = "stripe_index", .has_arg = no_argument },
        { .val = 'I',   .name = "comp-id",      .has_arg = optional_argument },
        { .val = 'I',   .name = "component-id", .has_arg = optional_argument },
+/* find { .val = 'l',  .name = "lazy",         .has_arg = no_argument }, */
        { .val = 'L',   .name = "layout",       .has_arg = no_argument },
        { .val = 'm',   .name = "mdt",          .has_arg = no_argument },
        { .val = 'm',   .name = "mdt-index",    .has_arg = no_argument },
@@ -4155,6 +5160,8 @@ static int lfs_getstripe_internal(int argc, char **argv,
 /* find        { .val = 'U',   .name = "user",         .has_arg = required_argument }*/
        { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
        { .val = 'y',   .name = "yaml",         .has_arg = no_argument },
+       { .val = 'z',   .name = "extension-size", .has_arg = no_argument },
+       { .val = 'z',   .name = "ext-size",     .has_arg = no_argument },
        { .name = NULL } };
        int c, rc;
        int neg_opt = 0;
@@ -4163,7 +5170,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
        char *end, *tmp;
 
        while ((c = getopt_long(argc, argv,
-                       "-cdDE::FghiI::LmMNoO:pqrRsSvy",
+                       "-cdDE::FghiI::LmMNoO:pqrRsSvyz",
                        long_opts, NULL)) != -1) {
                if (neg_opt)
                        --neg_opt;
@@ -4423,6 +5430,12 @@ static int lfs_getstripe_internal(int argc, char **argv,
                case 'y':
                        param->fp_yaml = 1;
                        break;
+               case 'z':
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_EXT_SIZE;
+                               param->fp_max_depth = 0;
+                       }
+                       break;
                default:
                        return CMD_HELP;
                }
@@ -4519,6 +5532,7 @@ static int lfs_getdirstripe(int argc, char **argv)
        { .val = 'O',   .name = "obd",          .has_arg = required_argument },
        { .val = 'r',   .name = "recursive",    .has_arg = no_argument },
        { .val = 'T',   .name = "mdt-count",    .has_arg = no_argument },
+       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
        { .val = 'y',   .name = "yaml",         .has_arg = no_argument },
        { .name = NULL } };
        int c, rc;
@@ -4526,7 +5540,7 @@ static int lfs_getdirstripe(int argc, char **argv)
        param.fp_get_lmv = 1;
 
        while ((c = getopt_long(argc, argv,
-                               "cDHimO:rtTy", long_opts, NULL)) != -1)
+                               "cDHimO:rtTvy", long_opts, NULL)) != -1)
        {
                switch (c) {
                case 'c':
@@ -4560,10 +5574,15 @@ static int lfs_getdirstripe(int argc, char **argv)
                case 'r':
                        param.fp_recursive = 1;
                        break;
+               case 'v':
+                       param.fp_verbose |= VERBOSE_DETAIL;
+                       break;
                case 'y':
                        param.fp_yaml = 1;
                        break;
                default:
+                       fprintf(stderr, "%s %s: unrecognized option '%s'\n",
+                               progname, argv[0], argv[optind - 1]);
                        return CMD_HELP;
                }
        }
@@ -4629,6 +5648,27 @@ static inline int obd_statfs_ratio(const struct obd_statfs *st, bool inodes)
        return (ratio - (int)ratio) > 0 ? (int)(ratio + 1) : (int)ratio;
 }
 
+/* This is to identify various problem states for "lfs df" if .osn_err = true,
+ * so only show flags reflecting those states by default. Informational states
+ * are only shown with "-v" and use lower-case names to distinguish them.
+ * UNUSED[12] were for "EROFS = 30" until 1.6 but are now available for use.
+ */
+static struct obd_statfs_state_names {
+       enum obd_statfs_state   osn_state;
+       const char              osn_name;
+       bool                    osn_err;
+} oss_names[] = {
+       { .osn_state = OS_STATFS_DEGRADED,   .osn_name = 'D', .osn_err = true },
+       { .osn_state = OS_STATFS_READONLY,   .osn_name = 'R', .osn_err = true },
+       { .osn_state = OS_STATFS_NOPRECREATE,.osn_name = 'N', .osn_err = true },
+       { .osn_state = OS_STATFS_UNUSED1,    .osn_name = '?', .osn_err = true },
+       { .osn_state = OS_STATFS_UNUSED2,    .osn_name = '?', .osn_err = true },
+       { .osn_state = OS_STATFS_ENOSPC,     .osn_name = 'S', .osn_err = true },
+       { .osn_state = OS_STATFS_ENOINO,     .osn_name = 'I', .osn_err = true },
+       { .osn_state = OS_STATFS_SUM,        .osn_name = 'a', /* aggregate */ },
+       { .osn_state = OS_STATFS_NONROT,     .osn_name = 'f', /* flash */     },
+};
+
 static int showdf(char *mntdir, struct obd_statfs *stat,
                  char *uuid, enum mntdf_flags flags,
                  char *type, int index, int rc)
@@ -4702,21 +5742,14 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        printf("[%s:%d]", type, index);
 
                if (stat->os_state) {
-                       /*
-                        * Each character represents the matching
-                        * OS_STATE_* bit.
-                        */
-                       const char state_names[] = "DRSI";
-                       __u32      state;
-                       __u32      i;
+                       uint32_t i;
 
                        printf(" ");
-                       for (i = 0, state = stat->os_state;
-                            state && i < sizeof(state_names); i++) {
-                               if (!(state & (1 << i)))
-                                       continue;
-                               printf("%c", state_names[i]);
-                               state ^= 1 << i;
+                       for (i = 0; i < ARRAY_SIZE(oss_names); i++) {
+                               if (oss_names[i].osn_state & stat->os_state &&
+                                   (oss_names[i].osn_err ||
+                                    flags & MNTDF_VERBOSE))
+                                       printf("%c", oss_names[i].osn_name);
                        }
                }
 
@@ -4761,6 +5794,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
                { .st_op = LL_STATFS_LOV,       .st_name = "OST" },
                { .st_name = NULL } };
        struct ll_stat_type *tp;
+       __u64 ost_files = 0;
        __u64 ost_ffree = 0;
        __u32 index;
        __u32 type;
@@ -4868,6 +5902,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
                                sum.os_ffree += stat_buf.os_ffree;
                                sum.os_files += stat_buf.os_files;
                        } else /* if (tp->st_op == LL_STATFS_LOV) */ {
+                               ost_files += stat_buf.os_files;
                                ost_ffree += stat_buf.os_ffree;
                        }
                        sum.os_blocks += stat_buf.os_blocks *
@@ -4881,11 +5916,12 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
 
        close(fd);
 
-       /* If we don't have as many objects free on the OST as inodes
-        * on the MDS, we reduce the total number of inodes to
-        * compensate, so that the "inodes in use" number is correct.
-        * Matches ll_statfs_internal() so the results are consistent. */
-       if (ost_ffree < sum.os_ffree) {
+       /* If we have _some_ OSTs, but don't have as many free objects on the
+        * OST as inodes on the MDTs, reduce the reported number of inodes
+        * to compensate, so that the "inodes in use" number is correct.
+        * This should be kept in sync with ll_statfs_internal().
+        */
+       if (ost_files && ost_ffree < sum.os_ffree) {
                sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
                sum.os_ffree = ost_ffree;
        }
@@ -4898,55 +5934,42 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
        return rc;
 }
 
-static int ll_statfs_data_comp(const void *sd1, const void *sd2)
-{
-       const struct obd_statfs *st1 = &((const struct ll_statfs_data *)sd1)->
-                                               sd_st;
-       const struct obd_statfs *st2 = &((const struct ll_statfs_data *)sd2)->
-                                               sd_st;
-       int r1 = obd_statfs_ratio(st1, false);
-       int r2 = obd_statfs_ratio(st2, false);
-       int64_t result = r1 - r2;
-
-       /* if both space usage are above 90, compare free inodes */
-       if (r1 > 90 && r2 > 90)
-               result = st2->os_ffree - st1->os_ffree;
-
-       if (result < 0)
-               return -1;
-       else if (result == 0)
-               return 0;
-       else
-               return 1;
-}
-
 /* functions */
 static int lfs_setdirstripe(int argc, char **argv)
 {
-       char                    *dname;
-       int                     result;
-       struct lfs_setstripe_args        lsa = { 0 };
-       struct llapi_stripe_param       *param = NULL;
-       __u32                   mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
-       char                    *end;
-       int                     c;
-       char                    *mode_opt = NULL;
-       bool                    default_stripe = false;
-       mode_t                  mode = S_IRWXU | S_IRWXG | S_IRWXO;
-       mode_t                  previous_mode = 0;
-       bool                    delete = false;
-       struct ll_statfs_buf    *lsb = NULL;
-       char                    mntdir[PATH_MAX] = "";
-       bool                    auto_distributed = false;
-
+       char *dname;
+       struct lfs_setstripe_args lsa = { 0 };
+       struct llapi_stripe_param *param = NULL;
+       __u32 mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
+       char *end;
+       int c;
+       char *mode_opt = NULL;
+       bool default_stripe = false;
+       bool delete = false;
+       bool foreign_mode = false;
+       mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO;
+       mode_t previous_mode = 0;
+       char *xattr = NULL;
+       __u32 type = LU_FOREIGN_TYPE_DAOS, flags = 0;
        struct option long_opts[] = {
        { .val = 'c',   .name = "count",        .has_arg = required_argument },
        { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument },
        { .val = 'd',   .name = "delete",       .has_arg = no_argument },
        { .val = 'D',   .name = "default",      .has_arg = no_argument },
        { .val = 'D',   .name = "default_stripe", .has_arg = no_argument },
+       { .val = LFS_LAYOUT_FLAGS_OPT,
+                       .name = "flags",        .has_arg = required_argument },
+       { .val = LFS_LAYOUT_FOREIGN_OPT,
+                       .name = "foreign",      .has_arg = optional_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
+/* find { .val = 'l',  .name = "lazy",         .has_arg = no_argument }, */
+       { .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
@@ -4956,12 +5979,14 @@ static int lfs_setdirstripe(int argc, char **argv)
 #endif
        { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
 /* setstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .val = 'x',   .name = "xattr",        .has_arg = required_argument },
        { .name = NULL } };
+       int result = 0;
 
        setstripe_args_init(&lsa);
 
-       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts,
-                               NULL)) >= 0) {
+       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:x:",
+                               long_opts, NULL)) >= 0) {
                switch (c) {
                case 0:
                        /* Long options. */
@@ -4983,6 +6008,33 @@ static int lfs_setdirstripe(int argc, char **argv)
                case 'D':
                        default_stripe = true;
                        break;
+               case LFS_LAYOUT_FOREIGN_OPT:
+                       if (optarg != NULL) {
+                               /* check pure numeric */
+                               type = strtoul(optarg, &end, 0);
+                               if (*end) {
+                                       /* check name */
+                                       type = check_foreign_type_name(optarg);
+                                       if (type == LU_FOREIGN_TYPE_UNKNOWN) {
+                                               fprintf(stderr,
+                                                       "%s %s: unknown foreign type '%s'\n",
+                                                       progname, argv[0],
+                                                       optarg);
+                                               return CMD_HELP;
+                                       }
+                               }
+                       }
+                       foreign_mode = true;
+                       break;
+               case LFS_LAYOUT_FLAGS_OPT:
+                       flags = strtoul(optarg, &end, 16);
+                       if (*end != '\0') {
+                               fprintf(stderr,
+                                       "%s %s: bad flags '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
                case 't':
                        fprintf(stderr, "warning: '--hash-type' and '-t' "
@@ -4998,6 +6050,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,
@@ -5006,7 +6061,7 @@ static int lfs_setdirstripe(int argc, char **argv)
 #endif
                        lsa.lsa_nr_tgts = parse_targets(mdts,
                                                sizeof(mdts) / sizeof(__u32),
-                                               lsa.lsa_nr_tgts, optarg);
+                                               lsa.lsa_nr_tgts, optarg, NULL);
                        if (lsa.lsa_nr_tgts < 0) {
                                fprintf(stderr,
                                        "%s %s: invalid MDT target(s) '%s'\n",
@@ -5018,7 +6073,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");
@@ -5026,6 +6081,9 @@ static int lfs_setdirstripe(int argc, char **argv)
                case 'o':
                        mode_opt = optarg;
                        break;
+               case 'x':
+                       xattr = optarg;
+                       break;
                default:
                        fprintf(stderr, "%s %s: unrecognized option '%s'\n",
                                progname, argv[0], argv[optind - 1]);
@@ -5039,8 +6097,30 @@ static int lfs_setdirstripe(int argc, char **argv)
                return CMD_HELP;
        }
 
+       if (xattr && !foreign_mode) {
+               /* only print a warning as this is armless and will be
+                * ignored
+                */
+               fprintf(stderr,
+                       "%s %s: xattr has been specified for non-foreign layout\n",
+                       progname, argv[0]);
+       } else if (foreign_mode && !xattr) {
+               fprintf(stderr,
+                       "%s %s: xattr must be provided in foreign mode\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
+       if (foreign_mode && (delete || default_stripe || lsa.lsa_nr_tgts ||
+           lsa.lsa_tgts || setstripe_args_specified(&lsa))) {
+               fprintf(stderr,
+                       "%s %s: only --xattr/--flags/--mode options are valid with --foreign\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
        if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
-           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) {
+           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT && !foreign_mode) {
                fprintf(stderr,
                        "%s %s: stripe offset and count must be specified\n",
                        progname, argv[0]);
@@ -5067,6 +6147,25 @@ static int lfs_setdirstripe(int argc, char **argv)
                previous_mode = umask(0);
        }
 
+       /* foreign LMV/dir case */
+       if (foreign_mode) {
+               if (argc > optind + 1) {
+                       fprintf(stderr,
+                               "%s %s: cannot specify multiple foreign dirs\n",
+                               progname, argv[0]);
+                       return CMD_HELP;
+               }
+
+               dname = argv[optind];
+               result = llapi_dir_create_foreign(dname, mode, type, flags,
+                                                 xattr);
+               if (result != 0)
+                       fprintf(stderr,
+                               "%s mkdir: can't create foreign dir '%s': %s\n",
+                               progname, dname, strerror(-result));
+               return result;
+       }
+
        /*
         * initialize stripe parameters, in case param is converted to specific,
         * i.e, 'lfs mkdir -i -1 -c N', always allocate space for lsp_tgts.
@@ -5081,6 +6180,11 @@ static int lfs_setdirstripe(int argc, char **argv)
                return CMD_HELP;
        }
 
+       /* if "lfs setdirstripe -D -i -1" is used, assume 1-stripe directory */
+       if (default_stripe && lsa.lsa_stripe_off == -1 &&
+           (lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT ||
+            lsa.lsa_stripe_count == 0))
+               lsa.lsa_stripe_count = 1;
        if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
                param->lsp_stripe_count = lsa.lsa_stripe_count;
        if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
@@ -5090,16 +6194,17 @@ static int lfs_setdirstripe(int argc, char **argv)
        if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
                param->lsp_stripe_pattern = lsa.lsa_pattern;
        else
-               param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64;
+               param->lsp_stripe_pattern = LMV_HASH_TYPE_UNKNOWN;
        param->lsp_pool = lsa.lsa_pool_name;
        param->lsp_is_specific = false;
        if (lsa.lsa_nr_tgts > 1) {
                if (lsa.lsa_stripe_count > 0 &&
                    lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
                    lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
-                       fprintf(stderr, "error: %s: stripe count %lld doesn't "
-                               "match the number of MDTs: %d\n",
-                               argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts);
+                       fprintf(stderr,
+                               "error: %s: stripe count %lld doesn't match the number of MDTs: %d\n",
+                               argv[0], lsa.lsa_stripe_count,
+                               lsa.lsa_nr_tgts);
                        free(param);
                        return CMD_HELP;
                }
@@ -5113,114 +6218,23 @@ static int lfs_setdirstripe(int argc, char **argv)
        do {
                if (default_stripe) {
                        result = llapi_dir_set_default_lmv(dname, param);
-               } else {
-                       /* if current \a dname isn't under the same \a mntdir
-                        * as the last one, and the last one was
-                        * auto-distributed, restore \a param.
-                        */
-                       if (mntdir[0] != '\0' &&
-                           strncmp(dname, mntdir, strlen(mntdir)) &&
-                           auto_distributed) {
-                               param->lsp_is_specific = false;
-                               param->lsp_stripe_offset = -1;
-                               auto_distributed = false;
-                       }
-
-                       if (!param->lsp_is_specific &&
-                           param->lsp_stripe_offset == -1) {
-                               char path[PATH_MAX] = "";
-
-                               if (!lsb) {
-                                       lsb = malloc(sizeof(*lsb));
-                                       if (!lsb) {
-                                               result = -ENOMEM;
-                                               break;
-                                       }
-                               }
-                               lsb->sb_count = 0;
-
-                               /* use mntdir for dirname() temporarily */
-                               strncpy(mntdir, dname, sizeof(mntdir));
-                               if (!realpath(dirname(mntdir), path)) {
-                                       result = -errno;
-                                       fprintf(stderr,
-                                               "error: invalid path '%s': %s\n",
-                                               argv[optind], strerror(errno));
-                                       break;
-                               }
-                               mntdir[0] = '\0';
-
-                               result = llapi_search_mounts(path, 0, mntdir,
-                                                            NULL);
-                               if (result < 0 || mntdir[0] == '\0') {
-                                       fprintf(stderr,
-                                               "No suitable Lustre mount found\n");
-                                       break;
-                               }
-
-                               result = mntdf(mntdir, NULL, NULL, 0,
-                                              LL_STATFS_LMV, lsb);
-                               if (result < 0)
-                                       break;
-
-                               if (param->lsp_stripe_count > lsb->sb_count) {
-                                       fprintf(stderr,
-                                               "error: stripe count %d is too big\n",
-                                               param->lsp_stripe_count);
-                                       result = -ERANGE;
-                                       break;
-                               }
-
-                               qsort(lsb->sb_buf, lsb->sb_count,
-                                     sizeof(struct ll_statfs_data),
-                                     ll_statfs_data_comp);
-
-                               auto_distributed = true;
-                       }
-
-                       if (auto_distributed) {
-                               int r;
-                               int nr = MAX(param->lsp_stripe_count,
-                                            lsb->sb_count / 2);
-
-                               /* don't use server whose usage is above 90% */
-                               while (nr != param->lsp_stripe_count &&
-                                      obd_statfs_ratio(&lsb->sb_buf[nr].sd_st,
-                                                       false) > 90)
-                                       nr = MAX(param->lsp_stripe_count,
-                                                nr / 2);
-
-                               /* get \a r between [0, nr) */
-                               r = rand() % nr;
-
-                               param->lsp_stripe_offset =
-                                       lsb->sb_buf[r].sd_index;
-                               if (param->lsp_stripe_count > 1) {
-                                       int i = 0;
-
-                                       param->lsp_is_specific = true;
-                                       for (; i < param->lsp_stripe_count; i++)
-                                               param->lsp_tgts[(i + r) % nr] =
-                                                       lsb->sb_buf[i].sd_index;
-                               }
-                       }
-
-                       result = llapi_dir_create(dname, mode, param);
+                       if (result)
+                               fprintf(stderr,
+                                       "%s setdirstripe: cannot set default stripe on dir '%s': %s\n",
+                                       progname, dname, strerror(-result));
+                       continue;
                }
 
-               if (result) {
+               result = llapi_dir_create(dname, mode, param);
+               if (result)
                        fprintf(stderr,
-                               "%s setdirstripe: cannot create stripe dir '%s': %s\n",
+                               "%s setdirstripe: cannot create dir '%s': %s\n",
                                progname, dname, strerror(-result));
-                       break;
-               }
-               dname = argv[++optind];
-       } while (dname != NULL);
+       } while (!result && (dname = argv[++optind]));
 
        if (mode_opt != NULL)
                umask(previous_mode);
 
-       free(lsb);
        free(param);
        return result;
 }
@@ -5263,6 +6277,7 @@ static int lfs_mv(int argc, char **argv)
        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 } };
@@ -5292,7 +6307,7 @@ static int lfs_mv(int argc, char **argv)
                }
        }
 
-       if (lmu.lum_stripe_offset == -1) {
+       if (lmu.lum_stripe_offset == LMV_OFFSET_DEFAULT) {
                fprintf(stderr, "%s mv: MDT index must be specified\n",
                        progname);
                return CMD_HELP;
@@ -5303,6 +6318,7 @@ static int lfs_mv(int argc, char **argv)
                return CMD_HELP;
        }
 
+       lmu.lum_hash_type = LMV_HASH_TYPE_UNKNOWN;
 
        /* initialize migrate mdt parameters */
        param.fp_lmv_md = &lmu;
@@ -5310,7 +6326,7 @@ static int lfs_mv(int argc, char **argv)
        rc = llapi_migrate_mdt(argv[optind], &param);
        if (rc != 0)
                fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n",
-                       progname, argv[optind], param.fp_mdt_index,
+                       progname, argv[optind], lmu.lum_stripe_offset,
                        strerror(-rc));
        return rc;
 }
@@ -5384,57 +6400,104 @@ static int lfs_df(int argc, char **argv)
        return rc;
 }
 
-static int lfs_getname(int argc, char **argv)
+static int print_instance(const char *mntdir, char *buf, size_t buflen,
+                         bool opt_instance, bool opt_fsname, bool opt_mntdir)
 {
-        char mntdir[PATH_MAX] = "", path[PATH_MAX] = "", fsname[PATH_MAX] = "";
-        int rc = 0, index = 0, c;
-        char buf[sizeof(struct obd_uuid)];
-
-        while ((c = getopt(argc, argv, "h")) != -1)
-                return CMD_HELP;
+       int rc = 0;
 
-        if (optind == argc) { /* no paths specified, get all paths. */
-                while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
-                        rc = llapi_getname(mntdir, buf, sizeof(buf));
-                        if (rc < 0) {
-                                fprintf(stderr,
-                                        "cannot get name for `%s': %s\n",
-                                        mntdir, strerror(-rc));
-                                break;
-                        }
+       if (opt_fsname == opt_instance) { /* both true or both false */
+               rc = llapi_getname(mntdir, buf, buflen);
+       } else if (opt_fsname) {
+               /* llapi_search_mounts() fills @buf with fsname, but that is not
+                * called if explicit paths are specified on the command-line
+                */
+               if (buf[0] == '\0')
+                       rc = llapi_get_fsname(mntdir, buf, buflen);
+       } else /* if (opt_instance) */ {
+               rc = llapi_get_instance(mntdir, buf, buflen);
+       }
 
-                        printf("%s %s\n", buf, mntdir);
+       if (rc < 0) {
+               fprintf(stderr, "cannot get instance for '%s': %s\n",
+                       mntdir, strerror(-rc));
+               return rc;
+       }
 
-                        path[0] = fsname[0] = mntdir[0] = 0;
-                }
-        } else { /* paths specified, only attempt to search these. */
-                for (; optind < argc; optind++) {
-                        rc = llapi_getname(argv[optind], buf, sizeof(buf));
-                        if (rc < 0) {
-                                fprintf(stderr,
-                                        "cannot get name for `%s': %s\n",
-                                        argv[optind], strerror(-rc));
-                                break;
-                        }
+       if (opt_mntdir)
+               printf("%s %s\n", buf, mntdir);
+       else
+               printf("%s\n", buf);
 
-                        printf("%s %s\n", buf, argv[optind]);
-                }
-        }
-        return rc;
+       return 0;
 }
 
-static int lfs_check(int argc, char **argv)
+static int lfs_getname(int argc, char **argv)
 {
-       char mntdir[PATH_MAX] = {'\0'};
-       int num_types = 1;
-       char *obd_types[3];
-       char obd_type1[4];
-       char obd_type2[4];
-       char obd_type3[4];
-       int rc;
+       struct option long_opts[] = {
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'i',   .name = "instance",     .has_arg = no_argument },
+       { .val = 'n',   .name = "fsname",       .has_arg = no_argument },
+       { .name = NULL} };
+       bool opt_instance = false, opt_fsname = false;
+       char fsname[PATH_MAX] = "";
+       int rc = 0, rc2, c;
 
-       if (argc != 2) {
-               fprintf(stderr, "%s check: server type must be specified\n",
+       while ((c = getopt_long(argc, argv, "hin", long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'i':
+                       opt_instance = true;
+                       break;
+               case 'n':
+                       opt_fsname = true;
+                       break;
+               case 'h':
+               default:
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind == argc) { /* no paths specified, get all paths. */
+               char mntdir[PATH_MAX] = "", path[PATH_MAX] = "";
+               int index = 0;
+
+               while (!llapi_search_mounts(path, index++, mntdir, fsname)) {
+                       rc2 = print_instance(mntdir, fsname, sizeof(fsname),
+                                            opt_instance, opt_fsname, true);
+                       if (!rc)
+                               rc = rc2;
+                       path[0] = fsname[0] = mntdir[0] = '\0';
+               }
+       } else { /* paths specified, only attempt to search these. */
+               bool opt_mntdir;
+
+               /* if only one path is given, print only requested info */
+               opt_mntdir = argc - optind > 1 || (opt_instance == opt_fsname);
+
+               for (; optind < argc; optind++) {
+                       rc2 = print_instance(argv[optind], fsname,
+                                            sizeof(fsname), opt_instance,
+                                            opt_fsname, opt_mntdir);
+                       if (!rc)
+                               rc = rc2;
+                       fsname[0] = '\0';
+               }
+       }
+
+       return rc;
+}
+
+static int lfs_check(int argc, char **argv)
+{
+       char mntdir[PATH_MAX] = {'\0'};
+       int num_types = 1;
+       char *obd_types[3];
+       char obd_type1[4];
+       char obd_type2[4];
+       char obd_type3[4];
+       int rc;
+
+       if (argc != 2) {
+               fprintf(stderr, "%s check: server type must be specified\n",
                        progname);
                return CMD_HELP;
        }
@@ -5575,28 +6638,38 @@ static inline int has_times_option(int argc, char **argv)
         return 0;
 }
 
-int lfs_setquota_times(int argc, char **argv)
+static inline int lfs_verify_poolarg(char *pool)
 {
-        int c, rc;
-        struct if_quotactl qctl;
-        char *mnt, *obd_type = (char *)qctl.obd_type;
-        struct obd_dqblk *dqb = &qctl.qc_dqblk;
-        struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
-        struct option long_opts[] = {
+       if (strnlen(optarg, LOV_MAXPOOLNAME + 1) > LOV_MAXPOOLNAME) {
+               fprintf(stderr,
+                       "Pool name '%.*s' is longer than %d\n",
+                       LOV_MAXPOOLNAME, pool, LOV_MAXPOOLNAME);
+               return 1;
+       }
+       return 0;
+}
+
+int lfs_setquota_times(int argc, char **argv, struct if_quotactl *qctl)
+{
+       int c, rc;
+       char *mnt, *obd_type = (char *)qctl->obd_type;
+       struct obd_dqblk *dqb = &qctl->qc_dqblk;
+       struct obd_dqinfo *dqi = &qctl->qc_dqinfo;
+       struct option long_opts[] = {
        { .val = 'b',   .name = "block-grace",  .has_arg = required_argument },
        { .val = 'g',   .name = "group",        .has_arg = no_argument },
        { .val = 'i',   .name = "inode-grace",  .has_arg = required_argument },
        { .val = 'p',   .name = "projid",       .has_arg = no_argument },
        { .val = 't',   .name = "times",        .has_arg = no_argument },
        { .val = 'u',   .name = "user",         .has_arg = no_argument },
+       { .val = 'o',   .name = "pool",         .has_arg = required_argument },
        { .name = NULL } };
        int qtype;
 
-       memset(&qctl, 0, sizeof(qctl));
-       qctl.qc_cmd  = LUSTRE_Q_SETINFO;
-       qctl.qc_type = ALLQUOTA;
+       qctl->qc_cmd  = LUSTRE_Q_SETINFO;
+       qctl->qc_type = ALLQUOTA;
 
-       while ((c = getopt_long(argc, argv, "b:gi:ptu",
+       while ((c = getopt_long(argc, argv, "b:gi:ptuo:",
                                long_opts, NULL)) != -1) {
                switch (c) {
                case 'u':
@@ -5608,63 +6681,78 @@ int lfs_setquota_times(int argc, char **argv)
                case 'p':
                        qtype = PRJQUOTA;
 quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
+                       if (qctl->qc_type != ALLQUOTA) {
                                fprintf(stderr, "error: -u/g/p can't be used "
                                                 "more than once\n");
                                return CMD_HELP;
                        }
-                       qctl.qc_type = qtype;
+                       qctl->qc_type = qtype;
                        break;
-                case 'b':
-                        if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) {
-                                fprintf(stderr, "error: bad block-grace: %s\n",
-                                        optarg);
-                                return CMD_HELP;
-                        }
-                        dqb->dqb_valid |= QIF_BTIME;
-                        break;
-                case 'i':
-                        if ((dqi->dqi_igrace = str2sec(optarg)) == ULONG_MAX) {
-                                fprintf(stderr, "error: bad inode-grace: %s\n",
-                                        optarg);
-                                return CMD_HELP;
-                        }
-                        dqb->dqb_valid |= QIF_ITIME;
-                        break;
-                case 't': /* Yes, of course! */
-                        break;
-                default: /* getopt prints error message for us when opterr != 0 */
-                        return CMD_HELP;
-                }
-        }
+               case 'b':
+                       if (strncmp(optarg, NOTIFY_GRACE,
+                                   strlen(NOTIFY_GRACE)) == 0) {
+                               dqi->dqi_bgrace = NOTIFY_GRACE_TIME;
+                       } else {
+                               dqi->dqi_bgrace = str2sec(optarg);
+                               if (dqi->dqi_bgrace >= NOTIFY_GRACE_TIME) {
+                                       fprintf(stderr, "error: bad "
+                                               "block-grace: %s\n", optarg);
+                                       return CMD_HELP;
+                               }
+                       }
+                       dqb->dqb_valid |= QIF_BTIME;
+                       break;
+               case 'i':
+                       if (strncmp(optarg, NOTIFY_GRACE,
+                                   strlen(NOTIFY_GRACE)) == 0) {
+                               dqi->dqi_igrace = NOTIFY_GRACE_TIME;
+                       } else {
+                               dqi->dqi_igrace = str2sec(optarg);
+                               if (dqi->dqi_igrace >= NOTIFY_GRACE_TIME) {
+                                       fprintf(stderr, "error: bad "
+                                               "inode-grace: %s\n", optarg);
+                                       return CMD_HELP;
+                               }
+                       }
+                       dqb->dqb_valid |= QIF_ITIME;
+                       break;
+               case 't': /* Yes, of course! */
+                       break;
+               case 'o':
+                       if (lfs_verify_poolarg(optarg))
+                               return -1;
+                       fprintf(stdout,
+                               "Trying to set grace for pool %s\n", optarg);
+                       strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+                       qctl->qc_cmd  = LUSTRE_Q_SETINFOPOOL;
+                       break;
+               /* getopt prints error message for us when opterr != 0 */
+               default:
+                       return CMD_HELP;
+               }
+       }
 
-       if (qctl.qc_type == ALLQUOTA) {
+       if (qctl->qc_type == ALLQUOTA) {
                fprintf(stderr, "error: neither -u, -g nor -p specified\n");
-                return CMD_HELP;
-        }
-
-        if (optind != argc - 1) {
-                fprintf(stderr, "error: unexpected parameters encountered\n");
-                return CMD_HELP;
-        }
+               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");
+       if (optind != argc - 1) {
+               fprintf(stderr, "error: unexpected parameters encountered\n");
                return CMD_HELP;
        }
 
-        mnt = argv[optind];
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc) {
-                if (*obd_type)
-                        fprintf(stderr, "%s %s ", obd_type,
-                                obd_uuid2str(&qctl.obd_uuid));
-                fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
-                return rc;
-        }
+       mnt = argv[optind];
+       rc = llapi_quotactl(mnt, qctl);
+       if (rc) {
+               if (*obd_type)
+                       fprintf(stderr, "%s %s ", obd_type,
+                               obd_uuid2str(&qctl->obd_uuid));
+               fprintf(stderr, "setquota failed: %s\n", strerror(-rc));
+               return rc;
+       }
 
-        return 0;
+       return 0;
 }
 
 #define BSLIMIT (1 << 0)
@@ -5675,9 +6763,9 @@ quota_type:
 int lfs_setquota(int argc, char **argv)
 {
        int c, rc = 0;
-       struct if_quotactl qctl;
-       char *mnt, *obd_type = (char *)qctl.obd_type;
-       struct obd_dqblk *dqb = &qctl.qc_dqblk;
+       struct if_quotactl *qctl;
+       char *mnt, *obd_type;
+       struct obd_dqblk *dqb;
        struct option long_opts[] = {
        { .val = 'b',   .name = "block-softlimit",
                                                .has_arg = required_argument },
@@ -5694,79 +6782,93 @@ int lfs_setquota(int argc, char **argv)
        { .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 },
+       { .val = 'o',   .name = "pool",         .has_arg = required_argument },
        { .name = NULL } };
        unsigned limit_mask = 0;
        char *endptr;
        bool use_default = false;
-       int qtype;
+       int qtype, qctl_len;
+
+       qctl_len = sizeof(*qctl) + LOV_MAXPOOLNAME + 1;
+       qctl = malloc(qctl_len);
+       if (!qctl)
+               return -ENOMEM;
 
-       if (has_times_option(argc, argv))
-               return lfs_setquota_times(argc, argv);
+       memset(qctl, 0, qctl_len);
+       obd_type = (char *)qctl->obd_type;
+       dqb = &qctl->qc_dqblk;
 
-       memset(&qctl, 0, sizeof(qctl));
-       qctl.qc_cmd  = LUSTRE_Q_SETQUOTA;
-       qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
+       if (has_times_option(argc, argv)) {
+               rc = lfs_setquota_times(argc, argv, qctl);
+               goto out;
+       }
+
+       qctl->qc_cmd  = LUSTRE_Q_SETQUOTA;
+       qctl->qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
                                  * so it can be used as a marker that qc_type
                                  * isn't reinitialized from command line */
 
-       while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U",
+       while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:Uo:",
                long_opts, NULL)) != -1) {
                switch (c) {
                case 'U':
-                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
                        qtype = USRQUOTA;
-                       qctl.qc_id = 0;
+                       qctl->qc_id = 0;
                        goto quota_type_def;
                case 'u':
                        qtype = USRQUOTA;
-                       rc = name2uid(&qctl.qc_id, optarg);
+                       rc = name2uid(&qctl->qc_id, optarg);
                        goto quota_type;
                case 'G':
-                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
                        qtype = GRPQUOTA;
-                       qctl.qc_id = 0;
+                       qctl->qc_id = 0;
                        goto quota_type_def;
                 case 'g':
                        qtype = GRPQUOTA;
-                       rc = name2gid(&qctl.qc_id, optarg);
+                       rc = name2gid(&qctl->qc_id, optarg);
                        goto quota_type;
                case 'P':
-                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
                        qtype = PRJQUOTA;
-                       qctl.qc_id = 0;
+                       qctl->qc_id = 0;
                        goto quota_type_def;
                case 'p':
                        qtype = PRJQUOTA;
-                       rc = name2projid(&qctl.qc_id, optarg);
+                       rc = name2projid(&qctl->qc_id, optarg);
 quota_type:
                        if (rc) {
-                               qctl.qc_id = strtoul(optarg, &endptr, 10);
+                               qctl->qc_id = strtoul(optarg, &endptr, 10);
                                if (*endptr != '\0') {
                                        fprintf(stderr, "%s setquota: invalid"
                                                " id '%s'\n", progname, optarg);
-                                       return -1;
+                                       rc = -1;
+                                       goto out;
                                }
                        }
 
-                       if (qctl.qc_id == 0) {
+                       if (qctl->qc_id == 0) {
                                fprintf(stderr, "%s setquota: can't set quota"
                                        " for root usr/group/project.\n",
                                        progname);
-                               return -1;
+                               rc = -1;
+                               goto out;
                        }
 
 quota_type_def:
-                       if (qctl.qc_type != ALLQUOTA) {
+                       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;
+                               rc = CMD_HELP;
+                               goto out;
                        }
-                       qctl.qc_type = qtype;
+                       qctl->qc_type = qtype;
                        break;
                case 'd':
-                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qctl->qc_cmd = LUSTRE_Q_SETDEFAULT;
                        use_default = true;
                        break;
                case 'b':
@@ -5778,7 +6880,8 @@ quota_type_def:
                                fprintf(stderr,
                                        "%s setquota: warning: block softlimit '%llu' smaller than minimum qunit size\n"
                                        "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_bsoftlimit,
+                                       progname,
+                                       (unsigned long long)dqb->dqb_bsoftlimit,
                                        progname);
                        break;
                case 'B':
@@ -5790,7 +6893,8 @@ quota_type_def:
                                fprintf(stderr,
                                        "%s setquota: warning: block hardlimit '%llu' smaller than minimum qunit size\n"
                                        "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_bhardlimit,
+                                       progname,
+                                       (unsigned long long)dqb->dqb_bhardlimit,
                                        progname);
                        break;
                case 'i':
@@ -5801,7 +6905,8 @@ quota_type_def:
                                fprintf(stderr,
                                        "%s setquota: warning: inode softlimit '%llu' smaller than minimum qunit size\n"
                                        "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_isoftlimit,
+                                       progname,
+                                       (unsigned long long)dqb->dqb_isoftlimit,
                                        progname);
                        break;
                case 'I':
@@ -5812,29 +6917,43 @@ quota_type_def:
                                fprintf(stderr,
                                        "%s setquota: warning: inode hardlimit '%llu' smaller than minimum qunit size\n"
                                        "See '%s help setquota' or Lustre manual for details\n",
-                                       progname, dqb->dqb_ihardlimit,
+                                       progname,
+                                       (unsigned long long)dqb->dqb_ihardlimit,
                                        progname);
                        break;
+               case 'o':
+                       if (lfs_verify_poolarg(optarg)) {
+                               rc = -1;
+                               goto out;
+                       }
+                       fprintf(stdout,
+                               "Trying to set quota for pool %s\n", optarg);
+                       strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+                       qctl->qc_cmd  = LUSTRE_Q_SETQUOTAPOOL;
+                       break;
                default:
                        fprintf(stderr,
                                "%s setquota: unrecognized option '%s'\n",
                                progname, argv[optind - 1]);
-                       return CMD_HELP;
+                       rc = CMD_HELP;
+                       goto out;
                }
        }
 
-       if (qctl.qc_type == ALLQUOTA) {
+       if (qctl->qc_type == ALLQUOTA) {
                fprintf(stderr,
                        "%s setquota: either -u or -g must be specified\n",
                        progname);
-               return CMD_HELP;
+               rc = CMD_HELP;
+               goto out;
        }
 
        if (!use_default && limit_mask == 0) {
                fprintf(stderr,
                        "%s setquota: at least one limit must be specified\n",
                        progname);
-               return CMD_HELP;
+               rc = CMD_HELP;
+               goto out;
        }
 
        if (use_default && limit_mask != 0) {
@@ -5842,22 +6961,25 @@ quota_type_def:
                        "%s setquota: limits should not be specified when"
                        " using default quota\n",
                        progname);
-               return CMD_HELP;
+               rc = CMD_HELP;
+               goto out;
        }
 
-       if (use_default && qctl.qc_id == 0) {
+       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;
+               rc = CMD_HELP;
+               goto out;
        }
 
        if (optind != argc - 1) {
                fprintf(stderr,
                        "%s setquota: filesystem not specified or unexpected argument '%s'\n",
                        progname, argv[optind]);
-               return CMD_HELP;
+               rc = CMD_HELP;
+               goto out;
        }
 
         mnt = argv[optind];
@@ -5874,12 +6996,12 @@ quota_type_def:
                   (!(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};
+                                              .qc_type = qctl->qc_type,
+                                              .qc_id   = qctl->qc_id};
 
                rc = llapi_quotactl(mnt, &tmp_qctl);
                if (rc < 0)
-                       return rc;
+                       goto out;
 
                if (!(limit_mask & BHLIMIT))
                        dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
@@ -5905,17 +7027,17 @@ quota_type_def:
        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,
                                "%s setquota: cannot quotactl '%s' '%s': %s",
                                progname, obd_type,
-                               obd_uuid2str(&qctl.obd_uuid), strerror(-rc));
-               return rc;
+                               obd_uuid2str(&qctl->obd_uuid), strerror(-rc));
        }
-
-       return 0;
+out:
+       free(qctl);
+       return rc;
 }
 
 /* Converts seconds value into format string
@@ -5927,22 +7049,23 @@ quota_type_def:
  */
 static char * __sec2str(time_t seconds, char *buf)
 {
-        const char spec[] = "smhdw";
-        const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
-        unsigned long c;
-        char *tail = buf;
-        int i;
+       const char spec[] = "smhdw";
+       const unsigned long mult[] = {1, 60, 60*60, 24*60*60, 7*24*60*60};
+       unsigned long c;
+       char *tail = buf;
+       int i;
 
-        for (i = sizeof(mult) / sizeof(mult[0]) - 1 ; i >= 0; i--) {
-                c = seconds / mult[i];
+       for (i = ARRAY_SIZE(mult) - 1 ; i >= 0; i--) {
+               c = seconds / mult[i];
 
-                if (c > 0 || (i == 0 && buf == tail))
-                        tail += snprintf(tail, 40-(tail-buf), "%lu%c", c, spec[i]);
+               if (c > 0 || (i == 0 && buf == tail))
+                       tail += scnprintf(tail, 40-(tail-buf), "%lu%c", c,
+                                         spec[i]);
 
-                seconds %= mult[i];
-        }
+               seconds %= mult[i];
+       }
 
-        return tail;
+       return tail;
 }
 
 static void sec2str(time_t seconds, char *buf, int rc)
@@ -6023,6 +7146,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
        time(&now);
 
        if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA ||
+           qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
            qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) {
                int bover = 0, iover = 0;
                struct obd_dqblk *dqb = &qctl->qc_dqblk;
@@ -6062,7 +7186,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                        diff2str(dqb->dqb_btime, timebuf, now);
                else if (show_default)
                        snprintf(timebuf, sizeof(timebuf), "%llu",
-                                dqb->dqb_btime);
+                                (unsigned long long)dqb->dqb_btime);
 
                kbytes2str(lustre_stoqb(dqb->dqb_curspace),
                           strbuf, sizeof(strbuf), h);
@@ -6095,7 +7219,7 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                        diff2str(dqb->dqb_itime, timebuf, now);
                else if (show_default)
                        snprintf(timebuf, sizeof(timebuf), "%llu",
-                                dqb->dqb_itime);
+                                (unsigned long long)dqb->dqb_itime);
 
                snprintf(numbuf[0], sizeof(numbuf),
                         (dqb->dqb_valid & QIF_INODES) ? "%ju" : "[%ju]",
@@ -6120,17 +7244,23 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                else
                        printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
                printf("\n");
+       } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || LUSTRE_Q_GETINFOPOOL ||
+                  qctl->qc_cmd == Q_GETOINFO) {
+               char bgtimebuf[40];
+               char igtimebuf[40];
 
-        } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
-                   qctl->qc_cmd == Q_GETOINFO) {
-                char bgtimebuf[40];
-                char igtimebuf[40];
+               if (qctl->qc_dqinfo.dqi_bgrace == NOTIFY_GRACE_TIME)
+                       strncpy(bgtimebuf, NOTIFY_GRACE, 40);
+               else
+                       sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc);
+               if (qctl->qc_dqinfo.dqi_igrace == NOTIFY_GRACE_TIME)
+                       strncpy(igtimebuf, NOTIFY_GRACE, 40);
+               else
+                       sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc);
 
-                sec2str(qctl->qc_dqinfo.dqi_bgrace, bgtimebuf, rc);
-                sec2str(qctl->qc_dqinfo.dqi_igrace, igtimebuf, rc);
-                printf("Block grace time: %s; Inode grace time: %s\n",
-                       bgtimebuf, igtimebuf);
-        }
+               printf("Block grace time: %s; Inode grace time: %s\n",
+                      bgtimebuf, igtimebuf);
+       }
 }
 
 static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
@@ -6139,6 +7269,8 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
         int rc = 0, rc1 = 0, count = 0;
         __u32 valid = qctl->qc_valid;
 
+       /* TODO: for commands LUSTRE_Q_"S\|G"ETQUOTAPOOL we need
+        * to go only through OSTs that belong to requested pool. */
         rc = llapi_get_obd_count(mnt, &count, is_mdt);
         if (rc) {
                 fprintf(stderr, "can not get %s count: %s\n",
@@ -6227,6 +7359,7 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
        }
 
        if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+            qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
             qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet)
                print_quota_title(name, qctl, human_readable, show_default);
 
@@ -6236,14 +7369,16 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
        if (qctl->qc_valid != QC_GENERAL)
                mnt = "";
 
-       inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA) &&
+       inacc = (qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+                qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) &&
                ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
                 (QIF_LIMITS|QIF_USAGE));
 
        print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default);
 
        if (!show_default && verbose &&
-           qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) {
+           qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO &&
+           qctl->qc_cmd != LUSTRE_Q_GETINFOPOOL) {
                char strbuf[STRBUF_LEN];
 
                rc2 = print_obd_quota(mnt, qctl, 1, human_readable,
@@ -6270,8 +7405,16 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                       "Some devices may be not working or deactivated. "
                       "The data in \"[]\" is inaccurate.\n");
 out:
-       return rc1;
+       if (rc1)
+               return rc1;
+       if (rc2)
+               return rc2;
+       if (rc3)
+               return rc3;
+       if (inacc)
+               return -EIO;
 
+       return 0;
 }
 
 static int lfs_project(int argc, char **argv)
@@ -6432,17 +7575,28 @@ static int lfs_quota(int argc, char **argv)
 {
        int c;
        char *mnt, *name = NULL;
-       struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
-                                   .qc_type = ALLQUOTA };
-       char *obd_uuid = (char *)qctl.obd_uuid.uuid;
+       struct if_quotactl *qctl;
+       char *obd_uuid;
        int rc = 0, rc1 = 0, verbose = 0, quiet = 0;
        char *endptr;
        __u32 valid = QC_GENERAL, idx = 0;
        bool human_readable = false;
        bool show_default = false;
        int qtype;
+       struct option long_opts[] = {
+       { .val = 1,     .name = "pool", .has_arg = required_argument },
+       { .name = NULL } };
+
+       qctl = calloc(1, sizeof(*qctl) + LOV_MAXPOOLNAME + 1);
+       if (!qctl)
+               return -ENOMEM;
+
+       qctl->qc_cmd = LUSTRE_Q_GETQUOTA;
+       qctl->qc_type = ALLQUOTA;
+       obd_uuid = (char *)qctl->obd_uuid.uuid;
 
-       while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) {
+       while ((c = getopt_long(argc, argv, "gGi:I:o:pPqtuUvh",
+               long_opts, NULL)) != -1) {
                switch (c) {
                case 'U':
                        show_default = true;
@@ -6459,39 +7613,42 @@ static int lfs_quota(int argc, char **argv)
                case 'p':
                        qtype = PRJQUOTA;
 quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
+                       if (qctl->qc_type != ALLQUOTA) {
                                fprintf(stderr,
                                        "%s quota: only one of -u, -g, or -p may be specified\n",
                                        progname);
-                               return CMD_HELP;
+                               rc = CMD_HELP;
+                               goto out;
                        }
-                       qctl.qc_type = qtype;
+                       qctl->qc_type = qtype;
                        break;
                 case 't':
-                        qctl.qc_cmd = LUSTRE_Q_GETINFO;
+                       qctl->qc_cmd = LUSTRE_Q_GETINFO;
                         break;
                 case 'o':
-                        valid = qctl.qc_valid = QC_UUID;
-                       snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg);
+                       valid = qctl->qc_valid = QC_UUID;
+                       snprintf(obd_uuid, sizeof(*obd_uuid), "%s", optarg);
                         break;
                case 'i':
-                       valid = qctl.qc_valid = QC_MDTIDX;
-                       idx = qctl.qc_idx = atoi(optarg);
+                       valid = qctl->qc_valid = QC_MDTIDX;
+                       idx = qctl->qc_idx = atoi(optarg);
                        if (idx == 0 && *optarg != '0') {
                                fprintf(stderr,
                                        "%s quota: invalid MDT index '%s'\n",
                                        progname, optarg);
-                               return CMD_HELP;
+                               rc = CMD_HELP;
+                               goto out;
                        }
                        break;
                case 'I':
-                       valid = qctl.qc_valid = QC_OSTIDX;
-                       idx = qctl.qc_idx = atoi(optarg);
+                       valid = qctl->qc_valid = QC_OSTIDX;
+                       idx = qctl->qc_idx = atoi(optarg);
                        if (idx == 0 && *optarg != '0') {
                                fprintf(stderr,
                                        "%s quota: invalid OST index '%s'\n",
                                        progname, optarg);
-                               return CMD_HELP;
+                               rc = CMD_HELP;
+                               goto out;
                        }
                        break;
                 case 'v':
@@ -6503,90 +7660,110 @@ quota_type:
                case 'h':
                        human_readable = true;
                        break;
+               case 1:
+                       if (lfs_verify_poolarg(optarg)) {
+                               rc = -1;
+                               goto out;
+                       }
+                       strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
+                       qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_GETINFO ?
+                                               LUSTRE_Q_GETINFOPOOL :
+                                               LUSTRE_Q_GETQUOTAPOOL;
+                       break;
                default:
                        fprintf(stderr, "%s quota: unrecognized option '%s'\n",
                                progname, argv[optind - 1]);
-                       return CMD_HELP;
+                       rc = CMD_HELP;
+                       goto out;
                }
        }
 
         /* current uid/gid info for "lfs quota /path/to/lustre/mount" */
-       if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
-           optind == argc - 1 && !show_default) {
+       if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+            qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) &&
+            qctl->qc_type == ALLQUOTA &&
+            optind == argc - 1 && !show_default) {
 
-               qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
-               qctl.qc_valid = valid;
-               qctl.qc_idx = idx;
+               qctl->qc_idx = idx;
 
                for (qtype = USRQUOTA; qtype <= GRPQUOTA; qtype++) {
-                       qctl.qc_type = qtype;
+                       qctl->qc_type = qtype;
+                       qctl->qc_valid = valid;
                        if (qtype == USRQUOTA) {
-                               qctl.qc_id = geteuid();
-                               rc = uid2name(&name, qctl.qc_id);
+                               qctl->qc_id = geteuid();
+                               rc = uid2name(&name, qctl->qc_id);
                        } else {
-                               qctl.qc_id = getegid();
-                               rc = gid2name(&name, qctl.qc_id);
+                               qctl->qc_id = getegid();
+                               rc = gid2name(&name, qctl->qc_id);
+                               memset(&qctl->qc_dqblk, 0,
+                                      sizeof(qctl->qc_dqblk));
                        }
                        if (rc)
                                name = "<unknown>";
                        mnt = argv[optind];
-                       rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
+                       rc1 = get_print_quota(mnt, name, qctl, verbose, quiet,
                                              human_readable, show_default);
                        if (rc1 && !rc)
                                rc = rc1;
                }
-               return rc;
+               goto out;
        /* lfs quota -u username /path/to/lustre/mount */
-       } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
+       } else if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+                  qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL) {
                /* options should be followed by u/g-name and mntpoint */
                if ((!show_default && optind + 2 != argc) ||
                    (show_default && optind + 1 != argc) ||
-                   qctl.qc_type == ALLQUOTA) {
+                   qctl->qc_type == ALLQUOTA) {
                        fprintf(stderr,
                                "%s quota: name and mount point must be specified\n",
                                progname);
-                       return CMD_HELP;
+                       rc = CMD_HELP;
+                       goto out;
                }
 
                if (!show_default) {
                        name = argv[optind++];
-                       switch (qctl.qc_type) {
+                       switch (qctl->qc_type) {
                        case USRQUOTA:
-                               rc = name2uid(&qctl.qc_id, name);
+                               rc = name2uid(&qctl->qc_id, name);
                                break;
                        case GRPQUOTA:
-                               rc = name2gid(&qctl.qc_id, name);
+                               rc = name2gid(&qctl->qc_id, name);
                                break;
                        case PRJQUOTA:
-                               rc = name2projid(&qctl.qc_id, name);
+                               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;
+                       qctl->qc_valid = QC_GENERAL;
+                       qctl->qc_cmd = LUSTRE_Q_GETDEFAULT;
+                       qctl->qc_id = 0;
                }
 
                if (rc) {
-                       qctl.qc_id = strtoul(name, &endptr, 10);
+                       qctl->qc_id = strtoul(name, &endptr, 10);
                        if (*endptr != '\0') {
                                fprintf(stderr, "%s quota: invalid id '%s'\n",
                                        progname, name);
-                               return CMD_HELP;
+                               rc = CMD_HELP;
+                               goto out;
                        }
                }
-       } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
+       } else if (optind + 1 != argc || qctl->qc_type == ALLQUOTA) {
                fprintf(stderr, "%s quota: missing quota info argument(s)\n",
                        progname);
-               return CMD_HELP;
+               rc = CMD_HELP;
+               goto out;
        }
 
        mnt = argv[optind];
-       rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
+       rc = get_print_quota(mnt, name, qctl, verbose, quiet,
                             human_readable, show_default);
+out:
+       free(qctl);
        return rc;
 }
 #endif /* HAVE_SYS_QUOTA_H! */
@@ -6659,20 +7836,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;
@@ -6769,14 +7932,16 @@ static int lfs_changelog(int argc, char **argv)
                        struct changelog_ext_extra_flags *ef =
                                changelog_rec_extra_flags(rec);
 
-                       printf(" ef=0x%llx", ef->cr_extra_flags);
+                       printf(" ef=0x%llx",
+                              (unsigned long long)ef->cr_extra_flags);
 
                        if (ef->cr_extra_flags & CLFE_UIDGID) {
                                struct changelog_ext_uidgid *uidgid =
                                        changelog_rec_uidgid(rec);
 
                                printf(" u=%llu:%llu",
-                                      uidgid->cr_uid, uidgid->cr_gid);
+                                      (unsigned long long)uidgid->cr_uid,
+                                      (unsigned long long)uidgid->cr_gid);
                        }
                        if (ef->cr_extra_flags & CLFE_NID) {
                                struct changelog_ext_nid *nid =
@@ -7063,6 +8228,85 @@ static int lfs_path2fid(int argc, char **argv)
        return rc;
 }
 
+#define MAX_ERRNO      4095
+#define IS_ERR_VALUE(x) ((unsigned long)(x) >= (unsigned long)-MAX_ERRNO)
+
+static int lfs_rmfid_and_show_errors(const char *device, struct fid_array *fa)
+{
+       int rc, rc2 = 0, k;
+
+       rc = llapi_rmfid(device, fa);
+       if (rc) {
+               fprintf(stderr, "rmfid(): rc = %d\n", rc);
+               return rc;
+       }
+
+       for (k = 0; k < fa->fa_nr; k++) {
+               rc = (__s32)fa->fa_fids[k].f_ver;
+               if (!IS_ERR_VALUE(rc))
+                       continue;
+               if (!rc2 && rc)
+                       rc2 = rc;
+               if (!rc)
+                       continue;
+               fa->fa_fids[k].f_ver = 0;
+               fprintf(stderr, "rmfid("DFID"): rc = %d\n",
+                       PFID(&fa->fa_fids[k]), rc);
+       }
+
+       return rc2;
+}
+
+static int lfs_rmfid(int argc, char **argv)
+{
+       char *fidstr, *device;
+       int rc = 0, rc2, nr;
+       struct fid_array *fa;
+
+       if (optind > argc - 1) {
+               fprintf(stderr, "%s rmfid: missing dirname\n", progname);
+               return CMD_HELP;
+       }
+
+       device = argv[optind++];
+
+       nr = argc - optind;
+       fa = malloc(offsetof(struct fid_array, fa_fids[nr + 1]));
+       if (fa == NULL)
+               return -ENOMEM;
+
+       fa->fa_nr = 0;
+       rc = 0;
+       while (optind < argc) {
+               int found;
+
+               fidstr = argv[optind++];
+               while (*fidstr == '[')
+                       fidstr++;
+               found = sscanf(fidstr, SFID, RFID(&fa->fa_fids[fa->fa_nr]));
+               if (found != 3) {
+                       fprintf(stderr, "unrecognized FID: %s\n",
+                               argv[optind - 1]);
+                       exit(1);
+               }
+               fa->fa_nr++;
+               if (fa->fa_nr == OBD_MAX_FIDS_IN_ARRAY) {
+                       /* start another batch */
+                       rc2 = lfs_rmfid_and_show_errors(device, fa);
+                       if (rc2 && !rc)
+                               rc = rc2;
+                       fa->fa_nr = 0;
+               }
+       }
+       if (fa->fa_nr) {
+               rc2 = lfs_rmfid_and_show_errors(device, fa);
+               if (rc2 && !rc)
+                       rc = rc2;
+       }
+
+       return rc;
+}
+
 static int lfs_data_version(int argc, char **argv)
 {
        char *path;
@@ -7396,16 +8640,10 @@ static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx,
        hui->hui_extent.length = -1;
 
        if (mntpath != NULL) {
-               if (*fname == '[')
-                       fname++;
-               rc = sscanf(fname, SFID, RFID(&hui->hui_fid));
-               if (rc == 3) {
-                       rc = 0;
-               } else {
+               rc = llapi_fid_parse(fname, &hui->hui_fid, NULL);
+               if (rc)
                        fprintf(stderr, "hsm: '%s' is not a valid FID\n",
                                fname);
-                       rc = -EINVAL;
-               }
        } else {
                rc = lfs_hsm_prepare_file(fname, &hui->hui_fid, last_dev);
        }
@@ -7871,35 +9109,157 @@ next:
        return rc;
 }
 
-/** The input string contains a comma delimited list of component ids and
- * ranges, for example "1,2-4,7".
- */
-static int parse_mirror_ids(__u16 *ids, int size, char *arg)
+static const char *const heat_names[] = LU_HEAT_NAMES;
+
+static int lfs_heat_get(int argc, char **argv)
 {
-       bool end_of_loop = false;
-       char *ptr = NULL;
-       int nr = 0;
-       int rc;
+       struct lu_heat *heat;
+       int rc = 0, rc2;
+       char *path;
+       int fd;
+       int i;
 
-       if (arg == NULL)
-               return -EINVAL;
+       if (argc <= 1)
+               return CMD_HELP;
 
-       while (!end_of_loop) {
-               int start_index;
-               int end_index;
-               int i;
-               char *endptr = NULL;
+       heat = calloc(sizeof(*heat) + sizeof(__u64) * OBD_HEAT_COUNT, 1);
+       if (!heat) {
+               fprintf(stderr, "%s: memory allocation failed\n", argv[0]);
+               return -ENOMEM;
+       }
 
-               rc = -EINVAL;
-               ptr = strchrnul(arg, ',');
-               end_of_loop = *ptr == '\0';
-               *ptr = '\0';
+       optind = 1;
+       while (optind < argc) {
+               path = argv[optind++];
 
-               start_index = strtol(arg, &endptr, 0);
-               if (endptr == arg) /* no data at all */
-                       break;
-               if (*endptr != '-' && *endptr != '\0') /* has invalid data */
-                       break;
+               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],
+                              (unsigned long long)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[] = {
+       { .val = 'c',   .name = "clear",        .has_arg = no_argument },
+       { .val = 'o',   .name = "off",          .has_arg = no_argument },
+       { .val = 'O',   .name = "on",           .has_arg = no_argument },
+       { .name = NULL } };
+       enum lu_heat_flag flags = 0;
+       int rc = 0, rc2;
+       char *path;
+       int fd;
+       int c;
+
+       if (argc <= 1)
+               return CMD_HELP;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "coO", 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".
+ */
+static int parse_mirror_ids(__u16 *ids, int size, char *arg)
+{
+       bool end_of_loop = false;
+       char *ptr = NULL;
+       int nr = 0;
+       int rc;
+
+       if (arg == NULL)
+               return -EINVAL;
+
+       while (!end_of_loop) {
+               int start_index;
+               int end_index;
+               int i;
+               char *endptr = NULL;
+
+               rc = -EINVAL;
+               ptr = strchrnul(arg, ',');
+               end_of_loop = *ptr == '\0';
+               *ptr = '\0';
+
+               start_index = strtol(arg, &endptr, 0);
+               if (endptr == arg) /* no data at all */
+                       break;
+               if (*endptr != '-' && *endptr != '\0') /* has invalid data */
+                       break;
                if (start_index < 0)
                        break;
 
@@ -8118,6 +9478,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
        int idx;
        int fd;
        int rc;
+       int rc2;
 
        if (stat(fname, &stbuf) < 0) {
                fprintf(stderr, "%s: cannot stat file '%s': %s.\n",
@@ -8182,7 +9543,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                else
                        fprintf(stderr,
                            "%s: '%s' llapi_lease_get_ext resync failed: %s.\n",
-                               progname, fname, strerror(errno));
+                               progname, fname, strerror(-rc));
                goto free_layout;
        }
 
@@ -8206,10 +9567,10 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
        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);
+               fprintf(stderr, "%s: '%s' llapi_mirror_resync_many: %s.\n",
+                       progname, fname, strerror(-rc));
 
-       /* prepare ioc for lease put */
+       /* need to do the lease unlock even resync fails */
        ioc->lil_mode = LL_LEASE_UNLCK;
        ioc->lil_flags = LL_LEASE_RESYNC_DONE;
        ioc->lil_count = 0;
@@ -8220,19 +9581,19 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                }
        }
 
-       rc = llapi_lease_set(fd, ioc);
-       if (rc <= 0) {
-               if (rc == 0) /* lost lease lock */
-                       rc = -EBUSY;
-               fprintf(stderr, "%s: resync file '%s' failed: %s.\n",
-                       progname, fname, strerror(errno));
-               goto free_layout;
-       }
+       rc2 = llapi_lease_set(fd, ioc);
        /**
         * llapi_lease_set returns lease mode when it request to unlock
-        * the lease lock
+        * the lease lock.
         */
-       rc = 0;
+       if (rc2 <= 0) {
+               /* rc2 == 0 means lost lease lock */
+               if (rc2 == 0 && rc == 0)
+                       rc = -EBUSY;
+               fprintf(stderr, "%s: resync file '%s' failed: %s.\n",
+                       progname, fname,
+                       rc2 == 0 ? "lost lease lock" : strerror(-rc2));
+       }
 
 free_layout:
        llapi_layout_free(layout);
@@ -8354,22 +9715,16 @@ static inline int verify_mirror_id_by_fd(int fd, __u16 mirror_id)
  * \retval     1  not the same file
  * \retval     <0 error code
  */
-static inline int check_same_file(const char *f1, const char *f2)
+static inline int check_same_file(int fd, 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));
+       if (fstat(fd, &stbuf1) < 0)
                return -errno;
-       }
 
-       if (stat(f2, &stbuf2) < 0) {
-               fprintf(stderr, "%s: cannot stat file '%s': %s\n",
-                       progname, f2, strerror(errno));
-               return -errno;
-       }
+       if (stat(f2, &stbuf2) < 0)
+               return 1;
 
        if (stbuf1.st_rdev == stbuf2.st_rdev &&
            stbuf1.st_ino == stbuf2.st_ino)
@@ -8435,19 +9790,6 @@ static inline int lfs_mirror_read(int argc, char **argv)
 
        /* 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",
@@ -8464,7 +9806,7 @@ static inline int lfs_mirror_read(int argc, char **argv)
                goto close_fd;
        }
 
-       /* open output file */
+       /* open output file - O_EXCL ensures output is not the same as input */
        if (outfile) {
                outfd = open(outfile, O_EXCL | O_WRONLY | O_CREAT, 0644);
                if (outfd < 0) {
@@ -8604,19 +9946,6 @@ static inline int lfs_mirror_write(int argc, char **argv)
 
        /* 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",
@@ -8635,6 +9964,16 @@ static inline int lfs_mirror_write(int argc, char **argv)
 
        /* open input file */
        if (inputfile) {
+               rc = check_same_file(fd, inputfile);
+               if (rc == 0) {
+                       fprintf(stderr,
+                       "%s %s: input file cannot be the mirrored file\n",
+                               progname, argv[0]);
+                       goto close_fd;
+               }
+               if (rc < 0)
+                       goto close_fd;
+
                inputfd = open(inputfile, O_RDONLY, 0644);
                if (inputfd < 0) {
                        fprintf(stderr, "%s %s: cannot open file '%s': %s\n",
@@ -8743,94 +10082,336 @@ 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)
+static inline int get_other_mirror_ids(int fd, __u16 *ids, __u16 exclude_id)
 {
-       int i;
-       int j;
+       struct llapi_layout *layout;
+       struct collect_ids_data cid = { .cid_ids = ids,
+                                       .cid_count = 0,
+                                       .cid_exclude = exclude_id, };
+       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]);
-                       for (j = 1; j < chunks[i].mirror_count; j++)
-                               fprintf(stdout, ", %u", chunks[i].mirror_id[j]);
-               }
-               fprintf(stdout, "]\t%u\n", chunks[i].mirror_count);
+       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;
        }
-       fprintf(stdout, "\n");
+       llapi_layout_free(layout);
+
+       return cid.cid_count;
 }
 
-/**
- * print_checksums() - Print CRC-32 checksum values.
- * @chunk: A chunk and its corresponding valid mirror ids.
- * @crc:   CRC-32 checksum values on the chunk for each valid mirror.
- *
- * This function prints CRC-32 checksum values on @chunk for
- * each valid mirror that covers it.
- *
- * Return: void.
- */
-static inline
-void print_checksums(struct verify_chunk *chunk, unsigned long *crc)
+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;
 
-       fprintf(stdout,
-               "CRC-32 checksum value for chunk "DEXT":\n",
-               PEXT(&chunk->chunk));
-       for (i = 0; i < chunk->mirror_count; i++)
-               fprintf(stdout, "Mirror %u:\t%#lx\n",
-                       chunk->mirror_id[i], crc[i]);
-       fprintf(stdout, "\n");
-}
+       struct option long_opts[] = {
+       { .val = 'i',   .name = "read-mirror",  .has_arg = required_argument },
+       { .val = 'o',   .name = "write-mirror", .has_arg = required_argument },
+       { .name = NULL } };
 
-/**
- * filter_mirror_id() - Filter specified mirror ids.
- * @chunks:      Array of chunks.
- * @chunk_count: Number of chunks in @chunks array.
- * @mirror_ids:  Specified mirror ids to be verified.
- * @ids_nr:      Number of specified mirror ids.
- *
- * This function scans valid mirror ids that cover each chunk in @chunks
- * and filters specified mirror ids.
- *
- * Return: void.
- */
-static inline
-void filter_mirror_id(struct verify_chunk *chunks, int chunk_count,
-                     __u16 *mirror_ids, int ids_nr)
-{
-       int i;
+       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]);
+               }
+               fprintf(stdout, "]\t%u\n", chunks[i].mirror_count);
+       }
+       fprintf(stdout, "\n");
+}
+
+/**
+ * print_checksums() - Print CRC-32 checksum values.
+ * @chunk: A chunk and its corresponding valid mirror ids.
+ * @crc:   CRC-32 checksum values on the chunk for each valid mirror.
+ *
+ * This function prints CRC-32 checksum values on @chunk for
+ * each valid mirror that covers it.
+ *
+ * Return: void.
+ */
+static inline
+void print_checksums(struct verify_chunk *chunk, unsigned long *crc)
+{
+       int i;
+
+       fprintf(stdout,
+               "CRC-32 checksum value for chunk "DEXT":\n",
+               PEXT(&chunk->chunk));
+       for (i = 0; i < chunk->mirror_count; i++)
+               fprintf(stdout, "Mirror %u:\t%#lx\n",
+                       chunk->mirror_id[i], crc[i]);
+       fprintf(stdout, "\n");
+}
+
+/**
+ * filter_mirror_id() - Filter specified mirror ids.
+ * @chunks:      Array of chunks.
+ * @chunk_count: Number of chunks in @chunks array.
+ * @mirror_ids:  Specified mirror ids to be verified.
+ * @ids_nr:      Number of specified mirror ids.
+ *
+ * This function scans valid mirror ids that cover each chunk in @chunks
+ * and filters specified mirror ids.
+ *
+ * Return: void.
+ */
+static inline
+void filter_mirror_id(struct verify_chunk *chunks, int chunk_count,
+                     __u16 *mirror_ids, int ids_nr)
+{
+       int i;
        int j;
        int k;
        __u16 valid_id[LUSTRE_MIRROR_COUNT_MAX] = { 0 };
@@ -9079,8 +10660,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",
@@ -9476,14 +11055,15 @@ static int lfs_getsom(int argc, char **argv)
        switch (type) {
        case LFS_SOM_ATTR_ALL:
                printf("file: %s size: %llu blocks: %llu flags: %x\n",
-                      path, attrs->lsa_size, attrs->lsa_blocks,
+                      path, (unsigned long long)attrs->lsa_size,
+                      (unsigned long long)attrs->lsa_blocks,
                       attrs->lsa_valid);
                break;
        case LFS_SOM_SIZE:
-               printf("%llu\n", attrs->lsa_size);
+               printf("%llu\n", (unsigned long long)attrs->lsa_size);
                break;
        case LFS_SOM_BLOCKS:
-               printf("%llu\n", attrs->lsa_blocks);
+               printf("%llu\n", (unsigned long long)attrs->lsa_blocks);
                break;
        case LFS_SOM_FLAGS:
                printf("%x\n", attrs->lsa_valid);
@@ -9515,6 +11095,348 @@ static int lfs_mirror_list_commands(int argc, char **argv)
        return 0;
 }
 
+static int lfs_pcc_attach(int argc, char **argv)
+{
+       struct option long_opts[] = {
+       { .val = 'i',   .name = "id",   .has_arg = required_argument },
+       { .name = NULL } };
+       int c;
+       int rc = 0;
+       __u32 archive_id = 0;
+       const char *path;
+       char *end;
+       char fullpath[PATH_MAX];
+       enum lu_pcc_type type = LU_PCC_READWRITE;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "i:",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'i':
+                       archive_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || archive_id == 0) {
+                               fprintf(stderr, "error: %s: bad archive ID "
+                                       "'%s'\n", argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (archive_id == 0) {
+               fprintf(stderr, "%s: must specify attach ID\n", argv[0]);
+               return CMD_HELP;
+       }
+
+       if (argc <= optind) {
+               fprintf(stderr, "%s: must specify one or more file names\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       while (optind < argc) {
+               int rc2;
+
+               path = argv[optind++];
+               if (realpath(path, fullpath) == NULL) {
+                       fprintf(stderr, "%s: could not find path '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       if (rc == 0)
+                               rc = -EINVAL;
+                       continue;
+               }
+
+               rc2 = llapi_pcc_attach(fullpath, archive_id, type);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot attach '%s' to PCC "
+                               "with archive ID '%u': %s\n", argv[0],
+                               path, archive_id, strerror(-rc2));
+                       if (rc == 0)
+                               rc = rc2;
+               }
+       }
+       return rc;
+}
+
+static int lfs_pcc_attach_fid(int argc, char **argv)
+{
+       struct option long_opts[] = {
+       { .val = 'i',   .name = "id",   .has_arg = required_argument },
+       { .val = 'm',   .name = "mnt",  .has_arg = required_argument },
+       { .name = NULL } };
+       char                     short_opts[] = "i:m:";
+       int                      c;
+       int                      rc = 0;
+       __u32                    archive_id = 0;
+       char                    *end;
+       const char              *mntpath = NULL;
+       const char              *fidstr;
+       enum lu_pcc_type         type = LU_PCC_READWRITE;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'i':
+                       archive_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0') {
+                               fprintf(stderr, "error: %s: bad archive ID "
+                                       "'%s'\n", argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'm':
+                       mntpath = optarg;
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (archive_id == 0) {
+               fprintf(stderr, "%s: must specify an archive ID\n", argv[0]);
+               return CMD_HELP;
+       }
+
+       if (mntpath == NULL) {
+               fprintf(stderr, "%s: must specify Lustre mount point\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       if (argc <= optind) {
+               fprintf(stderr, "%s: must specify one or more fids\n", argv[0]);
+               return CMD_HELP;
+       }
+
+       while (optind < argc) {
+               int rc2;
+
+               fidstr = argv[optind++];
+
+               rc2 = llapi_pcc_attach_fid_str(mntpath, fidstr,
+                                              archive_id, type);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot attach '%s' on '%s' to PCC "
+                               "with archive ID '%u': %s\n", argv[0],
+                               fidstr, mntpath, archive_id, strerror(rc2));
+               }
+               if (rc == 0 && rc2 < 0)
+                       rc = rc2;
+       }
+       return rc;
+}
+
+static int lfs_pcc_detach(int argc, char **argv)
+{
+       struct option long_opts[] = {
+       { .val = 'k',   .name = "keep", .has_arg = no_argument },
+       { .name = NULL } };
+       char                     short_opts[] = "k";
+       int                      c;
+       int                      rc = 0;
+       const char              *path;
+       char                     fullpath[PATH_MAX];
+       __u32                    detach_opt = PCC_DETACH_OPT_UNCACHE;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'k':
+                       detach_opt = PCC_DETACH_OPT_NONE;
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       while (optind < argc) {
+               int rc2;
+
+               path = argv[optind++];
+               if (realpath(path, fullpath) == NULL) {
+                       fprintf(stderr, "%s: could not find path '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       if (rc == 0)
+                               rc = -EINVAL;
+                       continue;
+               }
+
+               rc2 = llapi_pcc_detach_file(fullpath, detach_opt);
+               if (rc2 < 0) {
+                       rc2 = -errno;
+                       fprintf(stderr, "%s: cannot detach '%s' from PCC: "
+                               "%s\n", argv[0], path, strerror(errno));
+                       if (rc == 0)
+                               rc = rc2;
+               }
+       }
+       return rc;
+}
+
+static int lfs_pcc_detach_fid(int argc, char **argv)
+{
+       struct option long_opts[] = {
+       { .val = 'k',   .name = "keep", .has_arg = no_argument },
+       { .name = NULL } };
+       char             short_opts[] = "k";
+       int              c;
+       int              rc = 0;
+       const char      *fid;
+       const char      *mntpath;
+       __u32            detach_opt = PCC_DETACH_OPT_UNCACHE;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'k':
+                       detach_opt = PCC_DETACH_OPT_NONE;
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "%s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       mntpath = argv[optind++];
+
+       while (optind < argc) {
+               int rc2;
+
+               fid = argv[optind++];
+
+               rc2 = llapi_pcc_detach_fid_str(mntpath, fid, detach_opt);
+               if (rc2 < 0) {
+                       fprintf(stderr, "%s: cannot detach '%s' on '%s' "
+                               "from PCC: %s\n", argv[0], fid, mntpath,
+                               strerror(-rc2));
+                       if (rc == 0)
+                               rc = rc2;
+               }
+       }
+       return rc;
+}
+
+static int lfs_pcc_state(int argc, char **argv)
+{
+       int                      rc = 0;
+       const char              *path;
+       char                     fullpath[PATH_MAX];
+       struct lu_pcc_state      state;
+
+       optind = 1;
+
+       if (argc <= 1) {
+               fprintf(stderr, "%s: must specify one or more file names\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       while (optind < argc) {
+               int rc2;
+
+               path = argv[optind++];
+               if (realpath(path, fullpath) == NULL) {
+                       fprintf(stderr, "%s: could not find path '%s': %s\n",
+                               argv[0], path, strerror(errno));
+                       if (rc == 0)
+                               rc = -EINVAL;
+                       continue;
+               }
+
+               rc2 = llapi_pcc_state_get(fullpath, &state);
+               if (rc2 < 0) {
+                       if (rc == 0)
+                               rc = rc2;
+                       fprintf(stderr, "%s: cannot get PCC state of '%s': "
+                               "%s\n", argv[0], path, strerror(-rc2));
+                       continue;
+               }
+
+               printf("file: %s", path);
+               printf(", type: %s", pcc_type2string(state.pccs_type));
+               if (state.pccs_type == LU_PCC_NONE &&
+                   state.pccs_open_count == 0) {
+                       printf("\n");
+                       continue;
+               }
+
+               printf(", PCC file: %s", state.pccs_path);
+               printf(", user number: %u", state.pccs_open_count);
+               printf(", flags: %x", state.pccs_flags);
+               printf("\n");
+       }
+       return rc;
+}
+
+/**
+ * lfs_pcc_list_commands() - List lfs pcc commands.
+ * @argc: The count of command line arguments.
+ * @argv: Array of strings for command line arguments.
+ *
+ * This function lists lfs pcc commands defined in pcc_cmdlist[].
+ *
+ * Return: 0 on success.
+ */
+static int lfs_pcc_list_commands(int argc, char **argv)
+{
+       char buffer[81] = "";
+
+       Parser_list_commands(pcc_cmdlist, buffer, sizeof(buffer),
+                            NULL, 0, 4);
+
+       return 0;
+}
+
+/**
+ * lfs_pcc() - Parse and execute lfs pcc commands.
+ * @argc: The count of lfs pcc command line arguments.
+ * @argv: Array of strings for lfs pcc command line arguments.
+ *
+ * This function parses lfs pcc commands and performs the
+ * corresponding functions specified in pcc_cmdlist[].
+ *
+ * Return: 0 on success or an error code on failure.
+ */
+static int lfs_pcc(int argc, char **argv)
+{
+       char cmd[PATH_MAX];
+       int rc = 0;
+
+       setlinebuf(stdout);
+
+       Parser_init("lfs-pcc > ", pcc_cmdlist);
+
+       snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
+       progname = cmd;
+       program_invocation_short_name = cmd;
+       if (argc > 1)
+               rc = Parser_execarg(argc - 1, argv + 1, pcc_cmdlist);
+       else
+               rc = Parser_commands();
+
+       return rc < 0 ? -rc : rc;
+}
+
 static int lfs_list_commands(int argc, char **argv)
 {
        char buffer[81] = ""; /* 80 printable chars + terminating NUL */