Whamcloud - gitweb
LU-11099 doc: include "-N" option to lfs_setstripe.1
[fs/lustre-release.git] / lustre / utils / lfs.c
index 412cc1a..86900f7 100644 (file)
@@ -63,6 +63,7 @@
 #include <time.h>
 #include <ctype.h>
 #include <zlib.h>
+#include <libgen.h>
 #include "lfs_project.h"
 
 #include <libcfs/util/string.h>
@@ -72,6 +73,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])))
@@ -157,9 +159,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" \
@@ -179,7 +183,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"  \
@@ -192,7 +202,6 @@ static inline int lfs_mirror_split(int argc, char **argv)
        "\t              It can be a plain layout or a composite layout.\n"    \
        "\t              If not specified, the stripe options inherited\n"     \
        "\t              from the previous component will be used.\n"          \
-       "\tparent:       Use default stripe options from parent directory\n"   \
        "\tflags:        set flags to the component of the current mirror.\n"  \
        "\t              Only \"prefer\" flag is supported so far.\n"
 
@@ -207,7 +216,7 @@ static inline int lfs_mirror_split(int argc, char **argv)
 
 #define MIRROR_EXTEND_USAGE                                                   \
        "                 <--mirror-count|-N[mirror_count]>\n"                 \
-       "                 [setstripe options|--parent|-f <victim_file>]\n"     \
+       "                 [setstripe options|-f <victim_file>]\n"              \
        "                 [--no-verify]\n"
 
 #define SETSTRIPE_USAGE                                                        \
@@ -221,11 +230,13 @@ static inline int lfs_mirror_split(int argc, char **argv)
        SSM_CMD_COMMON("migrate  ")                                     \
        "                 [--block|-b]\n"                               \
        "                 [--non-block|-n]\n"                           \
+       "                 [--non-direct|-D]\n"                          \
        "                 <filename>\n"                                 \
        SSM_HELP_COMMON                                                 \
        "\n"                                                            \
        "\tblock:        Block file access during data migration (default)\n" \
        "\tnon-block:    Abort migrations if concurrent access is detected\n" \
+       "\tnon-direct:   Do not use direct I/O to copy file contents\n" \
 
 #define SETDIRSTRIPE_USAGE                                     \
        "               [--mdt-count|-c stripe_count>\n"        \
@@ -248,13 +259,13 @@ command_t mirror_cmdlist[] = {
          .pc_help = "Create a mirrored file.\n"
                "usage: lfs mirror create "
                "<--mirror-count|-N[mirror_count]> "
-               "[setstripe options|--parent] ... <filename|directory>\n"
+               "[setstripe options] ... <filename|directory>\n"
          MIRROR_CREATE_HELP },
        { .pc_name = "extend", .pc_func = lfs_mirror_extend,
          .pc_help = "Extend a mirrored file.\n"
                "usage: lfs mirror extend "
                "<--mirror-count|-N[mirror_count]> [--no-verify] "
-               "[setstripe options|--parent|-f <victim_file>] ... <filename>\n"
+               "[setstripe options|-f <victim_file>] ... <filename>\n"
          MIRROR_EXTEND_HELP },
        { .pc_name = "split", .pc_func = lfs_mirror_split,
          .pc_help = "Split a mirrored file.\n"
@@ -297,6 +308,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"
@@ -350,7 +364,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"
@@ -403,13 +417,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"
@@ -418,7 +444,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"
@@ -510,6 +537,7 @@ command_t cmdlist[] = {
         "              [--ost|-o] <ost_indices>\n"
         "              [--block|-b]\n"
         "              [--non-block|-n]\n"
+        "              [--non-direct|-D]\n"
         "              <file|directory>\n"
         "\tstripe_count:     number of OSTs to stripe a file over\n"
         "\tstripe_ost_index: index of the first OST to stripe a file over\n"
@@ -517,7 +545,8 @@ command_t cmdlist[] = {
         "\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"},
+        "\tnon-block:        do not wait for the operation to return\n"
+        "\tnon-direct:       do not use direct I/O to copy file contents.\n"},
        {"mv", lfs_mv, 0,
         "To move directories between MDTs. This command is deprecated, "
         "use \"migrate\" instead.\n"
@@ -565,17 +594,20 @@ static const char *error_loc = "syserror";
 enum {
        MIGRATION_NONBLOCK      = 1 << 0,
        MIGRATION_MIRROR        = 1 << 1,
+       MIGRATION_NONDIRECT     = 1 << 2,
 };
 
 static int lfs_component_create(char *fname, int open_flags, mode_t open_mode,
                                struct llapi_layout *layout);
 
 static int
-migrate_open_files(const char *name, const struct llapi_stripe_param *param,
+migrate_open_files(const char *name, __u64 migration_flags,
+                  const struct llapi_stripe_param *param,
                   struct llapi_layout *layout, int *fd_src, int *fd_tgt)
 {
        int                      fd = -1;
        int                      fdv = -1;
+       int                      rflags;
        int                      mdt_index;
        int                      random_value;
        char                     parent[PATH_MAX];
@@ -612,7 +644,10 @@ migrate_open_files(const char *name, const struct llapi_stripe_param *param,
        /* open file, direct io */
        /* even if the file is only read, WR mode is nedeed to allow
         * layout swap on fd */
-       fd = open(name, O_RDWR | O_DIRECT);
+       rflags = O_RDWR;
+       if (!(migration_flags & MIGRATION_NONDIRECT))
+               rflags |= O_DIRECT;
+       fd = open(name, rflags);
        if (fd < 0) {
                rc = -errno;
                error_loc = "cannot open source file";
@@ -1016,7 +1051,8 @@ static int lfs_migrate(char *name, __u64 migration_flags,
        int fdv = -1;
        int rc;
 
-       rc = migrate_open_files(name, param, layout, &fd, &fdv);
+       rc = migrate_open_files(name, migration_flags, param, layout,
+                               &fd, &fdv);
        if (rc < 0)
                goto out;
 
@@ -1294,9 +1330,9 @@ static int mirror_create_sanity_check(const char *fname,
        }
 
        if (has_m_file && has_m_layout) {
-               fprintf(stderr, "error: %s: -f <victim_file> option should not "
-                       "be specified with setstripe options or "
-                       "--parent option\n", progname);
+               fprintf(stderr,
+                       "error: %s: -f <victim_file> option should not be specified with setstripe options\n",
+                       progname);
                return -EINVAL;
        }
 
@@ -1383,7 +1419,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);
@@ -1561,7 +1597,7 @@ static int mirror_extend_layout(char *name, struct llapi_layout *layout)
        int fdv = -1;
        int rc;
 
-       rc = migrate_open_files(name, NULL, layout, &fd, &fdv);
+       rc = migrate_open_files(name, 0, NULL, layout, &fd, &fdv);
        if (rc < 0)
                goto out;
 
@@ -1726,7 +1762,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, '/');
@@ -1735,7 +1771,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)
@@ -1747,7 +1783,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) {
@@ -1904,13 +1940,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;
@@ -1918,6 +1959,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;
 }
 
 /**
@@ -1967,7 +2011,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;
@@ -1993,19 +2038,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 */
@@ -2095,7 +2151,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;
                }
@@ -2105,7 +2161,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) {
@@ -2117,6 +2174,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. */
@@ -2283,26 +2474,26 @@ enum {
        LFS_COMP_DEL_OPT,
        LFS_COMP_SET_OPT,
        LFS_COMP_ADD_OPT,
-       LFS_COMP_USE_PARENT_OPT,
        LFS_COMP_NO_VERIFY_OPT,
        LFS_PROJID_OPT,
        LFS_MIRROR_FLAGS_OPT,
        LFS_MIRROR_ID_OPT,
        LFS_MIRROR_STATE_OPT,
+       LFS_LAYOUT_COPY,
 };
 
 /* 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;
@@ -2327,6 +2518,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 }*/
@@ -2350,19 +2544,21 @@ static int lfs_setstripe_internal(int argc, char **argv,
        { .val = LFS_COMP_SET_OPT,
                        .name = "component-set",
                                                .has_arg = no_argument},
-       { .val = LFS_COMP_USE_PARENT_OPT,
-                       .name = "parent",       .has_arg = no_argument},
        { .val = LFS_COMP_NO_VERIFY_OPT,
                        .name = "no-verify",    .has_arg = no_argument},
        { .val = LFS_MIRROR_FLAGS_OPT,
                        .name = "flags",        .has_arg = required_argument},
        { .val = LFS_MIRROR_ID_OPT,
                        .name = "mirror-id",    .has_arg = required_argument},
+       { .val = LFS_LAYOUT_COPY,
+                       .name = "copy",         .has_arg = required_argument},
        { .val = 'c',   .name = "stripe-count", .has_arg = required_argument},
        { .val = 'c',   .name = "stripe_count", .has_arg = required_argument},
 /* find        { .val = 'C',   .name = "ctime",        .has_arg = required_argument }*/
        { .val = 'd',   .name = "delete",       .has_arg = no_argument},
        { .val = 'd',   .name = "destroy",      .has_arg = no_argument},
+       /* --non-direct is only valid in migrate mode */
+       { .val = 'D',   .name = "non-direct",   .has_arg = no_argument },
        { .val = 'E',   .name = "comp-end",     .has_arg = required_argument},
        { .val = 'E',   .name = "component-end",
                                                .has_arg = required_argument},
@@ -2400,7 +2596,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);
@@ -2410,7 +2606,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:dE: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:
@@ -2444,15 +2640,6 @@ static int lfs_setstripe_internal(int argc, char **argv,
                case LFS_COMP_SET_OPT:
                        comp_set = 1;
                        break;
-               case LFS_COMP_USE_PARENT_OPT:
-                       if (!mirror_mode) {
-                               fprintf(stderr, "error: %s: --parent must be "
-                                       "specified with --mirror-count|-N "
-                                       "option\n", progname);
-                               goto usage_error;
-                       }
-                       setstripe_args_init(&lsa);
-                       break;
                case LFS_COMP_NO_VERIFY_OPT:
                        mirror_flags |= MF_NO_VERIFY;
                        break;
@@ -2494,6 +2681,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,
@@ -2528,9 +2719,19 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                mirror_flags |= MF_DESTROY;
                        }
                        break;
+               case 'D':
+                       if (!migrate_mode) {
+                               fprintf(stderr,
+                                       "%s %s: -D|--non-direct is valid "
+                                       "only for migrate command\n",
+                                       progname, argv[0]);
+                               goto usage_error;
+                       }
+                       migration_flags |= MIGRATION_NONDIRECT;
+                       break;
                case 'E':
                        if (lsa.lsa_comp_end != 0) {
-                               result = comp_args_to_layout(lpp, &lsa);
+                               result = comp_args_to_layout(lpp, &lsa, true);
                                if (result) {
                                        fprintf(stderr,
                                                "%s %s: invalid layout\n",
@@ -2670,7 +2871,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;
@@ -2708,6 +2909,11 @@ static int lfs_setstripe_internal(int argc, char **argv,
                        if (optarg == NULL)
                                goto usage_error;
                        lsa.lsa_pool_name = optarg;
+
+                       if (strlen(lsa.lsa_pool_name) == 0 ||
+                           strncmp(lsa.lsa_pool_name, "none",
+                                   LOV_MAXPOOLNAME) == 0)
+                               lsa.lsa_pool_name = NULL;
                        break;
                case 'S':
                        result = llapi_parse_size(optarg, &lsa.lsa_stripe_size,
@@ -2728,6 +2934,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]);
@@ -2757,7 +2967,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;
        }
@@ -2851,6 +3061,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",
@@ -2927,6 +3152,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);
@@ -2960,7 +3205,7 @@ static int lfs_setstripe_internal(int argc, char **argv,
                                              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;
@@ -2968,7 +3213,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;
@@ -3004,28 +3249,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;
-
-        if (str[0] == '+')
-                res = 1;
-        else if (str[0] == '-')
-                res = -1;
-
-        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;
-        }
+       time_t t;
+       int res = 0;
+       char *endptr;
+
+       if (str[0] == '+')
+               res = 1;
+       else if (str[0] == '-')
+               res = -1;
+
+       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;
+       }
+       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;
@@ -3111,6 +3366,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,
@@ -3185,7 +3441,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;
@@ -3247,6 +3503,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;
@@ -3685,6 +3961,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,
@@ -4073,339 +4350,54 @@ static int lfs_getdirstripe(int argc, char **argv)
        return rc;
 }
 
-/* functions */
-static int lfs_setdirstripe(int argc, char **argv)
-{
-       char                    *dname;
-       int                     result;
-       struct lfs_setstripe_args        lsa;
-       struct llapi_stripe_param       *param = NULL;
-       __u32                   mdts[LMV_MAX_STRIPE_COUNT] = { 0 };
-       char                    *end;
-       int                     c;
-       char                    *mode_opt = NULL;
-       bool                    default_stripe = false;
-       mode_t                  mode = S_IRWXU | S_IRWXG | S_IRWXO;
-       mode_t                  previous_mode = 0;
-       bool                    delete = false;
+enum mntdf_flags {
+       MNTDF_INODES    = 0x0001,
+       MNTDF_COOKED    = 0x0002,
+       MNTDF_LAZY      = 0x0004,
+       MNTDF_VERBOSE   = 0x0008,
+       MNTDF_SHOW      = 0x0010,
+};
 
-       struct option long_opts[] = {
-       { .val = 'c',   .name = "count",        .has_arg = required_argument },
-       { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument },
-       { .val = 'd',   .name = "delete",       .has_arg = no_argument },
-       { .val = 'D',   .name = "default",      .has_arg = no_argument },
-       { .val = 'D',   .name = "default_stripe", .has_arg = no_argument },
-       { .val = 'H',   .name = "mdt-hash",     .has_arg = required_argument },
-       { .val = 'i',   .name = "mdt-index",    .has_arg = required_argument },
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       { .val = 'i',   .name = "index",        .has_arg = required_argument },
-#endif
-       { .val = 'o',   .name = "mode",         .has_arg = required_argument },
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       { .val = 't',   .name = "hash-type",    .has_arg = required_argument },
-#endif
-       { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
-       { .name = NULL } };
+#define COOK(value)                                            \
+({                                                             \
+       int radix = 0;                                          \
+       while (value > 1024) {                                  \
+               value /= 1024;                                  \
+               radix++;                                        \
+       }                                                       \
+       radix;                                                  \
+})
+#define UUF     "%-20s"
+#define CSF     "%11s"
+#define CDF     "%11llu"
+#define HDF     "%8.1f%c"
+#define RSF     "%4s"
+#define RDF     "%3d%%"
 
-       setstripe_args_init(&lsa);
+static inline int obd_statfs_ratio(const struct obd_statfs *st)
+{
+       double avail, used, ratio = 0;
 
-       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts,
-                               NULL)) >= 0) {
-               switch (c) {
-               case 0:
-                       /* Long options. */
-                       break;
-               case 'c':
-               case 'T':
-                       lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
-                       if (*end != '\0') {
-                               fprintf(stderr,
-                                       "%s %s: invalid stripe count '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'd':
-                       delete = true;
-                       default_stripe = true;
-                       break;
-               case 'D':
-                       default_stripe = true;
-                       break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-               case 't':
-                       fprintf(stderr, "warning: '--hash-type' and '-t' "
-                             "deprecated, use '--mdt-hash' or '-H' instead\n");
-#endif
-               case 'H':
-                       lsa.lsa_pattern = check_hashtype(optarg);
-                       if (lsa.lsa_pattern == 0) {
-                               fprintf(stderr,
-                                       "%s %s: bad stripe hash type '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'i':
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-                       if (strcmp(argv[optind - 1], "--index") == 0)
-                               fprintf(stderr,
-                                       "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
-                                       progname, argv[0]);
-#endif
-                       lsa.lsa_nr_tgts = parse_targets(mdts,
-                                               sizeof(mdts) / sizeof(__u32),
-                                               lsa.lsa_nr_tgts, optarg);
-                       if (lsa.lsa_nr_tgts < 0) {
-                               fprintf(stderr,
-                                       "%s %s: invalid MDT target(s) '%s'\n",
-                                       progname, argv[0], optarg);
-                               return CMD_HELP;
-                       }
+       avail = st->os_bavail;
+       used  = st->os_blocks - st->os_bfree;
+       if (avail + used > 0)
+               ratio = used / (used + avail) * 100 + 0.5;
 
-                       lsa.lsa_tgts = mdts;
-                       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
-                               lsa.lsa_stripe_off = mdts[0];
-                       break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
-               case 'm':
-                       fprintf(stderr, "warning: '-m' is deprecated, "
-                               "use '--mode' or '-o' instead\n");
-#endif
-               case 'o':
-                       mode_opt = optarg;
-                       break;
-               default:
-                       fprintf(stderr, "%s %s: unrecognized option '%s'\n",
-                               progname, argv[0], argv[optind - 1]);
-                       return CMD_HELP;
-               }
-       }
+       return (int)ratio;
+}
 
-       if (optind == argc) {
-               fprintf(stderr, "%s %s: DIR must be specified\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
-           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) {
-               fprintf(stderr,
-                       "%s %s: stripe offset and count must be specified\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (delete &&
-           (lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT ||
-            lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)) {
-               fprintf(stderr,
-                       "%s %s: cannot specify -d with -c or -i options\n",
-                       progname, argv[0]);
-               return CMD_HELP;
-       }
-
-       if (mode_opt != NULL) {
-               mode = strtoul(mode_opt, &end, 8);
-               if (*end != '\0') {
-                       fprintf(stderr,
-                               "%s %s: bad MODE '%s'\n",
-                               progname, argv[0], mode_opt);
-                       return CMD_HELP;
-               }
-               previous_mode = umask(0);
-       }
-
-       /* initialize stripe parameters */
-       param = calloc(1, offsetof(typeof(*param), lsp_osts[lsa.lsa_nr_tgts]));
-       if (param == NULL) {
-               fprintf(stderr,
-                       "%s %s: cannot allocate memory for parameters: %s\n",
-                       progname, argv[0], strerror(ENOMEM));
-               return CMD_HELP;
-       }
-
-       if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
-               param->lsp_stripe_count = lsa.lsa_stripe_count;
-       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
-               param->lsp_stripe_offset = -1;
-       else
-               param->lsp_stripe_offset = lsa.lsa_stripe_off;
-       if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
-               param->lsp_stripe_pattern = lsa.lsa_pattern;
-       else
-               param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64;
-       param->lsp_pool = lsa.lsa_pool_name;
-       param->lsp_is_specific = false;
-       if (lsa.lsa_nr_tgts > 1) {
-               if (lsa.lsa_stripe_count > 0 &&
-                   lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
-                   lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
-                       fprintf(stderr, "error: %s: stripe count %lld doesn't "
-                               "match the number of MDTs: %d\n",
-                               argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts);
-                       free(param);
-                       return CMD_HELP;
-               }
-
-               param->lsp_is_specific = true;
-               param->lsp_stripe_count = lsa.lsa_nr_tgts;
-               memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts);
-       }
-
-       dname = argv[optind];
-       do {
-               if (default_stripe)
-                       result = llapi_dir_set_default_lmv(dname, param);
-               else
-                       result = llapi_dir_create_param(dname, mode, param);
-
-               if (result) {
-                       fprintf(stderr,
-                               "%s setdirstripe: cannot create stripe dir '%s': %s\n",
-                               progname, dname, strerror(-result));
-                       break;
-               }
-               dname = argv[++optind];
-       } while (dname != NULL);
-
-       if (mode_opt != NULL)
-               umask(previous_mode);
-
-       free(param);
-       return result;
-}
-
-/* functions */
-static int lfs_rmentry(int argc, char **argv)
-{
-       char *dname;
-       int   index;
-       int   result = 0;
-
-       if (argc <= 1) {
-               fprintf(stderr, "error: %s: missing dirname\n",
-                       argv[0]);
-               return CMD_HELP;
-       }
-
-       index = 1;
-       dname = argv[index];
-       while (dname != NULL) {
-               result = llapi_direntry_remove(dname);
-               if (result) {
-                       fprintf(stderr, "error: %s: remove dir entry '%s' "
-                               "failed\n", argv[0], dname);
-                       break;
-               }
-               dname = argv[++index];
-       }
-       return result;
-}
-
-static int lfs_mv(int argc, char **argv)
-{
-       struct  find_param param = {
-               .fp_max_depth = -1,
-               .fp_mdt_index = -1,
-       };
-       char   *end;
-       int     c;
-       int     rc = 0;
-       struct option long_opts[] = {
-       { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
-       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
-       { .name = NULL } };
-
-       while ((c = getopt_long(argc, argv, "m:M:v", long_opts, NULL)) != -1) {
-               switch (c) {
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-               case 'M':
-                       fprintf(stderr, "warning: '-M' deprecated"
-                               ", use '--mdt-index' or '-m' instead\n");
-#endif
-               case 'm':
-                       param.fp_mdt_index = strtoul(optarg, &end, 0);
-                       if (*end != '\0') {
-                               fprintf(stderr, "%s: invalid MDT index'%s'\n",
-                                       argv[0], optarg);
-                               return CMD_HELP;
-                       }
-                       break;
-               case 'v':
-                       param.fp_verbose = VERBOSE_DETAIL;
-                       break;
-               default:
-                       fprintf(stderr, "error: %s: unrecognized option '%s'\n",
-                               argv[0], argv[optind - 1]);
-                       return CMD_HELP;
-               }
-       }
-
-       if (param.fp_mdt_index == -1) {
-               fprintf(stderr, "%s: MDT index must be specified\n", argv[0]);
-               return CMD_HELP;
-       }
-
-       if (optind >= argc) {
-               fprintf(stderr, "%s: missing operand path\n", argv[0]);
-               return CMD_HELP;
-       }
-
-       param.fp_migrate = 1;
-       rc = llapi_migrate_mdt(argv[optind], &param);
-       if (rc != 0)
-               fprintf(stderr, "%s: cannot migrate '%s' to MDT%04x: %s\n",
-                       argv[0], argv[optind], param.fp_mdt_index,
-                       strerror(-rc));
-       return rc;
-}
-
-static int lfs_osts(int argc, char **argv)
-{
-        return lfs_tgts(argc, argv);
-}
-
-static int lfs_mdts(int argc, char **argv)
-{
-        return lfs_tgts(argc, argv);
-}
-
-#define COOK(value)                                                     \
-({                                                                      \
-        int radix = 0;                                                  \
-        while (value > 1024) {                                          \
-                value /= 1024;                                          \
-                radix++;                                                \
-        }                                                               \
-        radix;                                                          \
-})
-#define UUF     "%-20s"
-#define CSF     "%11s"
-#define CDF     "%11llu"
-#define HDF     "%8.1f%c"
-#define RSF     "%4s"
-#define RDF     "%3d%%"
-
-enum mntdf_flags {
-       MNTDF_INODES    = 0x0001,
-       MNTDF_COOKED    = 0x0002,
-       MNTDF_LAZY      = 0x0004,
-       MNTDF_VERBOSE   = 0x0008,
-};
-
-static int showdf(char *mntdir, struct obd_statfs *stat,
-                 char *uuid, enum mntdf_flags flags,
-                 char *type, int index, int rc)
-{
-       long long avail, used, total;
-       double ratio = 0;
-       char *suffix = "KMGTPEZY";
-       /* Note if we have >2^64 bytes/fs these buffers will need to be grown */
-       char tbuf[3 * sizeof(__u64)];
-       char ubuf[3 * sizeof(__u64)];
-       char abuf[3 * sizeof(__u64)];
-       char rbuf[3 * sizeof(__u64)];
+static int showdf(char *mntdir, struct obd_statfs *stat,
+                 char *uuid, enum mntdf_flags flags,
+                 char *type, int index, int rc)
+{
+       long long avail, used, total;
+       int ratio = 0;
+       char *suffix = "KMGTPEZY";
+       /* Note if we have >2^64 bytes/fs these buffers will need to be grown */
+       char tbuf[3 * sizeof(__u64)];
+       char ubuf[3 * sizeof(__u64)];
+       char abuf[3 * sizeof(__u64)];
+       char rbuf[3 * sizeof(__u64)];
 
        if (!uuid || !stat)
                return -EINVAL;
@@ -4425,8 +4417,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        total = (stat->os_blocks * stat->os_bsize) >> shift;
                }
 
-               if ((used + avail) > 0)
-                       ratio = (double)used / (double)(used + avail);
+               ratio = obd_statfs_ratio(stat);
 
                if (flags & MNTDF_COOKED) {
                        int i;
@@ -4461,7 +4452,7 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
                        snprintf(abuf, sizeof(tbuf), CDF, avail);
                }
 
-               sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
+               sprintf(rbuf, RDF, ratio);
                printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
                       uuid, tbuf, ubuf, abuf, rbuf, mntdir);
                if (type)
@@ -4500,11 +4491,24 @@ static int showdf(char *mntdir, struct obd_statfs *stat,
 }
 
 struct ll_stat_type {
-        int   st_op;
-        char *st_name;
+       int   st_op;
+       char *st_name;
 };
 
-static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
+#define LL_STATFS_MAX  LOV_MAX_STRIPE_COUNT
+
+struct ll_statfs_data {
+       int                     sd_index;
+       struct obd_statfs       sd_st;
+};
+
+struct ll_statfs_buf {
+       int                     sb_count;
+       struct ll_statfs_data   sb_buf[LL_STATFS_MAX];
+};
+
+static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags,
+                int ops, struct ll_statfs_buf *lsb)
 {
        struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
        struct obd_uuid uuid_buf;
@@ -4541,16 +4545,22 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                return rc;
        }
 
-       if (flags & MNTDF_INODES)
-               printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
-                      "UUID", "Inodes", "IUsed", "IFree",
-                      "IUse%", "Mounted on");
-       else
-               printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
-                      "UUID", flags & MNTDF_COOKED ? "bytes" : "1K-blocks",
-                      "Used", "Available", "Use%", "Mounted on");
+       if (flags & MNTDF_SHOW) {
+               if (flags & MNTDF_INODES)
+                       printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
+                              "UUID", "Inodes", "IUsed", "IFree",
+                              "IUse%", "Mounted on");
+               else
+                       printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s\n",
+                              "UUID",
+                              flags & MNTDF_COOKED ? "bytes" : "1K-blocks",
+                              "Used", "Available", "Use%", "Mounted on");
+       }
 
        for (tp = types; tp->st_name != NULL; tp++) {
+               if (!(tp->st_op & ops))
+                       continue;
+
                for (index = 0; ; index++) {
                        memset(&stat_buf, 0, sizeof(struct obd_statfs));
                        memset(&uuid_buf, 0, sizeof(struct obd_uuid));
@@ -4582,8 +4592,15 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                        if (uuid_buf.uuid[0] == '\0')
                                snprintf(uuid_buf.uuid, sizeof(uuid_buf.uuid),
                                         "%s%04x", tp->st_name, index);
-                       showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
-                              flags, tp->st_name, index, rc2);
+                       if (!rc && lsb) {
+                               lsb->sb_buf[lsb->sb_count].sd_index = index;
+                               lsb->sb_buf[lsb->sb_count].sd_st = stat_buf;
+                               lsb->sb_count++;
+                       }
+                       if (flags & MNTDF_SHOW)
+                               showdf(mntdir, &stat_buf,
+                                      obd_uuid2str(&uuid_buf), flags,
+                                      tp->st_name, index, rc2);
 
                        if (rc2 == 0) {
                                if (tp->st_op == LL_STATFS_LMV) {
@@ -4602,27 +4619,453 @@ static int mntdf(char *mntdir, char *fsname, char *pool, enum mntdf_flags flags)
                }
        }
 
-       close(fd);
+       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) {
+               sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
+               sum.os_ffree = ost_ffree;
+       }
+       if (flags & MNTDF_SHOW) {
+               printf("\n");
+               showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0);
+               printf("\n");
+       }
+
+       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);
+       int r2 = obd_statfs_ratio(st2);
+       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;
+
+       struct option long_opts[] = {
+       { .val = 'c',   .name = "count",        .has_arg = required_argument },
+       { .val = 'c',   .name = "mdt-count",    .has_arg = required_argument },
+       { .val = 'd',   .name = "delete",       .has_arg = no_argument },
+       { .val = 'D',   .name = "default",      .has_arg = no_argument },
+       { .val = 'D',   .name = "default_stripe", .has_arg = no_argument },
+       { .val = 'H',   .name = "mdt-hash",     .has_arg = required_argument },
+       { .val = 'i',   .name = "mdt-index",    .has_arg = required_argument },
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+       { .val = 'i',   .name = "index",        .has_arg = required_argument },
+#endif
+       { .val = 'o',   .name = "mode",         .has_arg = required_argument },
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+       { .val = 't',   .name = "hash-type",    .has_arg = required_argument },
+#endif
+       { .val = 'T',   .name = "mdt-count",    .has_arg = required_argument },
+/* setstripe { .val = 'y', .name = "yaml",     .has_arg = no_argument }, */
+       { .name = NULL } };
+
+       setstripe_args_init(&lsa);
+
+       while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:", long_opts,
+                               NULL)) >= 0) {
+               switch (c) {
+               case 0:
+                       /* Long options. */
+                       break;
+               case 'c':
+               case 'T':
+                       lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
+                       if (*end != '\0') {
+                               fprintf(stderr,
+                                       "%s %s: invalid stripe count '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'd':
+                       delete = true;
+                       default_stripe = true;
+                       break;
+               case 'D':
+                       default_stripe = true;
+                       break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+               case 't':
+                       fprintf(stderr, "warning: '--hash-type' and '-t' "
+                             "deprecated, use '--mdt-hash' or '-H' instead\n");
+#endif
+               case 'H':
+                       lsa.lsa_pattern = check_hashtype(optarg);
+                       if (lsa.lsa_pattern == 0) {
+                               fprintf(stderr,
+                                       "%s %s: bad stripe hash type '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'i':
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+                       if (strcmp(argv[optind - 1], "--index") == 0)
+                               fprintf(stderr,
+                                       "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
+                                       progname, argv[0]);
+#endif
+                       lsa.lsa_nr_tgts = parse_targets(mdts,
+                                               sizeof(mdts) / sizeof(__u32),
+                                               lsa.lsa_nr_tgts, optarg);
+                       if (lsa.lsa_nr_tgts < 0) {
+                               fprintf(stderr,
+                                       "%s %s: invalid MDT target(s) '%s'\n",
+                                       progname, argv[0], optarg);
+                               return CMD_HELP;
+                       }
+
+                       lsa.lsa_tgts = mdts;
+                       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+                               lsa.lsa_stripe_off = mdts[0];
+                       break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+               case 'm':
+                       fprintf(stderr, "warning: '-m' is deprecated, "
+                               "use '--mode' or '-o' instead\n");
+#endif
+               case 'o':
+                       mode_opt = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "%s %s: unrecognized option '%s'\n",
+                               progname, argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind == argc) {
+               fprintf(stderr, "%s %s: DIR must be specified\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
+       if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
+           lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT) {
+               fprintf(stderr,
+                       "%s %s: stripe offset and count must be specified\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
+       if (delete &&
+           (lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT ||
+            lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)) {
+               fprintf(stderr,
+                       "%s %s: cannot specify -d with -c or -i options\n",
+                       progname, argv[0]);
+               return CMD_HELP;
+       }
+
+       if (mode_opt != NULL) {
+               mode = strtoul(mode_opt, &end, 8);
+               if (*end != '\0') {
+                       fprintf(stderr,
+                               "%s %s: bad MODE '%s'\n",
+                               progname, argv[0], mode_opt);
+                       return CMD_HELP;
+               }
+               previous_mode = umask(0);
+       }
+
+       /*
+        * initialize stripe parameters, in case param is converted to specific,
+        * i.e, 'lfs mkdir -i -1 -c N', always allocate space for lsp_tgts.
+        */
+       param = calloc(1, offsetof(typeof(*param),
+                      lsp_tgts[lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT ?
+                               lsa.lsa_stripe_count : lsa.lsa_nr_tgts]));
+       if (param == NULL) {
+               fprintf(stderr,
+                       "%s %s: cannot allocate memory for parameters: %s\n",
+                       progname, argv[0], strerror(ENOMEM));
+               return CMD_HELP;
+       }
+
+       if (lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT)
+               param->lsp_stripe_count = lsa.lsa_stripe_count;
+       if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)
+               param->lsp_stripe_offset = -1;
+       else
+               param->lsp_stripe_offset = lsa.lsa_stripe_off;
+       if (lsa.lsa_pattern != LLAPI_LAYOUT_RAID0)
+               param->lsp_stripe_pattern = lsa.lsa_pattern;
+       else
+               param->lsp_stripe_pattern = LMV_HASH_TYPE_FNV_1A_64;
+       param->lsp_pool = lsa.lsa_pool_name;
+       param->lsp_is_specific = false;
+       if (lsa.lsa_nr_tgts > 1) {
+               if (lsa.lsa_stripe_count > 0 &&
+                   lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
+                   lsa.lsa_stripe_count != lsa.lsa_nr_tgts) {
+                       fprintf(stderr, "error: %s: stripe count %lld doesn't "
+                               "match the number of MDTs: %d\n",
+                               argv[0], lsa.lsa_stripe_count, lsa.lsa_nr_tgts);
+                       free(param);
+                       return CMD_HELP;
+               }
+
+               param->lsp_is_specific = true;
+               param->lsp_stripe_count = lsa.lsa_nr_tgts;
+               memcpy(param->lsp_tgts, mdts, sizeof(*mdts) * lsa.lsa_nr_tgts);
+       }
+
+       dname = argv[optind];
+       do {
+               if (default_stripe) {
+                       result = llapi_dir_set_default_lmv(dname, param);
+               } else {
+                       /* 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)
+                                      > 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 create stripe dir '%s': %s\n",
+                               progname, dname, strerror(-result));
+                       break;
+               }
+               dname = argv[++optind];
+       } while (dname != NULL);
+
+       if (mode_opt != NULL)
+               umask(previous_mode);
+
+       free(lsb);
+       free(param);
+       return result;
+}
+
+/* functions */
+static int lfs_rmentry(int argc, char **argv)
+{
+       char *dname;
+       int   index;
+       int   result = 0;
+
+       if (argc <= 1) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       index = 1;
+       dname = argv[index];
+       while (dname != NULL) {
+               result = llapi_direntry_remove(dname);
+               if (result) {
+                       fprintf(stderr, "error: %s: remove dir entry '%s' "
+                               "failed\n", argv[0], dname);
+                       break;
+               }
+               dname = argv[++index];
+       }
+       return result;
+}
+
+static int lfs_mv(int argc, char **argv)
+{
+       struct  find_param param = {
+               .fp_max_depth = -1,
+               .fp_mdt_index = -1,
+       };
+       char   *end;
+       int     c;
+       int     rc = 0;
+       struct option long_opts[] = {
+       { .val = 'm',   .name = "mdt-index",    .has_arg = required_argument },
+       { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
+       { .name = NULL } };
+
+       while ((c = getopt_long(argc, argv, "m:M:v", long_opts, NULL)) != -1) {
+               switch (c) {
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+               case 'M':
+                       fprintf(stderr, "warning: '-M' deprecated"
+                               ", use '--mdt-index' or '-m' instead\n");
+#endif
+               case 'm':
+                       param.fp_mdt_index = strtoul(optarg, &end, 0);
+                       if (*end != '\0') {
+                               fprintf(stderr, "%s mv: bad MDT index '%s'\n",
+                                       progname, optarg);
+                               return CMD_HELP;
+                       }
+                       break;
+               case 'v':
+                       param.fp_verbose = VERBOSE_DETAIL;
+                       break;
+               default:
+                       fprintf(stderr, "%s mv: unrecognized option '%s'\n",
+                               progname, argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (param.fp_mdt_index == -1) {
+               fprintf(stderr, "%s mv: MDT index must be specified\n",
+                       progname);
+               return CMD_HELP;
+       }
 
-       /* 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) {
-               sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
-               sum.os_ffree = ost_ffree;
+       if (optind >= argc) {
+               fprintf(stderr, "%s mv: DIR must be specified\n", progname);
+               return CMD_HELP;
        }
-       printf("\n");
-       showdf(mntdir, &sum, "filesystem_summary:", flags, NULL, 0, 0);
-       printf("\n");
 
+       param.fp_migrate = 1;
+       rc = llapi_migrate_mdt(argv[optind], &param);
+       if (rc != 0)
+               fprintf(stderr, "%s mv: cannot migrate '%s' to MDT%04x: %s\n",
+                       progname, argv[optind], param.fp_mdt_index,
+                       strerror(-rc));
        return rc;
 }
 
+static int lfs_osts(int argc, char **argv)
+{
+        return lfs_tgts(argc, argv);
+}
+
+static int lfs_mdts(int argc, char **argv)
+{
+        return lfs_tgts(argc, argv);
+}
+
 static int lfs_df(int argc, char **argv)
 {
        char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
-       enum mntdf_flags flags = 0;
+       enum mntdf_flags flags = MNTDF_SHOW;
+       int ops = LL_STATFS_LMV | LL_STATFS_LOV;
        int c, rc = 0, index = 0;
        char fsname[PATH_MAX] = "", *pool_name = NULL;
        struct option long_opts[] = {
@@ -4667,7 +5110,7 @@ static int lfs_df(int argc, char **argv)
                if (mntdir[0] == '\0')
                        continue;
 
-               rc = mntdf(mntdir, fsname, pool_name, flags);
+               rc = mntdf(mntdir, fsname, pool_name, flags, ops, NULL);
                if (rc || path[0] != '\0')
                        break;
                fsname[0] = '\0'; /* avoid matching in next loop */
@@ -4934,6 +5377,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) {
@@ -4954,25 +5403,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))
@@ -4984,37 +5438,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);
@@ -5077,13 +5559,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",
@@ -5093,42 +5591,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,
@@ -5197,15 +5703,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)
@@ -5232,20 +5745,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) {
@@ -5275,6 +5789,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);
@@ -5295,15 +5812,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) ?
@@ -5315,7 +5840,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 : "-");
@@ -5366,7 +5893,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;
        }
@@ -5376,12 +5903,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);
@@ -5403,8 +5933,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);
@@ -5416,10 +5969,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,
@@ -5433,6 +5986,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. "
@@ -5607,16 +6168,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:
@@ -5633,7 +6201,7 @@ quota_type:
                         break;
                 case 'o':
                         valid = qctl.qc_valid = QC_UUID;
-                       strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid));
+                       snprintf(obd_uuid, sizeof(qctl.obd_uuid), "%s", optarg);
                         break;
                case 'i':
                        valid = qctl.qc_valid = QC_MDTIDX;
@@ -5673,7 +6241,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;
@@ -5692,35 +6260,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') {
@@ -5729,15 +6307,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! */
@@ -5842,16 +6420,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)
@@ -5866,8 +6446,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;
        }
 
@@ -5877,8 +6457,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;
        }
 
@@ -5943,10 +6524,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';
@@ -5984,14 +6565,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)
@@ -6036,36 +6618,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;
@@ -6080,8 +6681,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;
@@ -6130,14 +6732,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 = ": ";
 
@@ -6172,8 +6778,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;
@@ -6194,8 +6801,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) {
@@ -6209,20 +6819,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);
 
@@ -7245,16 +7867,6 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                goto error;
        }
 
-       ioc->lil_mode = LL_LEASE_WRLCK;
-       ioc->lil_flags = LL_LEASE_RESYNC;
-       rc = llapi_lease_set(fd, ioc);
-       if (rc < 0) {
-               fprintf(stderr,
-                       "%s: '%s' llapi_lease_set resync failed: %s.\n",
-                       progname, fname, strerror(errno));
-               goto close_fd;
-       }
-
        layout = llapi_layout_get_by_fd(fd, 0);
        if (layout == NULL) {
                fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n",
@@ -7268,28 +7880,37 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                fprintf(stderr, "%s: '%s' llapi_layout_flags_get failed: %s.\n",
                        progname, fname, strerror(errno));
                rc = -errno;
-               goto close_fd;
+               goto free_layout;
        }
 
        flr_state &= LCM_FL_FLR_MASK;
-       switch (flr_state) {
-       case LCM_FL_NONE:
+       if (flr_state == LCM_FL_NONE) {
                rc = -EINVAL;
-       case LCM_FL_RDONLY:
-               fprintf(stderr, "%s: '%s' file state error: %s\n", progname,
-                       fname, llapi_layout_flags_string(flr_state));
-               goto close_fd;
-       default:
-               break;
+               fprintf(stderr, "%s: '%s' is not a FLR file.\n",
+                       progname, fname);
+               goto free_layout;
        }
 
        /* get stale component info */
        comp_size = llapi_mirror_find_stale(layout, comp_array,
                                            ARRAY_SIZE(comp_array),
                                            mirror_ids, ids_nr);
-       if (comp_size < 0) {
+       if (comp_size <= 0) {
                rc = comp_size;
-               goto close_fd;
+               goto free_layout;
+       }
+
+       ioc->lil_mode = LL_LEASE_WRLCK;
+       ioc->lil_flags = LL_LEASE_RESYNC;
+       rc = llapi_lease_set(fd, ioc);
+       if (rc < 0) {
+               if (rc == -EALREADY)
+                       rc = 0;
+               else
+                       fprintf(stderr,
+                           "%s: '%s' llapi_lease_get_ext resync failed: %s.\n",
+                               progname, fname, strerror(errno));
+               goto free_layout;
        }
 
        idx = 0;
@@ -7303,7 +7924,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                if (rc != LL_LEASE_WRLCK) {
                        fprintf(stderr, "%s: '%s' lost lease lock.\n",
                                progname, fname);
-                       goto close_fd;
+                       goto free_layout;
                }
 
                mirror_id = comp_array[idx].lrc_mirror_id;
@@ -7324,7 +7945,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                        fprintf(stderr, "%s: '%s' llapi_mirror_resync_one: "
                                "%ld.\n", progname, fname, result);
                        rc = result;
-                       goto close_fd;
+                       goto unlock;
                } else if (result > 0) {
                        int j;
 
@@ -7336,6 +7957,7 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                idx = i;
        }
 
+unlock:
        /* prepare ioc for lease put */
        ioc->lil_mode = LL_LEASE_UNLCK;
        ioc->lil_flags = LL_LEASE_RESYNC_DONE;
@@ -7347,15 +7969,13 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
                }
        }
 
-       llapi_layout_free(layout);
-
        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 close_fd;
+               goto free_layout;
        }
        /**
         * llapi_lease_set returns lease mode when it request to unlock
@@ -7363,6 +7983,8 @@ int lfs_mirror_resync_file(const char *fname, struct ll_ioc_lease *ioc,
         */
        rc = 0;
 
+free_layout:
+       llapi_layout_free(layout);
 close_fd:
        close(fd);
 error: