Whamcloud - gitweb
LU-9538 utils: fix lfs xattr.h header usage
[fs/lustre-release.git] / lustre / utils / lfs.c
index 1020567..ed49265 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/xattr.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <time.h>
 #include <ctype.h>
 #include <zlib.h>
 #include <libgen.h>
+#include <asm/byteorder.h>
 #include "lfs_project.h"
 
 #include <libcfs/util/string.h>
@@ -73,6 +75,7 @@
 #include <linux/lustre/lustre_ver.h>
 #include <linux/lustre/lustre_param.h>
 #include <linux/lnet/nidstr.h>
+#include <cyaml.h>
 
 #ifndef ARRAY_SIZE
 # define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
@@ -115,6 +118,7 @@ static int lfs_hsm_cancel(int argc, char **argv);
 static int lfs_swap_layouts(int argc, char **argv);
 static int lfs_mv(int argc, char **argv);
 static int lfs_ladvise(int argc, char **argv);
+static int lfs_getsom(int argc, char **argv);
 static int lfs_mirror(int argc, char **argv);
 static int lfs_mirror_list_commands(int argc, char **argv);
 static int lfs_list_commands(int argc, char **argv);
@@ -158,9 +162,11 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "                 [--stripe-count|-c <stripe_count>]\n"         \
        "                 [--stripe-index|-i <start_ost_idx>]\n"        \
        "                 [--stripe-size|-S <stripe_size>]\n"           \
-       "                 [--layout|-L <pattern>]\n"            \
+       "                 [--layout|-L <pattern>]\n"                    \
        "                 [--pool|-p <pool_name>]\n"                    \
-       "                 [--ost|-o <ost_indices>]\n"
+       "                 [--ost|-o <ost_indices>]\n"                   \
+       "                 [--yaml|-y <yaml_template_file>]\n"           \
+       "                 [--copy=<lustre_src>]\n"
 
 #define SSM_HELP_COMMON \
        "\tstripe_count: Number of OSTs to stripe over (0=fs default, -1 all)\n" \
@@ -180,7 +186,13 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\tcomp_end:     Extent end of component, start after previous end.\n"\
        "\t              Can be specified with K, M or G (for KB, MB, GB\n" \
        "\t              respectively, -1 for EOF). Must be a multiple of\n"\
-       "\t              stripe_size.\n"
+       "\t              stripe_size.\n"                                      \
+       "\tyaml_template_file:\n"                                             \
+       "\t              YAML layout template file, can't be used with -c,\n" \
+       "\t              -i, -S, -p, -o, or -E arguments.\n"                  \
+       "\tlustre_src:   Lustre file/dir whose layout info is used to set\n"  \
+       "\t              another lustre file or directory, can't used with\n" \
+       "\t              -c, -i, -S, -p, -o, or -E arguments.\n"
 
 #define MIRROR_CREATE_HELP                                                    \
        "\tmirror_count: Number of mirrors to be created with the upcoming\n"  \
@@ -260,14 +272,16 @@ command_t mirror_cmdlist[] = {
          MIRROR_EXTEND_HELP },
        { .pc_name = "split", .pc_func = lfs_mirror_split,
          .pc_help = "Split a mirrored file.\n"
-       "usage: lfs mirror split <--mirror-id <mirror_id>> [--destroy|-d] "
-       "[-f <new_file>] <mirrored file>\n"
-       "\tmirror_id:    The numerical unique identifier for a mirror. It\n"
-       "\t              can be fetched by lfs getstripe command.\n"
-       "\tnew_file:     This option indicates the layout of the split\n"
-       "\t              mirror will be stored into. If not specified,\n"
-       "\t              a new file named <mirrored_file>.mirror~<mirror_id>\n"
-       "\t              will be used.\n" },
+       "usage: lfs mirror split <--mirror-id <mirror_id> | \n"
+       "\t             <--component-id|-I <comp_id>> [--destroy|-d] \n"
+       "\t             [-f <new_file>] <mirrored file>\n"
+       "\tmirror_id:   The numerical unique identifier for a mirror. It\n"
+       "\t             can be fetched by lfs getstripe command.\n"
+       "\tcomp_id:     Unique component ID within a mirror.\n"
+       "\tnew_file:    This option indicates the layout of the split\n"
+       "\t             mirror will be stored into. If not specified,\n"
+       "\t             a new file named <mirrored_file>.mirror~<mirror_id>\n"
+       "\t             will be used.\n" },
        { .pc_name = "resync", .pc_func = lfs_mirror_resync,
          .pc_help = "Resynchronizes out-of-sync mirrored file(s).\n"
                "usage: lfs mirror resync [--only <mirror_id[,...]>] "
@@ -299,6 +313,9 @@ command_t cmdlist[] = {
         "To totally delete the default striping from an existing directory:\n"
         "usage: setstripe -d <directory>\n"
         " or\n"
+        "To create a mirrored file or set s default mirror layout on a directory:\n"
+        "usage: setstripe -N[mirror_count] [STRIPE_OPTIONS] <directory|filename>\n"
+        " or\n"
         "To delete the last component(s) from an existing composite file\n"
         "(note that this will also delete any data in those components):\n"
         "usage: setstripe --component-del [--component-id|-I <comp_id>]\n"
@@ -321,6 +338,8 @@ command_t cmdlist[] = {
         "                 [--component-count]\n"
         "                 [--component-start[=[+-]comp_start]]\n"
         "                 [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n"
+        "                 [[!] --mirror-index=[+-]<index> |\n"
+        "                  [!] --mirror-id=[+-]<id>]\n"
         "                 <directory|filename> ..."},
        {"setdirstripe", lfs_setdirstripe, 0,
         "To create a striped directory on a specified MDT. This can only\n"
@@ -352,7 +371,7 @@ command_t cmdlist[] = {
         "find files matching given attributes recursively in directory tree.\n"
         "usage: find <directory|filename> ...\n"
         "     [[!] --atime|-A [+-]N] [[!] --ctime|-C [+-]N]\n"
-        "     [[!] --mtime|-M [+-]N] [--maxdepth|-D N]\n"
+        "     [[!] --mtime|-M [+-]N] [--maxdepth|-D N] [[!] --blocks|-b N]\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"
@@ -405,13 +424,25 @@ command_t cmdlist[] = {
         "       setquota [-t] <-u|--user|-g|--group|-p|--projid>\n"
          "                [--block-grace <block-grace>]\n"
          "                [--inode-grace <inode-grace>] <filesystem>\n"
+        "       setquota <-U|-G|-P>\n"
+        "                -b <block-softlimit> -B <block-hardlimit>\n"
+        "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
+        "       setquota <-U|--default-usr|-G|--default-grp|-P|--default-prj>\n"
+        "                [--block-softlimit <block-softlimit>]\n"
+        "                [--block-hardlimit <block-hardlimit>]\n"
+        "                [--inode-softlimit <inode-softlimit>]\n"
+        "                [--inode-hardlimit <inode-hardlimit>] <filesystem>\n"
+        "       setquota <-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>\n"
+        "                <-d|--default>\n"
          "       -b can be used instead of --block-softlimit/--block-grace\n"
          "       -B can be used instead of --block-hardlimit\n"
          "       -i can be used instead of --inode-softlimit/--inode-grace\n"
-        "       -I can be used instead of --inode-hardlimit\n\n"
+        "       -I can be used instead of --inode-hardlimit\n"
+        "       -d can be used instead of --default\n\n"
         "Note: The total quota space will be split into many qunits and\n"
         "      balanced over all server targets, the minimal qunit size is\n"
         "      1M bytes for block space and 1K inodes for inode space.\n\n"
+        "      The maximum quota grace time is 2^48 - 1 seconds.\n\n"
         "      Quota space rebalancing process will stop when this mininum\n"
         "      value is reached. As a result, quota exceeded can be returned\n"
         "      while many targets still have 1MB or 1K inodes of spare\n"
@@ -420,7 +451,8 @@ command_t cmdlist[] = {
         "usage: quota [-q] [-v] [-h] [-o <obd_uuid>|-i <mdt_idx>|-I "
                       "<ost_idx>]\n"
         "             [<-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>] <filesystem>\n"
-        "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g|-p> <filesystem>"},
+        "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g|-p> <filesystem>\n"
+       "        quota [-q] [-v] [h] <-U|-G|-P> <filesystem>"},
        {"project", lfs_project, 0,
         "Change or list project attribute for specified file or directory.\n"
         "usage: project [-d|-r] <file|directory...>\n"
@@ -541,6 +573,11 @@ command_t cmdlist[] = {
         "lfs mirror split  - split a mirror from an existing mirrored file\n"
         "lfs mirror resync - resynchronize out-of-sync mirrored file(s)\n"
         "lfs mirror 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"},
        {"help", Parser_help, 0, "help"},
        {"exit", Parser_quit, 0, "quit"},
        {"quit", Parser_quit, 0, "quit"},
@@ -1230,12 +1267,14 @@ static inline int mirror_sanity_check_one(struct llapi_layout *layout)
  *            in case the victim file(s) contains the same data as the
  *            original mirrored file.
  * @MF_DESTROY: Indicates to delete the mirror from the mirrored file.
+ * @MF_COMP_ID: specified component id instead of mirror id
  *
  * Flags for extending a mirrored file.
  */
 enum mirror_flags {
        MF_NO_VERIFY    = 0x1,
        MF_DESTROY      = 0x2,
+       MF_COMP_ID      = 0x4,
 };
 
 /**
@@ -1394,7 +1433,7 @@ static int mirror_create(char *fname, struct mirror_args *mirror_list)
                goto error;
        }
 
-       rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0644,
+       rc = lfs_component_create(fname, O_CREAT | O_WRONLY, 0666,
                                  layout);
        if (rc >= 0) {
                close(rc);
@@ -1656,7 +1695,7 @@ static int mirror_extend(char *fname, struct mirror_args *mirror_list,
        return rc;
 }
 
-static int verify_id(struct llapi_layout *layout, void *cbdata)
+static int find_mirror_id(struct llapi_layout *layout, void *cbdata)
 {
        uint32_t id;
        int rc;
@@ -1671,7 +1710,21 @@ static int verify_id(struct llapi_layout *layout, void *cbdata)
        return LLAPI_LAYOUT_ITER_CONT;
 }
 
-static int mirror_split(const char *fname, __u16 mirror_id,
+static int find_comp_id(struct llapi_layout *layout, void *cbdata)
+{
+       uint32_t id;
+       int rc;
+
+       rc = llapi_layout_comp_id_get(layout, &id);
+       if (rc < 0)
+               return rc;
+
+       if (id == *(__u32 *)cbdata)
+               return LLAPI_LAYOUT_ITER_STOP;
+
+       return LLAPI_LAYOUT_ITER_CONT;
+}
+static int mirror_split(const char *fname, __u32 id,
                        enum mirror_flags mflags, const char *victim_file)
 {
        struct llapi_layout *layout;
@@ -1685,7 +1738,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        int fd, fdv;
        int rc;
 
-       /* check fname contains mirror with mirror_id */
+       /* check fname contains mirror with mirror_id/comp_id */
        layout = llapi_layout_get_by_path(fname, 0);
        if (!layout) {
                fprintf(stderr,
@@ -1712,7 +1765,12 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                goto free_layout;
        }
 
-       rc = llapi_layout_comp_iterate(layout, verify_id, &mirror_id);
+       if (mflags & MF_COMP_ID) {
+               rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
+               id = mirror_id_of(id);
+       } else {
+               rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+       }
        if (rc < 0) {
                fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
                        progname, fname);
@@ -1720,7 +1778,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
                fprintf(stderr,
                     "error %s: file '%s' does not contain mirror with id %u\n",
-                       progname, fname, mirror_id);
+                       progname, fname, id);
                goto free_layout;
        }
 
@@ -1737,7 +1795,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                fprintf(stderr, "error %s: file name of '%s' too long\n",
                        progname, fname);
                rc = -ERANGE;
-               goto free_layout;
+               goto close_fd;
        }
        strncpy(parent, fname, sizeof(parent));
        ptr = strrchr(parent, '/');
@@ -1746,7 +1804,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                        fprintf(stderr, "error %s: getcwd failed: %s\n",
                                progname, strerror(errno));
                        rc = -errno;
-                       goto free_layout;
+                       goto close_fd;
                }
        } else {
                if (ptr == parent)
@@ -1758,7 +1816,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        if (rc < 0) {
                fprintf(stderr, "%s: cannot get MDT index of '%s'\n",
                        progname, fname);
-               goto free_layout;
+               goto close_fd;
        }
 
        if (victim_file == NULL) {
@@ -1768,7 +1826,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
                                                        O_LOV_DELAY_CREATE);
                } else {
                        snprintf(victim, sizeof(victim), "%s.mirror~%u",
-                                fname, mirror_id);
+                                fname, id);
                        fdv = open(victim, flags, S_IRUSR | S_IWUSR);
                }
        } else {
@@ -1803,7 +1861,7 @@ static int mirror_split(const char *fname, __u16 mirror_id,
        data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
        data->lil_count = 2;
        data->lil_ids[0] = fdv;
-       data->lil_ids[1] = mirror_id;
+       data->lil_ids[1] = id;
        rc = llapi_lease_set(fd, data);
        if (rc <= 0) {
                if (rc == 0) /* lost lease lock */
@@ -1915,13 +1973,18 @@ struct lfs_setstripe_args {
        __u32                    lsa_comp_flags;
        __u32                    lsa_comp_neg_flags;
        unsigned long long       lsa_pattern;
+       unsigned int             lsa_mirror_count;
        int                      lsa_nr_tgts;
+       bool                     lsa_first_comp;
        __u32                   *lsa_tgts;
        char                    *lsa_pool_name;
 };
 
 static inline void setstripe_args_init(struct lfs_setstripe_args *lsa)
 {
+       unsigned int mirror_count = lsa->lsa_mirror_count;
+       bool first_comp = lsa->lsa_first_comp;
+
        memset(lsa, 0, sizeof(*lsa));
 
        lsa->lsa_stripe_size = LLAPI_LAYOUT_DEFAULT;
@@ -1929,6 +1992,9 @@ static inline void setstripe_args_init(struct lfs_setstripe_args *lsa)
        lsa->lsa_stripe_off = LLAPI_LAYOUT_DEFAULT;
        lsa->lsa_pattern = LLAPI_LAYOUT_RAID0;
        lsa->lsa_pool_name = NULL;
+
+       lsa->lsa_mirror_count = mirror_count;
+       lsa->lsa_first_comp = first_comp;
 }
 
 /**
@@ -1978,7 +2044,8 @@ static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa)
  * Return: 0 on success or an error code on failure.
  */
 static int comp_args_to_layout(struct llapi_layout **composite,
-                              struct lfs_setstripe_args *lsa)
+                              struct lfs_setstripe_args *lsa,
+                              bool set_extent)
 {
        struct llapi_layout *layout = *composite;
        uint64_t prev_end = 0;
@@ -2004,19 +2071,30 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        return rc;
                }
 
-               rc = llapi_layout_comp_add(layout);
+               if (lsa->lsa_first_comp)
+                       prev_end = 0;
+
+               if (lsa->lsa_first_comp)
+                       rc = llapi_layout_add_first_comp(layout);
+               else
+                       rc = llapi_layout_comp_add(layout);
                if (rc) {
                        fprintf(stderr, "Add component failed. %s\n",
                                strerror(errno));
                        return rc;
                }
        }
+       /* reset lsa_first_comp */
+       lsa->lsa_first_comp = false;
 
-       rc = llapi_layout_comp_extent_set(layout, prev_end, lsa->lsa_comp_end);
-       if (rc) {
-               fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
-                       prev_end, lsa->lsa_comp_end, strerror(errno));
-               return rc;
+       if (set_extent) {
+               rc = llapi_layout_comp_extent_set(layout, prev_end,
+                                                 lsa->lsa_comp_end);
+               if (rc) {
+                       fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
+                               prev_end, lsa->lsa_comp_end, strerror(errno));
+                       return rc;
+               }
        }
 
        /* Data-on-MDT component setting */
@@ -2106,7 +2184,7 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                    lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
                    lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
                    lsa->lsa_nr_tgts != lsa->lsa_stripe_count) {
-                       fprintf(stderr, "stripe_count(%lld) != nr_osts(%d)\n",
+                       fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n",
                                lsa->lsa_stripe_count, lsa->lsa_nr_tgts);
                        return -EINVAL;
                }
@@ -2116,7 +2194,8 @@ static int comp_args_to_layout(struct llapi_layout **composite,
                        if (rc)
                                break;
                }
-       } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT) {
+       } else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT &&
+                  lsa->lsa_stripe_off != -1) {
                rc = llapi_layout_ost_index_set(layout, 0, lsa->lsa_stripe_off);
        }
        if (rc) {
@@ -2128,6 +2207,140 @@ static int comp_args_to_layout(struct llapi_layout **composite,
        return 0;
 }
 
+static int build_component(struct llapi_layout **layout,
+                          struct lfs_setstripe_args *lsa, bool set_extent)
+{
+       int rc;
+
+       rc = comp_args_to_layout(layout, lsa, set_extent);
+       if (rc)
+               return rc;
+
+       if (lsa->lsa_mirror_count > 0) {
+               rc = llapi_layout_mirror_count_set(*layout,
+                                                  lsa->lsa_mirror_count);
+               if (rc)
+                       return rc;
+
+               rc = llapi_layout_flags_set(*layout, LCM_FL_RDONLY);
+               if (rc)
+                       return rc;
+               lsa->lsa_mirror_count = 0;
+       }
+
+       return rc;
+}
+
+static int build_layout_from_yaml_node(struct cYAML *node,
+                                      struct llapi_layout **layout,
+                                      struct lfs_setstripe_args *lsa,
+                                      __u32 *osts)
+{
+       char *string;
+       int rc = 0;
+
+       while (node) {
+               string = node->cy_string;
+               /* skip leading lmm_ if present, to simplify parsing */
+               if (string != NULL && strncmp(string, "lmm_", 4) == 0)
+                       string += 4;
+
+               if (node->cy_type == CYAML_TYPE_STRING) {
+                       if (!strcmp(string, "lcme_extent.e_end")) {
+                               if (!strcmp(node->cy_valuestring, "EOF") ||
+                                   !strcmp(node->cy_valuestring, "eof"))
+                                       lsa->lsa_comp_end = LUSTRE_EOF;
+                       } else if (!strcmp(string, "pool")) {
+                               lsa->lsa_pool_name = node->cy_valuestring;
+                       } else if (!strcmp(string, "pattern")) {
+                               if (!strcmp(node->cy_valuestring, "mdt"))
+                                       lsa->lsa_pattern = LLAPI_LAYOUT_MDT;
+                       }
+               } else if (node->cy_type == CYAML_TYPE_NUMBER) {
+                       if (!strcmp(string, "lcm_mirror_count")) {
+                               lsa->lsa_mirror_count = node->cy_valueint;
+                       } else if (!strcmp(string, "lcme_extent.e_start")) {
+                               if (node->cy_valueint != 0 || *layout != NULL) {
+                                       rc = build_component(layout, lsa, true);
+                                       if (rc)
+                                               return rc;
+                               }
+
+                               if (node->cy_valueint == 0)
+                                       lsa->lsa_first_comp = true;
+
+                               /* initialize lsa */
+                               setstripe_args_init(lsa);
+                               lsa->lsa_tgts = osts;
+                       } else if (!strcmp(string, "lcme_extent.e_end")) {
+                               if (node->cy_valueint == -1)
+                                       lsa->lsa_comp_end = LUSTRE_EOF;
+                               else
+                                       lsa->lsa_comp_end = node->cy_valueint;
+                       } else if (!strcmp(string, "stripe_count")) {
+                               lsa->lsa_stripe_count = node->cy_valueint;
+                       } else if (!strcmp(string, "stripe_size")) {
+                               lsa->lsa_stripe_size = node->cy_valueint;
+                       } else if (!strcmp(string, "stripe_offset")) {
+                               lsa->lsa_stripe_off = node->cy_valueint;
+                       } else if (!strcmp(string, "l_ost_idx")) {
+                               osts[lsa->lsa_nr_tgts] = node->cy_valueint;
+                               lsa->lsa_nr_tgts++;
+                       }
+               } else if (node->cy_type == CYAML_TYPE_OBJECT) {
+                       /* go deep to sub blocks */
+                       rc = build_layout_from_yaml_node(node->cy_child, layout,
+                                                        lsa, osts);
+                       if (rc)
+                               return rc;
+               }
+               node = node->cy_next;
+       }
+
+       return rc;
+}
+
+static int lfs_comp_create_from_yaml(char *template,
+                                    struct llapi_layout **layout,
+                                    struct lfs_setstripe_args *lsa,
+                                    __u32 *osts)
+{
+       struct cYAML *tree = NULL, *err_rc = NULL;
+       int rc = 0;
+
+       tree = cYAML_build_tree(template, NULL, 0, &err_rc, false);
+       if (!tree) {
+               fprintf(stderr, "%s: cannot parse YAML file %s\n",
+                       progname, template);
+               cYAML_build_error(-EINVAL, -1, "yaml", "from comp yaml",
+                                 "can't parse", &err_rc);
+               cYAML_print_tree2file(stderr, err_rc);
+               cYAML_free_tree(err_rc);
+               rc = -EINVAL;
+               goto err;
+       }
+
+       /* initialize lsa for plain file */
+       setstripe_args_init(lsa);
+       lsa->lsa_tgts = osts;
+
+       rc = build_layout_from_yaml_node(tree, layout, lsa, osts);
+       if (rc) {
+               fprintf(stderr, "%s: cannot build layout from YAML file %s.\n",
+                       progname, template);
+               goto err;
+       } else {
+               rc = build_component(layout, lsa, *layout != NULL);
+       }
+       /* clean clean lsa */
+       setstripe_args_init(lsa);
+
+err:
+       if (tree)
+               cYAML_free_tree(tree);
+       return rc;
+}
+
 /* In 'lfs setstripe --component-add' mode, we need to fetch the extent
  * end of the last component in the existing file, and adjust the
  * first extent start of the components to be added accordingly. */
@@ -2299,20 +2512,22 @@ enum {
        LFS_MIRROR_FLAGS_OPT,
        LFS_MIRROR_ID_OPT,
        LFS_MIRROR_STATE_OPT,
+       LFS_LAYOUT_COPY,
+       LFS_MIRROR_INDEX_OPT,
 };
 
 /* functions */
 static int lfs_setstripe_internal(int argc, char **argv,
                                  enum setstripe_origin opc)
 {
-       struct lfs_setstripe_args        lsa;
+       struct lfs_setstripe_args        lsa = { 0 };
        struct llapi_stripe_param       *param = NULL;
        struct find_param                migrate_mdt_param = {
                .fp_max_depth = -1,
                .fp_mdt_index = -1,
        };
        char                            *fname;
-       int                              result;
+       int                              result = 0;
        int                              result2 = 0;
        char                            *end;
        int                              c;
@@ -2337,6 +2552,9 @@ static int lfs_setstripe_internal(int argc, char **argv,
        struct mirror_args              *last_mirror = NULL;
        __u16                            mirror_id = 0;
        char                             cmd[PATH_MAX];
+       bool from_yaml = false;
+       bool from_copy = false;
+       char *template = NULL;
 
        struct option long_opts[] = {
 /* find        { .val = 'A',   .name = "atime",        .has_arg = required_argument }*/
@@ -2366,6 +2584,8 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        .name = "flags",        .has_arg = required_argument},
        { .val = LFS_MIRROR_ID_OPT,
                        .name = "mirror-id",    .has_arg = required_argument},
+       { .val = LFS_LAYOUT_COPY,
+                       .name = "copy",         .has_arg = required_argument},
        { .val = 'c',   .name = "stripe-count", .has_arg = required_argument},
        { .val = 'c',   .name = "stripe_count", .has_arg = required_argument},
 /* find        { .val = 'C',   .name = "ctime",        .has_arg = required_argument }*/
@@ -2410,7 +2630,7 @@ 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},
-/* getstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .val = 'y',   .name = "yaml",         .has_arg = required_argument },
        { .name = NULL } };
 
        setstripe_args_init(&lsa);
@@ -2420,7 +2640,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
 
        snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
        progname = cmd;
-       while ((c = getopt_long(argc, argv, "bc:dDE:f:i:I:m:N::no:p:L:s:S:v",
+       while ((c = getopt_long(argc, argv, "bc:dDE:f:i:I:m:N::no:p:L:s:S:vy:",
                                long_opts, NULL)) >= 0) {
                switch (c) {
                case 0:
@@ -2495,6 +2715,10 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
                        break;
                }
+               case LFS_LAYOUT_COPY:
+                       from_copy = true;
+                       template = optarg;
+                       break;
                case 'b':
                        if (!migrate_mode) {
                                fprintf(stderr,
@@ -2541,7 +2765,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        break;
                case 'E':
                        if (lsa.lsa_comp_end != 0) {
-                               result = comp_args_to_layout(lpp, &lsa);
+                               result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
                                        fprintf(stderr,
                                                "%s %s: invalid layout\n",
@@ -2681,7 +2905,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                if (lsa.lsa_comp_end == 0)
                                        lsa.lsa_comp_end = LUSTRE_EOF;
 
-                               result = comp_args_to_layout(lpp, &lsa);
+                               result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
                                        lfs_mirror_free(new_mirror);
                                        goto error;
@@ -2744,6 +2968,10 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        }
                        migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
                        break;
+               case 'y':
+                       from_yaml = true;
+                       template = optarg;
+                       break;
                default:
                        fprintf(stderr, "%s %s: unrecognized option '%s'\n",
                                progname, argv[0], argv[optind - 1]);
@@ -2773,7 +3001,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
        }
 
        if (lsa.lsa_comp_end != 0) {
-               result = comp_args_to_layout(lpp, &lsa);
+               result = comp_args_to_layout(lpp, &lsa, true);
                if (result)
                        goto error;
        }
@@ -2867,6 +3095,21 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        goto error;
        }
 
+       if (from_yaml && from_copy) {
+               fprintf(stderr,
+                       "%s: can't specify --yaml and --copy together\n",
+                       progname);
+               goto error;
+       }
+
+       if ((from_yaml || from_copy) &&
+           (setstripe_args_specified(&lsa) || layout != NULL)) {
+               fprintf(stderr, "error: %s: can't specify --yaml with "
+                       "-c, -S, -i, -o, -p or -E options.\n",
+                       argv[0]);
+               goto error;
+       }
+
        if (mdt_idx_arg != NULL && optind > 3) {
                fprintf(stderr,
                        "%s %s: option -m cannot be used with other options\n",
@@ -2881,9 +3124,10 @@ static int lfs_setstripe_internal(int argc, char **argv,
                goto usage_error;
        }
 
-       if (!comp_del && !comp_set && comp_id != 0) {
+       if (!comp_del && !comp_set && (opc != SO_MIRROR_SPLIT) &&
+           comp_id != 0) {
                fprintf(stderr,
-                       "%s %s: option -I can only be used with --component-del\n",
+               "%s %s: option -I can only be used with --component-del or --component-set or lfs mirror split\n",
                        progname, argv[0]);
                goto usage_error;
        }
@@ -2943,6 +3187,26 @@ static int lfs_setstripe_internal(int argc, char **argv,
                }
        }
 
+       if (from_yaml) {
+               /* generate a layout from a YAML template */
+               result = lfs_comp_create_from_yaml(template, &layout,
+                                                  &lsa, osts);
+               if (result) {
+                       fprintf(stderr, "error: %s: can't create composite "
+                               "layout from template file %s\n",
+                               argv[0], template);
+                       goto error;
+               }
+       } else if (from_copy) {
+               layout = llapi_layout_get_by_path(template, 0);
+               if (layout == NULL) {
+                       fprintf(stderr,
+                           "%s: can't create composite layout from file %s.\n",
+                               progname, template);
+                       goto error;
+               }
+       }
+
        for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
                if (mdt_idx_arg != NULL) {
                        result = llapi_migrate_mdt(fname, &migrate_mdt_param);
@@ -2965,18 +3229,22 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        result = mirror_extend(fname, mirror_list,
                                               mirror_flags);
                } else if (opc == SO_MIRROR_SPLIT) {
-                       if (mirror_id == 0) {
+                       if (mirror_id == 0 && comp_id == 0) {
                                fprintf(stderr,
-                                       "%s %s: no mirror id is specified\n",
+                       "%s %s: no mirror id or component id is specified\n",
                                        progname, argv[0]);
                                goto usage_error;
                        }
-                       result = mirror_split(fname, mirror_id, mirror_flags,
+                       if (mirror_id != 0)
+                               comp_id = mirror_id;
+                       else
+                               mirror_flags |= MF_COMP_ID;
+                       result = mirror_split(fname, comp_id, mirror_flags,
                                              has_m_file ? mirror_list->m_file :
                                              NULL);
                } else if (layout != NULL) {
                        result = lfs_component_create(fname, O_CREAT | O_WRONLY,
-                                                     0644, layout);
+                                                     0666, layout);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -2984,7 +3252,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                } else {
                        result = llapi_file_open_param(fname,
                                                       O_CREAT | O_WRONLY,
-                                                      0644, param);
+                                                      0666, param);
                        if (result >= 0) {
                                close(result);
                                result = 0;
@@ -3020,28 +3288,38 @@ static int lfs_poollist(int argc, char **argv)
 
 static int set_time(time_t *time, time_t *set, char *str)
 {
-        time_t t;
-        int res = 0;
+       time_t t;
+       int res = 0;
+       char *endptr;
 
-        if (str[0] == '+')
-                res = 1;
-        else if (str[0] == '-')
-                res = -1;
+       if (str[0] == '+')
+               res = 1;
+       else if (str[0] == '-')
+               res = -1;
 
-        if (res)
-                str++;
+       if (res)
+               str++;
 
-        t = strtol(str, NULL, 0);
-        if (*time < t * 24 * 60 * 60) {
-                if (res)
-                        str--;
-                fprintf(stderr, "Wrong time '%s' is specified.\n", str);
-                return INT_MAX;
-        }
+       t = strtol(str, &endptr, 0);
+       if (*endptr != '\0') {
+               fprintf(stderr,
+                       "%s find: bad time '%s': %s\n",
+                       progname, str, strerror(EINVAL));
+               return INT_MAX;
+       }
+       if (*time < t * 24 * 60 * 60) {
+               if (res != 0)
+                       str--;
+               fprintf(stderr,
+                       "%s find: bad time '%s': too large\n",
+                       progname, str);
+               return INT_MAX;
+       }
 
-        *set = *time - t * 24 * 60 * 60;
-        return res;
+       *set = *time - t * 24 * 60 * 60;
+       return res;
 }
+
 static int name2uid(unsigned int *id, const char *name)
 {
        struct passwd *passwd;
@@ -3127,6 +3405,7 @@ static int lfs_find(int argc, char **argv)
        };
         struct option long_opts[] = {
        { .val = 'A',   .name = "atime",        .has_arg = required_argument },
+       { .val = 'b',   .name = "blocks",       .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = required_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -3201,7 +3480,7 @@ static int lfs_find(int argc, char **argv)
 
        /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
        while ((c = getopt_long_only(argc, argv,
-                       "-0A:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:v",
+                       "-0A:b:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:v",
                        long_opts, NULL)) >= 0) {
                 xtime = NULL;
                 xsign = NULL;
@@ -3263,6 +3542,26 @@ static int lfs_find(int argc, char **argv)
                        if (rc)
                                *xsign = rc;
                        break;
+               case 'b':
+                       if (optarg[0] == '+') {
+                               param.fp_blocks_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.fp_blocks_sign =  1;
+                               optarg++;
+                       }
+
+                       param.fp_blocks_units = 1024;
+                       ret = llapi_parse_size(optarg, &param.fp_blocks,
+                                              &param.fp_blocks_units, 0);
+                       if (ret) {
+                               fprintf(stderr, "error: bad blocks '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.fp_check_blocks = 1;
+                       param.fp_exclude_blocks = !!neg_opt;
+                       break;
                case LFS_COMP_COUNT_OPT:
                        if (optarg[0] == '+') {
                                param.fp_comp_count_sign = -1;
@@ -3701,6 +4000,7 @@ static int lfs_getstripe_internal(int argc, char **argv,
 {
        struct option long_opts[] = {
 /* find        { .val = 'A',   .name = "atime",        .has_arg = required_argument }*/
+/* find        { .val = 'b',   .name = "blocks",       .has_arg = required_argument }*/
        { .val = LFS_COMP_COUNT_OPT,
                        .name = "comp-count",   .has_arg = no_argument },
        { .val = LFS_COMP_COUNT_OPT,
@@ -3713,6 +4013,10 @@ static int lfs_getstripe_internal(int argc, char **argv,
                        .name = "comp-start",   .has_arg = optional_argument },
        { .val = LFS_COMP_START_OPT,
                .name = "component-start",      .has_arg = optional_argument },
+       { .val = LFS_MIRROR_INDEX_OPT,
+               .name = "mirror-index",         .has_arg = required_argument },
+       { .val = LFS_MIRROR_ID_OPT,
+               .name = "mirror-id",            .has_arg = required_argument },
        { .val = 'c',   .name = "stripe-count", .has_arg = no_argument },
        { .val = 'c',   .name = "stripe_count", .has_arg = no_argument },
 /* find        { .val = 'C',   .name = "ctime",        .has_arg = required_argument }*/
@@ -3751,11 +4055,36 @@ static int lfs_getstripe_internal(int argc, char **argv,
        { .val = 'y',   .name = "yaml",         .has_arg = no_argument },
        { .name = NULL } };
        int c, rc;
+       int neg_opt = 0;
+       int pathstart = -1, pathend = -1;
+       int isoption;
        char *end, *tmp;
 
-       while ((c = getopt_long(argc, argv, "cdDE::FghiI::LmMoO:pqrRsSvy",
-                               long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv,
+                       "-cdDE::FghiI::LmMoO:pqrRsSvy",
+                       long_opts, NULL)) != -1) {
+               if (neg_opt)
+                       --neg_opt;
+
+               /* '!' is part of option */
+               isoption = (c != 1) || (strcmp(optarg, "!") == 0);
+               if (!isoption && pathend != -1) {
+                       fprintf(stderr,
+                               "error: %s: filename|dirname must either precede options or follow options\n",
+                               argv[0]);
+                       return CMD_HELP;
+               }
+               if (!isoption && pathstart == -1)
+                       pathstart = optind - 1;
+               if (isoption && pathstart != -1 && pathend == -1)
+                       pathend = optind - 2;
+
                switch (c) {
+               case 1:
+                       /* unknown: opt is "!" */
+                       if (strcmp(optarg, "!") == 0)
+                               neg_opt = 2;
+                       break;
                case 'c':
                        if (!(param->fp_verbose & VERBOSE_DETAIL)) {
                                param->fp_verbose |= VERBOSE_COUNT;
@@ -3809,6 +4138,58 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                param->fp_max_depth = 0;
                        }
                        break;
+               case LFS_MIRROR_INDEX_OPT:
+                       if (optarg[0] == '+') {
+                               param->fp_mirror_index_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param->fp_mirror_index_sign = 1;
+                               optarg++;
+                       }
+
+                       param->fp_mirror_index = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || (param->fp_mirror_index == 0 &&
+                           param->fp_mirror_index_sign == 0 && neg_opt == 0)) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror index '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       if (param->fp_mirror_id != 0) {
+                               fprintf(stderr,
+                                       "%s %s: can't specify both mirror index and mirror ID\n",
+                                       progname, argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->fp_check_mirror_index = 1;
+                       param->fp_exclude_mirror_index = !!neg_opt;
+                       break;
+               case LFS_MIRROR_ID_OPT:
+                       if (optarg[0] == '+') {
+                               param->fp_mirror_id_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param->fp_mirror_id_sign = 1;
+                               optarg++;
+                       }
+
+                       param->fp_mirror_id = strtoul(optarg, &end, 0);
+                       if (*end != '\0' || (param->fp_mirror_id == 0 &&
+                           param->fp_mirror_id_sign == 0 && neg_opt == 0)) {
+                               fprintf(stderr,
+                                       "%s %s: invalid mirror ID '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       if (param->fp_mirror_index != 0) {
+                               fprintf(stderr,
+                                       "%s %s: can't specify both mirror index and mirror ID\n",
+                                       progname, argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->fp_check_mirror_id = 1;
+                       param->fp_exclude_mirror_id = !!neg_opt;
+                       break;
                case 'd':
                        param->fp_max_depth = 0;
                        break;
@@ -3939,7 +4320,16 @@ static int lfs_getstripe_internal(int argc, char **argv,
                }
        }
 
-       if (optind >= argc)
+       if (pathstart == -1) {
+               fprintf(stderr, "error: %s: no filename|pathname\n",
+                               argv[0]);
+               return CMD_HELP;
+       } else if (pathend == -1) {
+               /* no options */
+               pathend = argc;
+       }
+
+       if (pathend > argc)
                return CMD_HELP;
 
        if (param->fp_recursive)
@@ -3953,8 +4343,8 @@ static int lfs_getstripe_internal(int argc, char **argv,
                param->fp_verbose = VERBOSE_OBJID;
 
        do {
-               rc = llapi_getstripe(argv[optind], param);
-       } while (++optind < argc && !rc);
+               rc = llapi_getstripe(argv[pathstart], param);
+       } while (++pathstart < pathend && !rc);
 
        if (rc)
                fprintf(stderr, "error: %s failed for %s.\n",
@@ -4404,7 +4794,7 @@ static int lfs_setdirstripe(int argc, char **argv)
 {
        char                    *dname;
        int                     result;
-       struct lfs_setstripe_args        lsa;
+       struct lfs_setstripe_args        lsa = { 0 };
        struct llapi_stripe_param       *param = NULL;
        __u32                   mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
        char                    *end;
@@ -4434,6 +4824,7 @@ static int lfs_setdirstripe(int argc, char **argv)
        { .val = 't',   .name = "hash-type",    .has_arg = required_argument },
 #endif
        { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
+/* setstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
        { .name = NULL } };
 
        setstripe_args_init(&lsa);
@@ -4754,8 +5145,8 @@ static int lfs_mv(int argc, char **argv)
                case 'm':
                        param.fp_mdt_index = strtoul(optarg, &end, 0);
                        if (*end != '\0') {
-                               fprintf(stderr, "%s: invalid MDT index'%s'\n",
-                                       argv[0], optarg);
+                               fprintf(stderr, "%s mv: bad MDT index '%s'\n",
+                                       progname, optarg);
                                return CMD_HELP;
                        }
                        break;
@@ -4763,27 +5154,28 @@ static int lfs_mv(int argc, char **argv)
                        param.fp_verbose = VERBOSE_DETAIL;
                        break;
                default:
-                       fprintf(stderr, "error: %s: unrecognized option '%s'\n",
-                               argv[0], argv[optind - 1]);
+                       fprintf(stderr, "%s mv: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
        if (param.fp_mdt_index == -1) {
-               fprintf(stderr, "%s: MDT index must be specified\n", argv[0]);
+               fprintf(stderr, "%s mv: MDT index must be specified\n",
+                       progname);
                return CMD_HELP;
        }
 
        if (optind >= argc) {
-               fprintf(stderr, "%s: missing operand path\n", argv[0]);
+               fprintf(stderr, "%s mv: DIR must be specified\n", progname);
                return CMD_HELP;
        }
 
        param.fp_migrate = 1;
        rc = llapi_migrate_mdt(argv[optind], &param);
        if (rc != 0)
-               fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n",
-                       argv[0], argv[optind], param.fp_mdt_index,
+               fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n",
+                       progname, argv[optind], param.fp_mdt_index,
                        strerror(-rc));
        return rc;
 }
@@ -5114,6 +5506,12 @@ quota_type:
                 return CMD_HELP;
         }
 
+       if ((dqb->dqb_valid | QIF_BTIME && dqi->dqi_bgrace >= UINT_MAX) ||
+           (dqb->dqb_valid | QIF_ITIME && dqi->dqi_igrace >= UINT_MAX)) {
+               fprintf(stderr, "error: grace time is too large\n");
+               return CMD_HELP;
+       }
+
         mnt = argv[optind];
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
@@ -5134,25 +5532,30 @@ quota_type:
 
 int lfs_setquota(int argc, char **argv)
 {
-        int c, rc;
-        struct if_quotactl qctl;
-        char *mnt, *obd_type = (char *)qctl.obd_type;
-        struct obd_dqblk *dqb = &qctl.qc_dqblk;
-        struct option long_opts[] = {
+       int c, rc = 0;
+       struct if_quotactl qctl;
+       char *mnt, *obd_type = (char *)qctl.obd_type;
+       struct obd_dqblk *dqb = &qctl.qc_dqblk;
+       struct option long_opts[] = {
        { .val = 'b',   .name = "block-softlimit",
                                                .has_arg = required_argument },
        { .val = 'B',   .name = "block-hardlimit",
                                                .has_arg = required_argument },
+       { .val = 'd',   .name = "default",      .has_arg = no_argument },
        { .val = 'g',   .name = "group",        .has_arg = required_argument },
+       { .val = 'G',   .name = "default-grp",  .has_arg = no_argument },
        { .val = 'i',   .name = "inode-softlimit",
                                                .has_arg = required_argument },
        { .val = 'I',   .name = "inode-hardlimit",
                                                .has_arg = required_argument },
        { .val = 'p',   .name = "projid",       .has_arg = required_argument },
+       { .val = 'P',   .name = "default-prj",  .has_arg = no_argument },
        { .val = 'u',   .name = "user",         .has_arg = required_argument },
+       { .val = 'U',   .name = "default-usr",  .has_arg = no_argument },
        { .name = NULL } };
-        unsigned limit_mask = 0;
-        char *endptr;
+       unsigned limit_mask = 0;
+       char *endptr;
+       bool use_default = false;
        int qtype;
 
        if (has_times_option(argc, argv))
@@ -5164,37 +5567,65 @@ int lfs_setquota(int argc, char **argv)
                                  * so it can be used as a marker that qc_type
                                  * isn't reinitialized from command line */
 
-       while ((c = getopt_long(argc, argv, "b:B:g:i:I:p:u:",
+       while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U",
                long_opts, NULL)) != -1) {
                switch (c) {
+               case 'U':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = USRQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
                case 'u':
                        qtype = USRQUOTA;
                        rc = name2uid(&qctl.qc_id, optarg);
                        goto quota_type;
+               case 'G':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = GRPQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
                 case 'g':
                        qtype = GRPQUOTA;
                        rc = name2gid(&qctl.qc_id, optarg);
                        goto quota_type;
+               case 'P':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       qtype = PRJQUOTA;
+                       qctl.qc_id = 0;
+                       goto quota_type_def;
                case 'p':
                        qtype = PRJQUOTA;
                        rc = name2projid(&qctl.qc_id, optarg);
 quota_type:
-                       if (qctl.qc_type != ALLQUOTA) {
-                               fprintf(stderr,
-                                       "%s setquota: only one of -u, -g or -p may be specified\n",
-                                       progname);
-                               return CMD_HELP;
-                       }
-                       qctl.qc_type = qtype;
                        if (rc) {
                                qctl.qc_id = strtoul(optarg, &endptr, 10);
                                if (*endptr != '\0') {
-                                       fprintf(stderr,
-                                               "%s setquota: invalid id '%s'\n",
-                                               progname, optarg);
+                                       fprintf(stderr, "%s setquota: invalid"
+                                               " id '%s'\n", progname, optarg);
                                        return -1;
                                }
                        }
+
+                       if (qctl.qc_id == 0) {
+                               fprintf(stderr, "%s setquota: can't set quota"
+                                       " for root usr/group/project.\n",
+                                       progname);
+                               return -1;
+                       }
+
+quota_type_def:
+                       if (qctl.qc_type != ALLQUOTA) {
+                               fprintf(stderr,
+                                       "%s setquota: only one of -u, -U, -g,"
+                                       " -G, -p or -P may be specified\n",
+                                       progname);
+                               return CMD_HELP;
+                       }
+                       qctl.qc_type = qtype;
+                       break;
+               case 'd':
+                       qctl.qc_cmd = LUSTRE_Q_SETDEFAULT;
+                       use_default = true;
                        break;
                case 'b':
                        ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
@@ -5257,13 +5688,29 @@ quota_type:
                return CMD_HELP;
        }
 
-       if (limit_mask == 0) {
+       if (!use_default && limit_mask == 0) {
                fprintf(stderr,
                        "%s setquota: at least one limit must be specified\n",
                        progname);
                return CMD_HELP;
        }
 
+       if (use_default && limit_mask != 0) {
+               fprintf(stderr,
+                       "%s setquota: limits should not be specified when"
+                       " using default quota\n",
+                       progname);
+               return CMD_HELP;
+       }
+
+       if (use_default && qctl.qc_id == 0) {
+               fprintf(stderr,
+                       "%s setquota: can not set default quota for root"
+                       " user/group/project\n",
+                       progname);
+               return CMD_HELP;
+       }
+
        if (optind != argc - 1) {
                fprintf(stderr,
                        "%s setquota: filesystem not specified or unexpected argument '%s'\n",
@@ -5273,42 +5720,50 @@ quota_type:
 
         mnt = argv[optind];
 
-        if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) ||
-            (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) {
-                /* sigh, we can't just set blimits/ilimits */
-                struct if_quotactl tmp_qctl = {.qc_cmd  = LUSTRE_Q_GETQUOTA,
-                                               .qc_type = qctl.qc_type,
-                                               .qc_id   = qctl.qc_id};
-
-                rc = llapi_quotactl(mnt, &tmp_qctl);
+       if (use_default) {
+               dqb->dqb_bhardlimit = 0;
+               dqb->dqb_bsoftlimit = 0;
+               dqb->dqb_ihardlimit = 0;
+               dqb->dqb_isoftlimit = 0;
+               dqb->dqb_itime = 0;
+               dqb->dqb_btime = 0;
+               dqb->dqb_valid |= QIF_LIMITS | QIF_TIMES;
+       } else if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) ||
+                  (!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) {
+               /* sigh, we can't just set blimits/ilimits */
+               struct if_quotactl tmp_qctl = {.qc_cmd  = LUSTRE_Q_GETQUOTA,
+                                              .qc_type = qctl.qc_type,
+                                              .qc_id   = qctl.qc_id};
+
+               rc = llapi_quotactl(mnt, &tmp_qctl);
                if (rc < 0)
                        return rc;
 
-                if (!(limit_mask & BHLIMIT))
-                        dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
-                if (!(limit_mask & BSLIMIT))
-                        dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit;
-                if (!(limit_mask & IHLIMIT))
-                        dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit;
-                if (!(limit_mask & ISLIMIT))
-                        dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit;
-
-                /* Keep grace times if we have got no softlimit arguments */
-                if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) {
-                        dqb->dqb_valid |= QIF_BTIME;
-                        dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime;
-                }
+               if (!(limit_mask & BHLIMIT))
+                       dqb->dqb_bhardlimit = tmp_qctl.qc_dqblk.dqb_bhardlimit;
+               if (!(limit_mask & BSLIMIT))
+                       dqb->dqb_bsoftlimit = tmp_qctl.qc_dqblk.dqb_bsoftlimit;
+               if (!(limit_mask & IHLIMIT))
+                       dqb->dqb_ihardlimit = tmp_qctl.qc_dqblk.dqb_ihardlimit;
+               if (!(limit_mask & ISLIMIT))
+                       dqb->dqb_isoftlimit = tmp_qctl.qc_dqblk.dqb_isoftlimit;
+
+               /* Keep grace times if we have got no softlimit arguments */
+               if ((limit_mask & BHLIMIT) && !(limit_mask & BSLIMIT)) {
+                       dqb->dqb_valid |= QIF_BTIME;
+                       dqb->dqb_btime = tmp_qctl.qc_dqblk.dqb_btime;
+               }
 
-                if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) {
-                        dqb->dqb_valid |= QIF_ITIME;
-                        dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime;
-                }
-        }
+               if ((limit_mask & IHLIMIT) && !(limit_mask & ISLIMIT)) {
+                       dqb->dqb_valid |= QIF_ITIME;
+                       dqb->dqb_itime = tmp_qctl.qc_dqblk.dqb_itime;
+               }
+       }
 
-        dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0;
-        dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0;
+       dqb->dqb_valid |= (limit_mask & (BHLIMIT | BSLIMIT)) ? QIF_BLIMITS : 0;
+       dqb->dqb_valid |= (limit_mask & (IHLIMIT | ISLIMIT)) ? QIF_ILIMITS : 0;
 
-        rc = llapi_quotactl(mnt, &qctl);
+       rc = llapi_quotactl(mnt, &qctl);
        if (rc) {
                if (*obd_type)
                        fprintf(stderr,
@@ -5377,15 +5832,22 @@ static void diff2str(time_t seconds, char *buf, time_t now)
 }
 
 static void print_quota_title(char *name, struct if_quotactl *qctl,
-                             bool human_readable)
+                             bool human_readable, bool show_default)
 {
-       printf("Disk quotas for %s %s (%cid %u):\n",
-              qtype_name(qctl->qc_type), name,
-              *qtype_name(qctl->qc_type), qctl->qc_id);
-       printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
-              "Filesystem", human_readable ? "used" : "kbytes",
-              "quota", "limit", "grace",
-              "files", "quota", "limit", "grace");
+       if (show_default) {
+               printf("Disk default %s quota:\n", qtype_name(qctl->qc_type));
+               printf("%15s %8s%8s%8s %8s%8s%8s\n",
+                      "Filesystem", "bquota", "blimit", "bgrace",
+                      "iquota", "ilimit", "igrace");
+       } else {
+               printf("Disk quotas for %s %s (%cid %u):\n",
+                      qtype_name(qctl->qc_type), name,
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+               printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
+                      "Filesystem", human_readable ? "used" : "kbytes",
+                      "quota", "limit", "grace",
+                      "files", "quota", "limit", "grace");
+       }
 }
 
 static void kbytes2str(__u64 num, char *buf, int buflen, bool h)
@@ -5412,20 +5874,21 @@ static void kbytes2str(__u64 num, char *buf, int buflen, bool h)
 
 #define STRBUF_LEN     32
 static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
-                       int rc, bool h)
+                       int rc, bool h, bool show_default)
 {
-        time_t now;
+       time_t now;
 
-        time(&now);
+       time(&now);
 
-        if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) {
+       if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA ||
+           qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) {
                int bover = 0, iover = 0;
                struct obd_dqblk *dqb = &qctl->qc_dqblk;
                char numbuf[3][STRBUF_LEN];
                char timebuf[40];
                char strbuf[STRBUF_LEN];
 
-                if (dqb->dqb_bhardlimit &&
+               if (dqb->dqb_bhardlimit &&
                    lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
                         bover = 1;
                 } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
@@ -5455,6 +5918,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
 
                if (bover)
                        diff2str(dqb->dqb_btime, timebuf, now);
+               else if (show_default)
+                       snprintf(timebuf, sizeof(timebuf), "%llu",
+                                dqb->dqb_btime);
 
                kbytes2str(lustre_stoqb(dqb->dqb_curspace),
                           strbuf, sizeof(strbuf), h);
@@ -5475,15 +5941,23 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ?
                        "%s" : "[%s]", strbuf);
 
-               printf(" %7s%c %6s %7s %7s",
-                      numbuf[0], bover ? '*' : ' ', numbuf[1],
-                      numbuf[2], bover > 1 ? timebuf : "-");
+               if (show_default)
+                       printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf);
+               else
+                       printf(" %7s%c %6s %7s %7s",
+                              numbuf[0], bover ? '*' : ' ', numbuf[1],
+                              numbuf[2], bover > 1 ? timebuf : "-");
+
 
                if (iover)
                        diff2str(dqb->dqb_itime, timebuf, now);
+               else if (show_default)
+                       snprintf(timebuf, sizeof(timebuf), "%llu",
+                                dqb->dqb_itime);
 
-               sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
-                       "%ju" : "[%ju]", (uintmax_t)dqb->dqb_curinodes);
+               snprintf(numbuf[0], sizeof(numbuf),
+                        (dqb->dqb_valid & QIF_INODES) ? "%ju" : "[%ju]",
+                        (uintmax_t)dqb->dqb_curinodes);
 
                if (type == QC_GENERAL)
                        sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ?
@@ -5495,7 +5969,9 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
                sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
                        "%ju" : "[%ju]", (uintmax_t)dqb->dqb_ihardlimit);
 
-               if (type != QC_OSTIDX)
+               if (show_default)
+                       printf(" %6s %7s %7s", numbuf[1], numbuf[2], timebuf);
+               else if (type != QC_OSTIDX)
                        printf(" %7s%c %6s %7s %7s",
                               numbuf[0], iover ? '*' : ' ', numbuf[1],
                               numbuf[2], iover > 1 ? timebuf : "-");
@@ -5546,7 +6022,7 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
                 }
 
                print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
-                           qctl->qc_valid, 0, h);
+                           qctl->qc_valid, 0, h, false);
                *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
                                   qctl->qc_dqblk.dqb_bhardlimit;
        }
@@ -5556,12 +6032,15 @@ out:
 }
 
 static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
-                          int verbose, int quiet, bool human_readable)
+                          int verbose, int quiet, bool human_readable,
+                          bool show_default)
 {
        int rc1 = 0, rc2 = 0, rc3 = 0;
        char *obd_type = (char *)qctl->obd_type;
        char *obd_uuid = (char *)qctl->obd_uuid.uuid;
        __u64 total_ialloc = 0, total_balloc = 0;
+       bool use_default_for_blk = false;
+       bool use_default_for_file = false;
        int inacc;
 
        rc1 = llapi_quotactl(mnt, qctl);
@@ -5583,8 +6062,31 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                }
        }
 
-       if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
-               print_quota_title(name, qctl, human_readable);
+       if (!show_default && qctl->qc_id == 0) {
+               qctl->qc_dqblk.dqb_bhardlimit = 0;
+               qctl->qc_dqblk.dqb_bsoftlimit = 0;
+               qctl->qc_dqblk.dqb_ihardlimit = 0;
+               qctl->qc_dqblk.dqb_isoftlimit = 0;
+               qctl->qc_dqblk.dqb_btime = 0;
+               qctl->qc_dqblk.dqb_itime = 0;
+               qctl->qc_dqblk.dqb_valid |= QIF_LIMITS | QIF_TIMES;
+       }
+
+       if (qctl->qc_dqblk.dqb_valid & QIF_BTIME &&
+           LQUOTA_FLAG(qctl->qc_dqblk.dqb_btime) & LQUOTA_FLAG_DEFAULT) {
+               use_default_for_blk = true;
+               qctl->qc_dqblk.dqb_btime &= LQUOTA_GRACE_MASK;
+       }
+
+       if (qctl->qc_dqblk.dqb_valid & QIF_ITIME &&
+           LQUOTA_FLAG(qctl->qc_dqblk.dqb_itime) & LQUOTA_FLAG_DEFAULT) {
+               use_default_for_file = true;
+               qctl->qc_dqblk.dqb_itime &= LQUOTA_GRACE_MASK;
+       }
+
+       if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
+            qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet)
+               print_quota_title(name, qctl, human_readable, show_default);
 
        if (rc1 && *obd_type)
                fprintf(stderr, "%s %s ", obd_type, obd_uuid);
@@ -5596,10 +6098,10 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                ((qctl->qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
                 (QIF_LIMITS|QIF_USAGE));
 
-       print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable);
+       print_quota(mnt, qctl, QC_GENERAL, rc1, human_readable, show_default);
 
-       if (qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO &&
-           verbose) {
+       if (!show_default && verbose &&
+           qctl->qc_valid == QC_GENERAL && qctl->qc_cmd != LUSTRE_Q_GETINFO) {
                char strbuf[STRBUF_LEN];
 
                rc2 = print_obd_quota(mnt, qctl, 1, human_readable,
@@ -5613,6 +6115,14 @@ static int get_print_quota(char *mnt, char *name, struct if_quotactl *qctl,
                       strbuf);
        }
 
+       if (use_default_for_blk)
+               printf("%cid %u is using default block quota setting\n",
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+
+       if (use_default_for_file)
+               printf("%cid %u is using default file quota setting\n",
+                      *qtype_name(qctl->qc_type), qctl->qc_id);
+
        if (rc1 || rc2 || rc3 || inacc)
                printf("Some errors happened when getting quota info. "
                       "Some devices may be not working or deactivated. "
@@ -5787,16 +6297,23 @@ static int lfs_quota(int argc, char **argv)
        char *endptr;
        __u32 valid = QC_GENERAL, idx = 0;
        bool human_readable = false;
+       bool show_default = false;
        int qtype;
 
-       while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) {
+       while ((c = getopt(argc, argv, "gGi:I:o:pPqtuUvh")) != -1) {
                switch (c) {
+               case 'U':
+                       show_default = true;
                case 'u':
                        qtype = USRQUOTA;
                        goto quota_type;
+               case 'G':
+                       show_default = true;
                case 'g':
                        qtype = GRPQUOTA;
                        goto quota_type;
+               case 'P':
+                       show_default = true;
                case 'p':
                        qtype = PRJQUOTA;
 quota_type:
@@ -5853,7 +6370,7 @@ quota_type:
 
         /* current uid/gid info for "lfs quota /path/to/lustre/mount" */
        if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
-           optind == argc - 1) {
+           optind == argc - 1 && !show_default) {
 
                qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
                qctl.qc_valid = valid;
@@ -5872,35 +6389,45 @@ quota_type:
                                name = "<unknown>";
                        mnt = argv[optind];
                        rc1 = get_print_quota(mnt, name, &qctl, verbose, quiet,
-                                             human_readable);
+                                             human_readable, show_default);
                        if (rc1 && !rc)
                                rc = rc1;
                }
+               return rc;
        /* lfs quota -u username /path/to/lustre/mount */
        } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
                /* options should be followed by u/g-name and mntpoint */
-               if (optind + 2 != argc || qctl.qc_type == ALLQUOTA) {
+               if ((!show_default && optind + 2 != argc) ||
+                   (show_default && optind + 1 != argc) ||
+                   qctl.qc_type == ALLQUOTA) {
                        fprintf(stderr,
                                "%s quota: name and mount point must be specified\n",
                                progname);
                        return CMD_HELP;
                }
 
-               name = argv[optind++];
-               switch (qctl.qc_type) {
-               case USRQUOTA:
-                       rc = name2uid(&qctl.qc_id, name);
-                       break;
-               case GRPQUOTA:
-                       rc = name2gid(&qctl.qc_id, name);
-                       break;
-               case PRJQUOTA:
-                       rc = name2projid(&qctl.qc_id, name);
-                       break;
-               default:
-                       rc = -ENOTSUP;
-                       break;
+               if (!show_default) {
+                       name = argv[optind++];
+                       switch (qctl.qc_type) {
+                       case USRQUOTA:
+                               rc = name2uid(&qctl.qc_id, name);
+                               break;
+                       case GRPQUOTA:
+                               rc = name2gid(&qctl.qc_id, name);
+                               break;
+                       case PRJQUOTA:
+                               rc = name2projid(&qctl.qc_id, name);
+                               break;
+                       default:
+                               rc = -ENOTSUP;
+                               break;
+                       }
+               } else {
+                       qctl.qc_valid = QC_GENERAL;
+                       qctl.qc_cmd = LUSTRE_Q_GETDEFAULT;
+                       qctl.qc_id = 0;
                }
+
                if (rc) {
                        qctl.qc_id = strtoul(name, &endptr, 10);
                        if (*endptr != '\0') {
@@ -5909,15 +6436,15 @@ quota_type:
                                return CMD_HELP;
                        }
                }
-               mnt = argv[optind];
-               rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
-                                    human_readable);
        } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
                fprintf(stderr, "%s quota: missing quota info argument(s)\n",
                        progname);
                return CMD_HELP;
        }
 
+       mnt = argv[optind];
+       rc = get_print_quota(mnt, name, &qctl, verbose, quiet,
+                            human_readable, show_default);
        return rc;
 }
 #endif /* HAVE_SYS_QUOTA_H! */
@@ -6022,16 +6549,18 @@ static int lfs_changelog(int argc, char **argv)
                 case 'f':
                         follow++;
                         break;
-                case '?':
-                        return CMD_HELP;
                 default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
+                       fprintf(stderr,
+                               "%s changelog: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                         return CMD_HELP;
                 }
         }
-        if (optind >= argc)
-                return CMD_HELP;
+       if (optind >= argc) {
+               fprintf(stderr, "%s changelog: mdtname must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
         mdd = argv[optind++];
         if (argc > optind)
@@ -6046,8 +6575,8 @@ static int lfs_changelog(int argc, char **argv)
                                   (follow ? CHANGELOG_FLAG_FOLLOW : 0),
                                   mdd, startrec);
        if (rc < 0) {
-               fprintf(stderr, "Can't start changelog: %s\n",
-                       strerror(errno = -rc));
+               fprintf(stderr, "%s changelog: cannot start changelog: %s\n",
+                       progname, strerror(errno = -rc));
                return rc;
        }
 
@@ -6057,8 +6586,9 @@ static int lfs_changelog(int argc, char **argv)
                                        CHANGELOG_EXTRA_FLAG_OMODE |
                                        CHANGELOG_EXTRA_FLAG_XATTR);
        if (rc < 0) {
-               fprintf(stderr, "Can't set xflags for changelog: %s\n",
-                       strerror(errno = -rc));
+               fprintf(stderr,
+                       "%s changelog: cannot set xflags for changelog: %s\n",
+                       progname, strerror(errno = -rc));
                return rc;
        }
 
@@ -6123,10 +6653,10 @@ static int lfs_changelog(int argc, char **argv)
                                if (omd->cr_openflags & MDS_FMODE_EXEC) {
                                        mode[2] = 'x';
                                } else {
-                                       if (omd->cr_openflags & FMODE_READ)
+                                       if (omd->cr_openflags & MDS_FMODE_READ)
                                                mode[0] = 'r';
                                        if (omd->cr_openflags &
-                                           (FMODE_WRITE |
+                                           (MDS_FMODE_WRITE |
                                             MDS_OPEN_TRUNC |
                                             MDS_OPEN_APPEND))
                                                mode[1] = 'w';
@@ -6164,14 +6694,15 @@ static int lfs_changelog(int argc, char **argv)
                printf("\n");
 
                llapi_changelog_free(&rec);
-        }
+       }
 
-        llapi_changelog_fini(&changelog_priv);
+       llapi_changelog_fini(&changelog_priv);
 
-        if (rc < 0)
-                fprintf(stderr, "Changelog: %s\n", strerror(errno = -rc));
+       if (rc < 0)
+               fprintf(stderr, "%s changelog: cannot access changelog: %s\n",
+                       progname, strerror(errno = -rc));
 
-        return (rc == 1 ? 0 : rc);
+       return (rc == 1 ? 0 : rc);
 }
 
 static int lfs_changelog_clear(int argc, char **argv)
@@ -6216,36 +6747,55 @@ static int lfs_fid2path(int argc, char **argv)
        int lnktmp;
        int printcur = 0;
        int rc = 0;
+       char *endptr = NULL;
 
        while ((rc = getopt_long(argc, argv, short_opts,
                long_opts, NULL)) != -1) {
-                switch (rc) {
-                case 'c':
-                        printcur++;
-                        break;
-                case 'l':
-                        linkno = strtol(optarg, NULL, 10);
-                        break;
-                case 'r':
-                        recno = strtoll(optarg, NULL, 10);
-                        break;
-                case '?':
-                        return CMD_HELP;
-                default:
-                        fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                                argv[0], argv[optind - 1]);
-                        return CMD_HELP;
-                }
-        }
+               switch (rc) {
+               case 'c':
+                       printcur++;
+                       break;
+               case 'l':
+                       linkno = strtol(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
+                               fprintf(stderr,
+                                       "%s fid2path: invalid linkno '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'r':
+                       recno = strtoll(optarg, &endptr, 10);
+                       if (*endptr != '\0') {
+                               fprintf(stderr,
+                                       "%s fid2path: invalid recno '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               default:
+                       fprintf(stderr,
+                               "%s fid2path: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
 
-       if (argc < 3)
+       if (argc < 3) {
+               fprintf(stderr,
+                       "%s fid2path: <fsname|rootpath> and <fid>... must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
 
        device = argv[optind++];
        path = calloc(1, PATH_MAX);
        if (path == NULL) {
-               fprintf(stderr, "error: Not enough memory\n");
-               return -errno;
+               rc = -errno;
+               fprintf(stderr,
+                       "%s fid2path: cannot allocate memory for path: %s\n",
+                       progname, strerror(-rc));
+               return rc;
        }
 
        rc = 0;
@@ -6260,8 +6810,9 @@ static int lfs_fid2path(int argc, char **argv)
                        rc2 = llapi_fid2path(device, fid, path, PATH_MAX,
                                             &rectmp, &lnktmp);
                        if (rc2 < 0) {
-                               fprintf(stderr, "%s: error on FID %s: %s\n",
-                                       argv[0], fid, strerror(errno = -rc2));
+                               fprintf(stderr,
+                                       "%s fid2path: cannot find '%s': %s\n",
+                                       progname, fid, strerror(errno = -rc2));
                                if (rc == 0)
                                        rc = rc2;
                                break;
@@ -6310,14 +6861,18 @@ static int lfs_path2fid(int argc, char **argv)
                        show_parents = true;
                        break;
                default:
-                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
-                               argv[0], argv[optind - 1]);
+                       fprintf(stderr,
+                               "%s path2fid: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
 
-       if (optind > argc - 1)
+       if (optind > argc - 1) {
+               fprintf(stderr, "%s path2fid: FILE... must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
        else if (optind < argc - 1)
                sep = ": ";
 
@@ -6352,8 +6907,9 @@ static int lfs_path2fid(int argc, char **argv)
                }
 
                if (err) {
-                       fprintf(stderr, "%s: can't get %sfid for %s: %s\n",
-                               argv[0], show_parents ? "parent " : "", *path,
+                       fprintf(stderr,
+                               "%s path2fid: cannot get %sfid for '%s': %s\n",
+                               progname, show_parents ? "parent " : "", *path,
                                strerror(-err));
                        if (rc == 0) {
                                rc = err;
@@ -6374,8 +6930,11 @@ static int lfs_data_version(int argc, char **argv)
        int c;
        int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
 
-       if (argc < 2)
+       if (argc < 2) {
+               fprintf(stderr, "%s data_version: FILE must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
 
        while ((c = getopt(argc, argv, "nrw")) != -1) {
                switch (c) {
@@ -6389,20 +6948,32 @@ static int lfs_data_version(int argc, char **argv)
                        data_version_flags |= LL_DV_WR_FLUSH;
                        break;
                default:
+                       fprintf(stderr,
+                               "%s data_version: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
                        return CMD_HELP;
                }
        }
-       if (optind == argc)
+       if (optind == argc) {
+               fprintf(stderr, "%s data_version: FILE must be specified\n",
+                       progname);
                return CMD_HELP;
+       }
 
        path = argv[optind];
        fd = open(path, O_RDONLY);
-       if (fd < 0)
-               err(errno, "cannot open file %s", path);
+       if (fd < 0) {
+               rc = -errno;
+               fprintf(stderr, "%s data_version: cannot open file '%s': %s\n",
+                       progname, path, strerror(-rc));
+               return rc;
+       }
 
        rc = llapi_get_data_version(fd, &data_version, data_version_flags);
        if (rc < 0)
-               err(errno, "cannot get version for %s", path);
+               fprintf(stderr,
+                       "%s data_version: cannot get version for '%s': %s\n",
+                       progname, path, strerror(-rc));
        else
                printf("%ju" "\n", (uintmax_t)data_version);
 
@@ -7399,6 +7970,8 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
        struct llapi_layout *layout;
        struct stat stbuf;
        uint32_t flr_state;
+       uint64_t start;
+       uint64_t end;
        int comp_size = 0;
        int idx;
        int fd;
@@ -7471,51 +8044,29 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                goto free_layout;
        }
 
-       idx = 0;
-       while (idx < comp_size) {
-               ssize_t result;
-               uint64_t end;
-               __u16 mirror_id;
-               int i;
-
-               rc = llapi_lease_check(fd);
-               if (rc != LL_LEASE_WRLCK) {
-                       fprintf(stderr, "%s: '%s' lost lease lock.\n",
-                               progname, fname);
-                       goto free_layout;
-               }
-
-               mirror_id = comp_array[idx].lrc_mirror_id;
-               end = comp_array[idx].lrc_end;
-
-               /* try to combine adjacent component */
-               for (i = idx + 1; i < comp_size; i++) {
-                       if (mirror_id != comp_array[i].lrc_mirror_id ||
-                           end != comp_array[i].lrc_start)
-                               break;
-                       end = comp_array[i].lrc_end;
-               }
-
-               result = llapi_mirror_resync_one(fd, layout, mirror_id,
-                                                comp_array[idx].lrc_start,
-                                                end);
-               if (result < 0) {
-                       fprintf(stderr, "%s: '%s' llapi_mirror_resync_one: "
-                               "%ld.\n", progname, fname, result);
-                       rc = result;
-                       goto unlock;
-               } else if (result > 0) {
-                       int j;
-
-                       /* mark synced components */
-                       for (j = idx; j < i; j++)
-                               comp_array[j].lrc_synced = true;
-               }
+       /* get the read range [start, end) */
+       start = comp_array[0].lrc_start;
+       end = comp_array[0].lrc_end;
+       for (idx = 1; idx < comp_size; idx++) {
+               if (comp_array[idx].lrc_start < start)
+                       start = comp_array[idx].lrc_start;
+               if (end < comp_array[idx].lrc_end)
+                       end = comp_array[idx].lrc_end;
+       }
 
-               idx = i;
+       rc = llapi_lease_check(fd);
+       if (rc != LL_LEASE_WRLCK) {
+               fprintf(stderr, "%s: '%s' lost lease lock.\n",
+                       progname, fname);
+               goto free_layout;
        }
 
-unlock:
+       rc = llapi_mirror_resync_many(fd, layout, comp_array, comp_size,
+                                     start, end);
+       if (rc < 0)
+               fprintf(stderr, "%s: '%s' llapi_mirror_resync_many: %d.\n",
+                       progname, fname, rc);
+
        /* prepare ioc for lease put */
        ioc->lil_mode = LL_LEASE_UNLCK;
        ioc->lil_flags = LL_LEASE_RESYNC_DONE;
@@ -8292,6 +8843,93 @@ static int lfs_mirror(int argc, char **argv)
        return rc < 0 ? -rc : rc;
 }
 
+static void lustre_som_swab(struct lustre_som_attrs *attrs)
+{
+#if __BYTE_ORDER == __BIG_ENDIAN
+       __swab16s(&attrs->lsa_valid);
+       __swab64s(&attrs->lsa_size);
+       __swab64s(&attrs->lsa_blocks);
+#endif
+}
+
+enum lfs_som_type {
+       LFS_SOM_SIZE = 0x1,
+       LFS_SOM_BLOCKS = 0x2,
+       LFS_SOM_FLAGS = 0x4,
+       LFS_SOM_ATTR_ALL = LFS_SOM_SIZE | LFS_SOM_BLOCKS |
+                          LFS_SOM_FLAGS,
+};
+
+static int lfs_getsom(int argc, char **argv)
+{
+       const char *path;
+       struct lustre_som_attrs *attrs;
+       char buf[sizeof(*attrs) + 64];
+       enum lfs_som_type type = LFS_SOM_ATTR_ALL;
+       int rc = 0, c;
+
+       while ((c = getopt(argc, argv, "sbf")) != -1) {
+               switch (c) {
+               case 's':
+                       type = LFS_SOM_SIZE;
+                       break;
+               case 'b':
+                       type = LFS_SOM_BLOCKS;
+                       break;
+               case 'f':
+                       type = LFS_SOM_FLAGS;
+                       break;
+               default:
+                       fprintf(stderr, "%s: invalid option '%c'\n",
+                               progname, optopt);
+                       return CMD_HELP;
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (argc != 1) {
+               fprintf(stderr, "%s: %s\n",
+                       progname, argc == 0 ? "miss file target" :
+                       "input more than 2 files");
+               return CMD_HELP;
+       }
+
+       path = argv[0];
+       attrs = (void *)buf;
+       rc = lgetxattr(path, "trusted.som", attrs, sizeof(buf));
+       if (rc < 0) {
+               fprintf(stderr, "%s failed to get som xattr: %s\n", argv[0],
+                       strerror(-rc));
+               return rc;
+       }
+
+       lustre_som_swab(attrs);
+
+       switch (type) {
+       case LFS_SOM_ATTR_ALL:
+               printf("file: %s size: %llu blocks: %llu flags: %x\n",
+                      path, attrs->lsa_size, attrs->lsa_blocks,
+                      attrs->lsa_valid);
+               break;
+       case LFS_SOM_SIZE:
+               printf("%llu\n", attrs->lsa_size);
+               break;
+       case LFS_SOM_BLOCKS:
+               printf("%llu\n", attrs->lsa_blocks);
+               break;
+       case LFS_SOM_FLAGS:
+               printf("%x\n", attrs->lsa_valid);
+               break;
+       default:
+               fprintf(stderr, "%s: unknown option\n", progname);
+               return CMD_HELP;
+       }
+
+       return rc;
+}
+
 /**
  * lfs_mirror_list_commands() - List lfs mirror commands.
  * @argc: The count of command line arguments.