Whamcloud - gitweb
LU-4293 utils: handle lfs migrate failure in lfs_migrate
[fs/lustre-release.git] / lustre / utils / lfs.c
index 95b3a71..614fbc3 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,6 +51,7 @@
 #include <string.h>
 #include <mntent.h>
 #include <errno.h>
+#include <err.h>
 #include <pwd.h>
 #include <grp.h>
 #include <sys/types.h>
@@ -147,10 +148,11 @@ command_t cmdlist[] = {
         "To list the striping info for a given file or files in a\n"
         "directory or recursively for all files in a directory tree.\n"
         "usage: getstripe [--ost|-O <uuid>] [--quiet | -q] [--verbose | -v]\n"
-        "                 [--stripe-count|-c] [--stripe-index|-i]\n"
-        "                 [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
-        "                 [--mdt-index|-M] [--recursive|-r] [--raw|-R]\n"
-        "                 <directory|filename> ..."},
+        "                 [--stripe-count|-c] [--stripe-index|-i]\n"
+        "                 [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
+        "                 [--mdt-index|-M] [--recursive|-r] [--raw|-R]\n"
+        "                 [--layout|-L]\n"
+        "                 <directory|filename> ..."},
        {"setdirstripe", lfs_setdirstripe, 0,
         "To create a remote directory on a specified MDT.\n"
         "usage: setdirstripe <--index|-i mdt_index> <dir>\n"
@@ -188,6 +190,7 @@ command_t cmdlist[] = {
          "     [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
          "     [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
          "     [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
+        "     [[!] --layout|-L released,raid0]\n"
          "\t !: used before an option indicates 'NOT' requested attribute\n"
          "\t -: used before a value indicates 'AT MOST' requested value\n"
          "\t +: used before a value indicates 'AT LEAST' requested value\n"},
@@ -235,9 +238,17 @@ command_t cmdlist[] = {
          "       -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"},
+        "       -I can be used instead of --inode-hardlimit\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"
+        "      Quota space rebalancing process will stop when this mininum\n"
+        "      value is reached. As a result, quota exceeded can be returned\n"
+        "      while many targets still have 1MB or 1K inodes of spare\n"
+        "      quota space."},
         {"quota", lfs_quota, 0, "Display disk usage and limits.\n"
-         "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
+        "usage: quota [-q] [-v] [-h] [-o <obd_uuid>|-i <mdt_idx>|-I "
+                      "<ost_idx>]\n"
          "             [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
          "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
 #endif
@@ -269,16 +280,16 @@ command_t cmdlist[] = {
          "interest to consumer <id>, allowing the system to free up space.\n"
          "An <endrec> of 0 means all records.\n"
          "usage: changelog_clear <mdtname> <id> <endrec>"},
-        {"fid2path", lfs_fid2path, 0,
-         "Resolve the full path to a given FID. For a specific hardlink "
-         "specify link number <linkno>.\n"
-         /* "For a historical name, specify changelog record <recno>.\n" */
-         "usage: fid2path <fsname|rootpath> <fid> [--link <linkno>]"
-                /*[--rec <recno>]*/},
-        {"path2fid", lfs_path2fid, 0, "Display the fid for a given path.\n"
-         "usage: path2fid <path>"},
-        {"data_version", lfs_data_version, 0, "Display file data version for "
-         "a given path.\n" "usage: data_version [-n] <path>"},
+       {"fid2path", lfs_fid2path, 0,
+        "Resolve the full path(s) for given FID(s). For a specific hardlink "
+        "specify link number <linkno>.\n"
+       /* "For a historical link name, specify changelog record <recno>.\n" */
+        "usage: fid2path [--link <linkno>] <fsname|rootpath> <fid> ..."
+               /* [ --rec <recno> ] */ },
+       {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n"
+        "usage: path2fid <path> ..."},
+       {"data_version", lfs_data_version, 0, "Display file data version for "
+        "a given path.\n" "usage: data_version -[n|r|w] <path>"},
        {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, "
         "undergoing actions) for given files.\n usage: hsm_state <file> ..."},
        {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n"
@@ -355,7 +366,7 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
        int                      have_gl = 0;
 
        /* find the right size for the IO and allocate the buffer */
-       lumsz = lov_mds_md_size(LOV_MAX_STRIPE_COUNT, LOV_MAGIC_V3);
+       lumsz = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
        lum = malloc(lumsz);
        if (lum == NULL) {
                rc = -ENOMEM;
@@ -398,7 +409,11 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
        }
 
        /* search for file directory pathname */
-       strcpy(parent, name);
+       if (strlen(name) > sizeof(parent)-1) {
+               rc = -E2BIG;
+               goto free;
+       }
+       strncpy(parent, name, sizeof(parent));
        ptr = strrchr(parent, '/');
        if (ptr == NULL) {
                if (getcwd(parent, sizeof(parent)) == NULL) {
@@ -438,7 +453,7 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
        }
 
        /* get file data version */
-       rc = llapi_get_data_version(fd, &dv1, 0);
+       rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH);
        if (rc != 0) {
                fprintf(stderr, "cannot get dataversion on %s (%s)\n",
                        name, strerror(-rc));
@@ -518,14 +533,12 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
                                 SWAP_LAYOUTS_KEEP_MTIME |
                                 SWAP_LAYOUTS_KEEP_ATIME);
        if (rc == -EAGAIN) {
-               fprintf(stderr, "file dataversion for %s has changed"
-                               " during copy, migration is aborted\n",
-                       name);
+               fprintf(stderr, "%s: dataversion changed during copy, "
+                       "migration aborted\n", name);
                goto error;
        }
        if (rc != 0)
-               fprintf(stderr, "cannot swap layouts between %s and "
-                       "a volatile file (%s)\n",
+               fprintf(stderr, "%s: swap layout to new file failed: %s\n",
                        name, strerror(-rc));
 
 error:
@@ -714,15 +727,16 @@ static int lfs_setstripe(int argc, char **argv)
                 return CMD_HELP;
         }
 
-        /* get the stripe size */
-        if (stripe_size_arg != NULL) {
-                result = parse_size(stripe_size_arg, &st_size, &size_units, 0);
-                if (result) {
-                        fprintf(stderr, "error: %s: bad stripe size '%s'\n",
-                                argv[0], stripe_size_arg);
-                        return result;
-                }
-        }
+       /* get the stripe size */
+       if (stripe_size_arg != NULL) {
+               result = llapi_parse_size(stripe_size_arg, &st_size,
+                                         &size_units, 0);
+               if (result) {
+                       fprintf(stderr, "error: %s: bad stripe size '%s'\n",
+                               argv[0], stripe_size_arg);
+                       return result;
+               }
+       }
         /* get the stripe offset */
         if (stripe_off_arg != NULL) {
                 st_offset = strtol(stripe_off_arg, &end, 0);
@@ -854,6 +868,25 @@ static int id2name(char **name, unsigned int id, int type)
         return 0;
 }
 
+static int name2layout(__u32 *layout, char *name)
+{
+       char *ptr, *lyt;
+
+       *layout = 0;
+       for (ptr = name; ; ptr = NULL) {
+               lyt = strtok(ptr, ",");
+               if (lyt == NULL)
+                       break;
+               if (strcmp(lyt, "released") == 0)
+                       *layout |= LOV_PATTERN_F_RELEASED;
+               else if (strcmp(lyt, "raid0") == 0)
+                       *layout |= LOV_PATTERN_RAID0;
+               else
+                       return -1;
+       }
+       return 0;
+}
+
 #define FIND_POOL_OPT 3
 static int lfs_find(int argc, char **argv)
 {
@@ -870,6 +903,7 @@ static int lfs_find(int argc, char **argv)
                 {"group",        required_argument, 0, 'G'},
                 {"stripe-index", required_argument, 0, 'i'},
                 {"stripe_index", required_argument, 0, 'i'},
+               {"layout",       required_argument, 0, 'L'},
                 {"mdt",          required_argument, 0, 'm'},
                 {"mtime",        required_argument, 0, 'M'},
                 {"name",         required_argument, 0, 'n'},
@@ -898,11 +932,11 @@ static int lfs_find(int argc, char **argv)
 
         time(&t);
 
-        optind = 0;
-        /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
-        while ((c = getopt_long_only(argc, argv,
-                                     "-A:c:C:D:g:G:i:m:M:n:O:Ppqrs:S:t:u:U:v",
-                                     long_opts, NULL)) >= 0) {
+       optind = 0;
+       /* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
+       while ((c = getopt_long_only(argc, argv,
+                                    "-A:c:C:D:g:G:i:L:m:M:n:O:Ppqrs:S:t:u:U:v",
+                                    long_opts, NULL)) >= 0) {
                 xtime = NULL;
                 xsign = NULL;
                 if (neg_opt)
@@ -1000,6 +1034,13 @@ static int lfs_find(int argc, char **argv)
                         param.exclude_gid = !!neg_opt;
                         param.check_gid = 1;
                         break;
+               case 'L':
+                       ret = name2layout(&param.layout, optarg);
+                       if (ret)
+                               goto err;
+                       param.exclude_layout = !!neg_opt;
+                       param.check_layout = 1;
+                       break;
                 case 'u':
                 case 'U':
                         ret = name2id(&param.uid, optarg, USER);
@@ -1078,20 +1119,24 @@ static int lfs_find(int argc, char **argv)
                                 param.obduuid = tmp;
                         }
                         for (token = buf; token && *token; token = next) {
-                                char *uuid;
-                                if (c == 'm')
-                                        uuid =
-                                          param.mdtuuid[param.num_mdts++].uuid;
-                                else
-                                        uuid =
-                                          param.obduuid[param.num_obds++].uuid;
+                               struct obd_uuid *puuid;
+                               if (c == 'm') {
+                                       puuid =
+                                         &param.mdtuuid[param.num_mdts++];
+                               } else {
+                                       puuid =
+                                         &param.obduuid[param.num_obds++];
+                               }
                                 p = strchr(token, ',');
                                 next = 0;
                                 if (p) {
                                         *p = 0;
                                         next = p+1;
                                 }
-                                strcpy((char *)uuid, token);
+                               if (strlen(token) > sizeof(puuid->uuid)-1)
+                                       GOTO(err_free, ret = -E2BIG);
+                               strncpy(puuid->uuid, token,
+                                       sizeof(puuid->uuid));
                         }
 err_free:
                         if (buf)
@@ -1103,44 +1148,44 @@ err_free:
                         break;
                 case 'P':
                         break;
-                case 's':
-                        if (optarg[0] == '+') {
-                                param.size_sign = -1;
-                                optarg++;
-                        } else if (optarg[0] == '-') {
-                                param.size_sign =  1;
-                                optarg++;
-                        }
+               case 's':
+                       if (optarg[0] == '+') {
+                               param.size_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.size_sign =  1;
+                               optarg++;
+                       }
 
-                        ret = parse_size(optarg, &param.size,
-                                         &param.size_units, 0);
-                        if (ret) {
-                                fprintf(stderr, "error: bad file size '%s'\n",
-                                        optarg);
-                                goto err;
-                        }
-                        param.check_size = 1;
-                        param.exclude_size = !!neg_opt;
-                        break;
-                case 'S':
-                        if (optarg[0] == '+') {
-                                param.stripesize_sign = -1;
-                                optarg++;
-                        } else if (optarg[0] == '-') {
-                                param.stripesize_sign =  1;
-                                optarg++;
-                        }
+                       ret = llapi_parse_size(optarg, &param.size,
+                                              &param.size_units, 0);
+                       if (ret) {
+                               fprintf(stderr, "error: bad file size '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.check_size = 1;
+                       param.exclude_size = !!neg_opt;
+                       break;
+               case 'S':
+                       if (optarg[0] == '+') {
+                               param.stripesize_sign = -1;
+                               optarg++;
+                       } else if (optarg[0] == '-') {
+                               param.stripesize_sign =  1;
+                               optarg++;
+                       }
 
-                        ret = parse_size(optarg, &param.stripesize,
-                                         &param.stripesize_units, 0);
-                        if (ret) {
-                                fprintf(stderr, "error: bad stripe_size '%s'\n",
-                                        optarg);
-                                goto err;
-                        }
-                        param.check_stripesize = 1;
-                        param.exclude_stripesize = !!neg_opt;
-                        break;
+                       ret = llapi_parse_size(optarg, &param.stripesize,
+                                              &param.stripesize_units, 0);
+                       if (ret) {
+                               fprintf(stderr, "error: bad stripe_size '%s'\n",
+                                       optarg);
+                               goto err;
+                       }
+                       param.check_stripesize = 1;
+                       param.exclude_stripesize = !!neg_opt;
+                       break;
                 case 't':
                         param.exclude_type = !!neg_opt;
                         switch(optarg[0]) {
@@ -1196,63 +1241,64 @@ err:
 static int lfs_getstripe_internal(int argc, char **argv,
                                  struct find_param *param)
 {
-        struct option long_opts[] = {
+       struct option long_opts[] = {
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --count option"
 #else
-                /* This formerly implied "stripe-count", but was explicitly
-                 * made "stripe-count" for consistency with other options,
-                 * and to separate it from "mdt-count" when DNE arrives. */
-                {"count",        no_argument,       0, 'c'},
+               /* This formerly implied "stripe-count", but was explicitly
+                * made "stripe-count" for consistency with other options,
+                * and to separate it from "mdt-count" when DNE arrives. */
+               {"count",               no_argument,            0, 'c'},
 #endif
-                {"stripe-count", no_argument,       0, 'c'},
-                {"stripe_count", no_argument,       0, 'c'},
-                {"directory",    no_argument,       0, 'd'},
-                {"generation",   no_argument,       0, 'g'},
+               {"stripe-count",        no_argument,            0, 'c'},
+               {"stripe_count",        no_argument,            0, 'c'},
+               {"directory",           no_argument,            0, 'd'},
+               {"generation",          no_argument,            0, 'g'},
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --index option"
 #else
-                /* This formerly implied "stripe-index", but was explicitly
-                 * made "stripe-index" for consistency with other options,
-                 * and to separate it from "mdt-index" when DNE arrives. */
-                {"index",        no_argument,       0, 'i'},
+               /* This formerly implied "stripe-index", but was explicitly
+                * made "stripe-index" for consistency with other options,
+                * and to separate it from "mdt-index" when DNE arrives. */
+               {"index",               no_argument,            0, 'i'},
 #endif
-                {"stripe-index", no_argument,       0, 'i'},
-                {"stripe_index", no_argument,       0, 'i'},
-                {"mdt-index",    no_argument,       0, 'M'},
-                {"mdt_index",    no_argument,       0, 'M'},
+               {"stripe-index",        no_argument,            0, 'i'},
+               {"stripe_index",        no_argument,            0, 'i'},
+               {"layout",              no_argument,            0, 'L'},
+               {"mdt-index",           no_argument,            0, 'M'},
+               {"mdt_index",           no_argument,            0, 'M'},
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --offset option"
 #else
-                /* This formerly implied "stripe-index", but was confusing
-                 * with "file offset" (which will eventually be needed for
-                 * with different layouts by offset), so deprecate it. */
-                {"offset",       no_argument,       0, 'o'},
+               /* This formerly implied "stripe-index", but was confusing
+                * with "file offset" (which will eventually be needed for
+                * with different layouts by offset), so deprecate it. */
+               {"offset",              no_argument,            0, 'o'},
 #endif
-                {"obd",          required_argument, 0, 'O'},
-                {"ost",          required_argument, 0, 'O'},
-                {"pool",         no_argument,       0, 'p'},
-                {"quiet",        no_argument,       0, 'q'},
-                {"recursive",    no_argument,       0, 'r'},
-                {"raw",          no_argument,       0, 'R'},
+               {"obd",                 required_argument,      0, 'O'},
+               {"ost",                 required_argument,      0, 'O'},
+               {"pool",                no_argument,            0, 'p'},
+               {"quiet",               no_argument,            0, 'q'},
+               {"recursive",           no_argument,            0, 'r'},
+               {"raw",                 no_argument,            0, 'R'},
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --size option"
 #else
-                /* This formerly implied "--stripe-size", but was confusing
-                 * with "lfs find --size|-s", which means "file size", so use
-                 * the consistent "--stripe-size|-S" for all commands. */
-                {"size",         no_argument,       0, 's'},
+               /* This formerly implied "--stripe-size", but was confusing
+                * with "lfs find --size|-s", which means "file size", so use
+                * the consistent "--stripe-size|-S" for all commands. */
+               {"size",                no_argument,            0, 's'},
 #endif
-                {"stripe-size",  no_argument,       0, 'S'},
-                {"stripe_size",  no_argument,       0, 'S'},
-                {"verbose",      no_argument,       0, 'v'},
-                {0, 0, 0, 0}
-        };
-        int c, rc;
+               {"stripe-size",         no_argument,            0, 'S'},
+               {"stripe_size",         no_argument,            0, 'S'},
+               {"verbose",             no_argument,            0, 'v'},
+               {0, 0, 0, 0}
+       };
+       int c, rc;
 
        param->maxdepth = 1;
        optind = 0;
-       while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsSv",
+       while ((c = getopt_long(argc, argv, "cdghiLMoO:pqrRsSv",
                                long_opts, NULL)) != -1) {
                switch (c) {
                case 'O':
@@ -1337,6 +1383,12 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                param->maxdepth = 0;
                        }
                        break;
+               case 'L':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_LAYOUT;
+                               param->maxdepth = 0;
+                       }
+                       break;
                case 'M':
                        if (!(param->verbose & VERBOSE_DETAIL))
                                param->maxdepth = 0;
@@ -1730,24 +1782,25 @@ static int lfs_df(int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-        optind = 0;
+       optind = 0;
        while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) {
-                switch (c) {
-                case 'i':
-                        ishow = 1;
-                        break;
-                case 'h':
-                        cooked = 1;
-                        break;
-                case 'l':
-                        lazy = 1;
-                case 'p':
-                        pool_name = optarg;
-                        break;
-                default:
-                        return CMD_HELP;
-                }
-        }
+               switch (c) {
+               case 'i':
+                       ishow = 1;
+                       break;
+               case 'h':
+                       cooked = 1;
+                       break;
+               case 'l':
+                       lazy = 1;
+                       break;
+               case 'p':
+                       pool_name = optarg;
+                       break;
+               default:
+                       return CMD_HELP;
+               }
+       }
         if (optind < argc && !realpath(argv[optind], path)) {
                 rc = -errno;
                 fprintf(stderr, "error: invalid path '%s': %s\n",
@@ -2136,17 +2189,17 @@ error:
         return ULONG_MAX;
 }
 
-#define ARG2ULL(nr, str, def_units)                                     \
-do {                                                                    \
-        unsigned long long limit, units = def_units;                    \
-        int rc;                                                         \
-                                                                        \
-        rc = parse_size(str, &limit, &units, 1);                        \
-        if (rc < 0) {                                                   \
-                fprintf(stderr, "error: bad limit value %s\n", str);    \
-                return CMD_HELP;                                        \
-        }                                                               \
-        nr = limit;                                                     \
+#define ARG2ULL(nr, str, def_units)                                    \
+do {                                                                   \
+       unsigned long long limit, units = def_units;                    \
+       int rc;                                                         \
+                                                                       \
+       rc = llapi_parse_size(str, &limit, &units, 1);                  \
+       if (rc < 0) {                                                   \
+               fprintf(stderr, "error: bad limit value %s\n", str);    \
+               return CMD_HELP;                                        \
+       }                                                               \
+       nr = limit;                                                     \
 } while (0)
 
 static inline int has_times_option(int argc, char **argv)
@@ -2296,19 +2349,43 @@ int lfs_setquota(int argc, char **argv)
                         ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
                         dqb->dqb_bsoftlimit >>= 10;
                         limit_mask |= BSLIMIT;
+                       if (dqb->dqb_bsoftlimit &&
+                           dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */
+                               fprintf(stderr, "warning: block softlimit is "
+                                       "smaller than the miminal qunit size, "
+                                       "please see the help of setquota or "
+                                       "Lustre manual for details.\n");
                         break;
                 case 'B':
                         ARG2ULL(dqb->dqb_bhardlimit, optarg, 1024);
                         dqb->dqb_bhardlimit >>= 10;
                         limit_mask |= BHLIMIT;
+                       if (dqb->dqb_bhardlimit &&
+                           dqb->dqb_bhardlimit <= 1024) /* <= 1M? */
+                               fprintf(stderr, "warning: block hardlimit is "
+                                       "smaller than the miminal qunit size, "
+                                       "please see the help of setquota or "
+                                       "Lustre manual for details.\n");
                         break;
                 case 'i':
                         ARG2ULL(dqb->dqb_isoftlimit, optarg, 1);
                         limit_mask |= ISLIMIT;
+                       if (dqb->dqb_isoftlimit &&
+                           dqb->dqb_isoftlimit <= 1024) /* <= 1K inodes? */
+                               fprintf(stderr, "warning: inode softlimit is "
+                                       "smaller than the miminal qunit size, "
+                                       "please see the help of setquota or "
+                                       "Lustre manual for details.\n");
                         break;
                 case 'I':
                         ARG2ULL(dqb->dqb_ihardlimit, optarg, 1);
                         limit_mask |= IHLIMIT;
+                       if (dqb->dqb_ihardlimit &&
+                           dqb->dqb_ihardlimit <= 1024) /* <= 1K inodes? */
+                               fprintf(stderr, "warning: inode hardlimit is "
+                                       "smaller than the miminal qunit size, "
+                                       "please see the help of setquota or "
+                                       "Lustre manual for details.\n");
                         break;
                 default: /* getopt prints error message for us when opterr != 0 */
                         return CMD_HELP;
@@ -2448,26 +2525,47 @@ static void diff2str(time_t seconds, char *buf, time_t now)
         __sec2str(seconds - now, buf);
 }
 
-static void print_quota_title(char *name, struct if_quotactl *qctl)
+static void print_quota_title(char *name, struct if_quotactl *qctl,
+                             bool human_readable)
 {
-        printf("Disk quotas for %s %s (%cid %u):\n",
-               type2name(qctl->qc_type), name,
-               *type2name(qctl->qc_type), qctl->qc_id);
-        printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
-               "Filesystem",
-               "kbytes", "quota", "limit", "grace",
-               "files", "quota", "limit", "grace");
+       printf("Disk quotas for %s %s (%cid %u):\n",
+              type2name(qctl->qc_type), name,
+              *type2name(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 print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
+static void kbytes2str(__u64 num, char *buf, bool h)
+{
+       if (!h) {
+               sprintf(buf, LPU64, num);
+       } else {
+               if (num >> 30)
+                       sprintf(buf, LPU64"%s", num >> 30, "T");
+               else if (num >> 20)
+                       sprintf(buf, LPU64"%s", num >> 20, "G");
+               else if (num >> 10)
+                       sprintf(buf, LPU64"%s", num >> 10, "M");
+               else
+                       sprintf(buf, LPU64"%s", num, "K");
+       }
+}
+
+static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
+                       int rc, bool h)
 {
         time_t now;
 
         time(&now);
 
         if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) {
-                int bover = 0, iover = 0;
-                struct obd_dqblk *dqb = &qctl->qc_dqblk;
+               int bover = 0, iover = 0;
+               struct obd_dqblk *dqb = &qctl->qc_dqblk;
+               char numbuf[3][32];
+               char timebuf[40];
+               char strbuf[32];
 
                 if (dqb->dqb_bhardlimit &&
                     toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
@@ -2484,68 +2582,67 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
                     dqb->dqb_curinodes >= dqb->dqb_ihardlimit) {
                         iover = 1;
                 } else if (dqb->dqb_isoftlimit && dqb->dqb_itime) {
-                        if (dqb->dqb_btime > now) {
-                                iover = 2;
-                        } else {
-                                iover = 3;
-                        }
+                       if (dqb->dqb_itime > now) {
+                               iover = 2;
+                       } else {
+                               iover = 3;
+                       }
                 }
 
-#if 0           /* XXX: always print quotas even when no usages */
-                if (dqb->dqb_curspace || dqb->dqb_curinodes)
-#endif
-                {
-                        char numbuf[3][32];
-                        char timebuf[40];
 
-                        if (strlen(mnt) > 15)
-                                printf("%s\n%15s", mnt, "");
-                        else
-                                printf("%15s", mnt);
+               if (strlen(mnt) > 15)
+                       printf("%s\n%15s", mnt, "");
+               else
+                       printf("%15s", mnt);
+
+               if (bover)
+                       diff2str(dqb->dqb_btime, timebuf, now);
+
+               kbytes2str(toqb(dqb->dqb_curspace), strbuf, h);
+               if (rc == -EREMOTEIO)
+                       sprintf(numbuf[0], "%s*", strbuf);
+               else
+                       sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ?
+                               "%s" : "[%s]", strbuf);
+
+               kbytes2str(dqb->dqb_bsoftlimit, strbuf, h);
+               if (type == QC_GENERAL)
+                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ?
+                               "%s" : "[%s]", strbuf);
+               else
+                       sprintf(numbuf[1], "%s", "-");
+
+               kbytes2str(dqb->dqb_bhardlimit, strbuf, h);
+               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 (iover)
+                       diff2str(dqb->dqb_itime, timebuf, now);
+
+               sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
+                       LPU64 : "["LPU64"]", dqb->dqb_curinodes);
+
+               if (type == QC_GENERAL)
+                       sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ?
+                               LPU64 : "["LPU64"]", dqb->dqb_isoftlimit);
+               else
+                       sprintf(numbuf[1], "%s", "-");
+
+               sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
+                       LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
+
+               if (type != QC_OSTIDX)
+                       printf(" %7s%c %6s %7s %7s",
+                              numbuf[0], iover ? '*' : ' ', numbuf[1],
+                              numbuf[2], iover > 1 ? timebuf : "-");
+               else
+                       printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
+               printf("\n");
 
-                        if (bover)
-                                diff2str(dqb->dqb_btime, timebuf, now);
-                        if (rc == -EREMOTEIO)
-                                sprintf(numbuf[0], LPU64"*",
-                                        toqb(dqb->dqb_curspace));
-                        else
-                                sprintf(numbuf[0],
-                                        (dqb->dqb_valid & QIF_SPACE) ?
-                                        LPU64 : "["LPU64"]",
-                                        toqb(dqb->dqb_curspace));
-                        if (type == QC_GENERAL)
-                                sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS)
-                                        ? LPU64 : "["LPU64"]",
-                                        dqb->dqb_bsoftlimit);
-                        else
-                                sprintf(numbuf[1], "%s", "-");
-                        sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS)
-                                ? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit);
-                        printf(" %7s%c %6s %7s %7s",
-                               numbuf[0], bover ? '*' : ' ', numbuf[1],
-                               numbuf[2], bover > 1 ? timebuf : "-");
-
-                        if (iover)
-                                diff2str(dqb->dqb_itime, timebuf, now);
-
-                        sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
-                                LPU64 : "["LPU64"]", dqb->dqb_curinodes);
-                       if (type == QC_GENERAL)
-                                sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS)
-                                        ? LPU64 : "["LPU64"]",
-                                        dqb->dqb_isoftlimit);
-                        else
-                                sprintf(numbuf[1], "%s", "-");
-                        sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
-                                LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
-                        if (type != QC_OSTIDX)
-                                printf(" %7s%c %6s %7s %7s",
-                                       numbuf[0], iover ? '*' : ' ', numbuf[1],
-                                       numbuf[2], iover > 1 ? timebuf : "-");
-                        else
-                                printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
-                        printf("\n");
-                }
         } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
                    qctl->qc_cmd == Q_GETOINFO) {
                 char bgtimebuf[40];
@@ -2558,7 +2655,8 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
         }
 }
 
-static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt)
+static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
+                          bool h, __u64 *total)
 {
         int rc = 0, rc1 = 0, count = 0;
         __u32 valid = qctl->qc_valid;
@@ -2587,29 +2685,33 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt)
                         continue;
                 }
 
-                print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0);
-        }
-
+               print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
+                           qctl->qc_valid, 0, h);
+               *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
+                                  qctl->qc_dqblk.dqb_bhardlimit;
+       }
 out:
-        qctl->qc_valid = valid;
-        return rc ? : rc1;
+       qctl->qc_valid = valid;
+       return rc ? : rc1;
 }
 
 static int lfs_quota(int argc, char **argv)
 {
-        int c;
-        char *mnt, *name = NULL;
-        struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
-                                    .qc_type = UGQUOTA };
-        char *obd_type = (char *)qctl.obd_type;
-        char *obd_uuid = (char *)qctl.obd_uuid.uuid;
-        int rc, rc1 = 0, rc2 = 0, rc3 = 0,
-            verbose = 0, pass = 0, quiet = 0, inacc;
-        char *endptr;
-        __u32 valid = QC_GENERAL, idx = 0;
+       int c;
+       char *mnt, *name = NULL;
+       struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
+                                   .qc_type = UGQUOTA };
+       char *obd_type = (char *)qctl.obd_type;
+       char *obd_uuid = (char *)qctl.obd_uuid.uuid;
+       int rc, rc1 = 0, rc2 = 0, rc3 = 0,
+           verbose = 0, pass = 0, quiet = 0, inacc;
+       char *endptr;
+       __u32 valid = QC_GENERAL, idx = 0;
+       __u64 total_ialloc = 0, total_balloc = 0;
+       bool human_readable = false;
 
-        optind = 0;
-        while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) {
+       optind = 0;
+       while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) {
                 switch (c) {
                 case 'u':
                         if (qctl.qc_type != UGQUOTA) {
@@ -2646,6 +2748,9 @@ static int lfs_quota(int argc, char **argv)
                 case 'q':
                         quiet = 1;
                         break;
+               case 'h':
+                       human_readable = true;
+                       break;
                 default:
                         fprintf(stderr, "error: %s: option '-%c' "
                                         "unrecognized\n", argv[0], c);
@@ -2716,8 +2821,8 @@ ug_output:
                 }
         }
 
-        if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
-                print_quota_title(name, &qctl);
+       if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
+               print_quota_title(name, &qctl, human_readable);
 
         if (rc1 && *obd_type)
                 fprintf(stderr, "%s %s ", obd_type, obd_uuid);
@@ -2725,15 +2830,24 @@ ug_output:
         if (qctl.qc_valid != QC_GENERAL)
                 mnt = "";
 
-        inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
-                ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE));
+       inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
+               ((qctl.qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
+                (QIF_LIMITS|QIF_USAGE));
 
-        print_quota(mnt, &qctl, QC_GENERAL, rc1);
+       print_quota(mnt, &qctl, QC_GENERAL, rc1, human_readable);
 
-        if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) {
-                rc2 = print_obd_quota(mnt, &qctl, 1);
-                rc3 = print_obd_quota(mnt, &qctl, 0);
-        }
+       if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO &&
+           verbose) {
+               char strbuf[32];
+
+               kbytes2str(total_balloc, strbuf, human_readable);
+               rc2 = print_obd_quota(mnt, &qctl, 1, human_readable,
+                                     &total_ialloc);
+               rc3 = print_obd_quota(mnt, &qctl, 0, human_readable,
+                                     &total_balloc);
+               printf("Total allocated inode limit: "LPU64", total "
+                      "allocated block limit: %s\n", total_ialloc, strbuf);
+       }
 
         if (rc1 || rc2 || rc3 || inacc)
                 printf("Some errors happened when getting quota info. "
@@ -2999,7 +3113,7 @@ static int lfs_fid2path(int argc, char **argv)
         int linkno = -1;
         int lnktmp;
         int printcur = 0;
-        int rc;
+       int rc = 0;
 
         optind = 0;
 
@@ -3023,112 +3137,133 @@ static int lfs_fid2path(int argc, char **argv)
                         return CMD_HELP;
                 }
         }
-        device = argv[optind++];
-        fid = argv[optind++];
-        if (optind != argc)
-                return CMD_HELP;
 
-        path = calloc(1, PATH_MAX);
+       if (argc < 3)
+               return CMD_HELP;
 
-        lnktmp = (linkno >= 0) ? linkno : 0;
-        while (1) {
-                int oldtmp = lnktmp;
-                long long rectmp = recno;
-                rc = llapi_fid2path(device, fid, path, PATH_MAX, &rectmp,
-                                    &lnktmp);
-                if (rc < 0) {
-                        fprintf(stderr, "%s error: %s\n", argv[0],
-                                strerror(errno = -rc));
-                        break;
-                }
+       device = argv[optind++];
+       path = calloc(1, PATH_MAX);
 
-                if (printcur)
-                        fprintf(stdout, "%lld ", rectmp);
-                if (device[0] == '/') {
-                        fprintf(stdout, "%s", device);
-                        if (device[strlen(device) - 1] != '/')
-                                fprintf(stdout, "/");
-                } else if (path[0] == '\0') {
-                        fprintf(stdout, "/");
-                }
-                fprintf(stdout, "%s\n", path);
+       rc = 0;
+       while (optind < argc) {
+               fid = argv[optind++];
+
+               lnktmp = (linkno >= 0) ? linkno : 0;
+               while (1) {
+                       int oldtmp = lnktmp;
+                       long long rectmp = recno;
+                       int rc2;
+                       rc2 = llapi_fid2path(device, fid, path, PATH_MAX,
+                                            &rectmp, &lnktmp);
+                       if (rc2 < 0) {
+                               fprintf(stderr, "%s: error on FID %s: %s\n",
+                                       argv[0], fid, strerror(errno = -rc2));
+                               if (rc == 0)
+                                       rc = rc2;
+                               break;
+                       }
 
-                if (linkno >= 0)
-                        /* specified linkno */
-                        break;
-                if (oldtmp == lnktmp)
-                        /* no more links */
-                        break;
-        }
+                       if (printcur)
+                               fprintf(stdout, "%lld ", rectmp);
+                       if (device[0] == '/') {
+                               fprintf(stdout, "%s", device);
+                               if (device[strlen(device) - 1] != '/')
+                                       fprintf(stdout, "/");
+                       } else if (path[0] == '\0') {
+                               fprintf(stdout, "/");
+                       }
+                       fprintf(stdout, "%s\n", path);
+
+                       if (linkno >= 0)
+                               /* specified linkno */
+                               break;
+                       if (oldtmp == lnktmp)
+                               /* no more links */
+                               break;
+               }
+       }
 
-        free(path);
-        return rc;
+       free(path);
+       return rc;
 }
 
 static int lfs_path2fid(int argc, char **argv)
 {
-        char *path;
-        lustre_fid fid;
-        int rc;
-
-        if (argc != 2)
-                return CMD_HELP;
-
-        path = argv[1];
-        rc = llapi_path2fid(path, &fid);
-        if (rc) {
-                fprintf(stderr, "can't get fid for %s: %s\n", path,
-                        strerror(errno = -rc));
-                return rc;
-        }
+       char **path;
+       const char *sep = "";
+       lustre_fid fid;
+       int rc = 0;
 
-        printf(DFID"\n", PFID(&fid));
+       if (argc < 2)
+               return CMD_HELP;
+       else if (argc > 2)
+               sep = ": ";
+
+       path = argv + 1;
+       while (*path != NULL) {
+               int err = llapi_path2fid(*path, &fid);
+
+               if (err) {
+                       fprintf(stderr, "%s: can't get fid for %s: %s\n",
+                               argv[0], *path, strerror(-err));
+                       if (rc == 0) {
+                               rc = err;
+                               errno = -err;
+                       }
+                       goto out;
+               }
+               printf("%s%s"DFID"\n", *sep != '\0' ? *path : "", sep,
+                      PFID(&fid));
+out:
+               path++;
+       }
 
-        return 0;
+       return rc;
 }
 
 static int lfs_data_version(int argc, char **argv)
 {
-        char *path;
-        __u64 data_version;
-        int fd;
-        int rc;
-        int c;
-        int nolock = 0;
+       char *path;
+       __u64 data_version;
+       int fd;
+       int rc;
+       int c;
+       int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
 
-        if (argc < 2)
-                return CMD_HELP;
+       if (argc < 2)
+               return CMD_HELP;
 
-        optind = 0;
-        while ((c = getopt(argc, argv, "n")) != -1) {
-                switch (c) {
-                case 'n':
-                        nolock = LL_DV_NOFLUSH;
-                        break;
-                default:
-                        return CMD_HELP;
-                }
-        }
-        if (optind == argc)
-                return CMD_HELP;
+       optind = 0;
+       while ((c = getopt(argc, argv, "nrw")) != -1) {
+               switch (c) {
+               case 'n':
+                       data_version_flags = 0;
+                       break;
+               case 'r':
+                       data_version_flags |= LL_DV_RD_FLUSH;
+                       break;
+               case 'w':
+                       data_version_flags |= LL_DV_WR_FLUSH;
+                       break;
+               default:
+                       return CMD_HELP;
+               }
+       }
+       if (optind == argc)
+               return CMD_HELP;
 
-        path = argv[optind];
-        fd = open(path, O_RDONLY);
-        if (fd < 0) {
-                fprintf(stderr, "can't open %s: %s\n", path,
-                        strerror(errno));
-                return errno;
-        }
+       path = argv[optind];
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               err(errno, "cannot open file %s", path);
 
-        rc = llapi_get_data_version(fd, &data_version, nolock);
-        if (rc) {
-                fprintf(stderr, "can't get version for %s: %s\n", path,
-                        strerror(errno = -rc));
-       } else
+       rc = llapi_get_data_version(fd, &data_version, data_version_flags);
+       if (rc < 0)
+               err(errno, "cannot get version for %s", path);
+       else
                printf(LPU64 "\n", data_version);
 
        close(fd);
-
        return rc;
 }
 
@@ -3441,8 +3576,13 @@ static int lfs_hsm_request(int argc, char **argv, int action)
        hur->hur_request.hr_flags = 0;
 
        /* All remaining args are files, add them */
-       if (nbfile != 0)
-               strcpy(some_file, argv[optind]);
+       if (nbfile != 0) {
+               if (strlen(argv[optind]) > sizeof(some_file)-1) {
+                       free(hur);
+                       return -E2BIG;
+               }
+               strncpy(some_file, argv[optind], sizeof(some_file));
+       }
 
        for (i = 0; i < nbfile; i++) {
                hur->hur_user_item[i].hui_extent.length = -1;