Whamcloud - gitweb
LU-6081 user: use random() instead of /dev/urandom
[fs/lustre-release.git] / lustre / utils / lfs.c
index 5fba86f..3c41251 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, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -121,13 +121,21 @@ static int lfs_mv(int argc, char **argv);
        "                 [--stripe-size|-S <stripe_size>]\n"\
        "                 [--pool|-p <pool_name>]\n"\
        "                 [--block|-b] "_tgt"\n"\
+       "                 [--ost-list|-o <ost_indices>]\n"\
        "\tstripe_size:  Number of bytes on each OST (0 filesystem default)\n"\
        "\t              Can be specified with k, m or g (in KB, MB and GB\n"\
        "\t              respectively)\n"\
        "\tstart_ost_idx: OST index of first stripe (-1 default)\n"\
        "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"\
        "\tpool_name:    Name of OST pool to use (default none)\n"\
-       "\tblock:        Block file access during data migration"
+       "\tblock:        Block file access during data migration\n"\
+       "\tost_indices:  List of OST indices, can be repeated multiple times\n"\
+       "\t              Indices be specified in a format of:\n"\
+       "\t                -o <ost_1>,<ost_i>-<ost_j>,<ost_n>\n"\
+       "\t              Or:\n"\
+       "\t                -o <ost_1> -o <ost_i>-<ost_j> -o <ost_n>\n"\
+       "\t              If --pool is set with --ost-list, then the OSTs\n"\
+       "\t              must be the members of the pool."
 
 /* all avaialable commands */
 command_t cmdlist[] = {
@@ -345,42 +353,10 @@ command_t cmdlist[] = {
        { 0, 0, 0, NULL }
 };
 
-/* Generate a random id for the grouplock */
-static int random_group_id(int *gid)
-{
-       int     fd;
-       int     rc;
-       size_t  sz = sizeof(*gid);
-
-       fd = open("/dev/urandom", O_RDONLY);
-       if (fd < 0) {
-               rc = -errno;
-               fprintf(stderr, "cannot open /dev/urandom: %s\n",
-                       strerror(-rc));
-               goto out;
-       }
-
-       rc = read(fd, gid, sz);
-       if (rc < sz) {
-               rc = -errno;
-               fprintf(stderr, "cannot read %zu bytes from /dev/urandom: %s\n",
-                       sz, strerror(-rc));
-               goto out;
-       }
-
-out:
-       if (fd >= 0)
-               close(fd);
-
-       return rc;
-}
-
 #define MIGRATION_BLOCKS 1
 
-static int lfs_migrate(char *name, unsigned long long stripe_size,
-                      int stripe_offset, int stripe_count,
-                      int stripe_pattern, char *pool_name,
-                      __u64 migration_flags)
+static int lfs_migrate(char *name, __u64 migration_flags,
+                      struct llapi_stripe_param *param)
 {
        int                      fd, fdv;
        char                     volatile_file[PATH_MAX +
@@ -422,15 +398,6 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
                goto free;
        }
 
-       if (migration_flags & MIGRATION_BLOCKS) {
-               rc = random_group_id(&gid);
-               if (rc < 0) {
-                       fprintf(stderr, "%s: cannot get random group ID: %s\n",
-                               name, strerror(-rc));
-                       goto free;
-               }
-       }
-
        /* search for file directory pathname */
        if (strlen(name) > sizeof(parent)-1) {
                rc = -E2BIG;
@@ -459,9 +426,8 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
        /* create, open a volatile file, use caching (ie no directio) */
        /* exclusive create is not needed because volatile files cannot
         * conflict on name by construction */
-       fdv = llapi_file_open_pool(volatile_file, O_CREAT | O_WRONLY,
-                                  0644, stripe_size, stripe_offset,
-                                  stripe_count, stripe_pattern, pool_name);
+       fdv = llapi_file_open_param(volatile_file, O_CREAT | O_WRONLY, 0644,
+                                   param);
        if (fdv < 0) {
                rc = fdv;
                fprintf(stderr, "cannot create volatile file in %s (%s)\n",
@@ -516,6 +482,9 @@ static int lfs_migrate(char *name, unsigned long long stripe_size,
                goto error;
        }
 
+       do
+               gid = random();
+       while (gid == 0);
        if (migration_flags & MIGRATION_BLOCKS) {
                /* take group lock to limit concurent access
                 * this will be no more needed when exclusive access will
@@ -618,23 +587,110 @@ free:
        return rc;
 }
 
+/**
+ * Parse a string containing an OST index list into an array of integers.
+ *
+ * The input string contains a comma delimited list of individual
+ * indices and ranges, for example "1,2-4,7". Add the indices into the
+ * \a osts array and remove duplicates.
+ *
+ * \param[out] osts    array to store indices in
+ * \param[in] size     size of \a osts array
+ * \param[in] offset   starting index in \a osts
+ * \param[in] arg      string containing OST index list
+ *
+ * \retval positive    number of indices in \a osts
+ * \retval -EINVAL     unable to parse \a arg
+ */
+static int parse_targets(__u32 *osts, int size, int offset, char *arg)
+{
+       int rc;
+       int nr = offset;
+       int slots = size - offset;
+       char *ptr = NULL;
+       bool end_of_loop;
+
+       if (arg == NULL)
+               return -EINVAL;
+
+       end_of_loop = false;
+       while (!end_of_loop) {
+               int start_index;
+               int end_index;
+               int i;
+               char *endptr = NULL;
+
+               rc = -EINVAL;
+
+               ptr = strchrnul(arg, ',');
+
+               end_of_loop = *ptr == '\0';
+               *ptr = '\0';
+
+               start_index = strtol(arg, &endptr, 0);
+               if (endptr == arg) /* no data at all */
+                       break;
+               if (*endptr != '-' && *endptr != '\0') /* has invalid data */
+                       break;
+               if (start_index < 0)
+                       break;
+
+               end_index = start_index;
+               if (*endptr == '-') {
+                       end_index = strtol(endptr + 1, &endptr, 0);
+                       if (*endptr != '\0')
+                               break;
+                       if (end_index < start_index)
+                               break;
+               }
+
+               for (i = start_index; i <= end_index && slots > 0; i++) {
+                       int j;
+
+                       /* remove duplicate */
+                       for (j = 0; j < offset; j++) {
+                               if (osts[j] == i)
+                                       break;
+                       }
+                       if (j == offset) { /* no duplicate */
+                               osts[nr++] = i;
+                               --slots;
+                       }
+               }
+               if (slots == 0 && i < end_index)
+                       break;
+
+               *ptr = ',';
+               arg = ++ptr;
+               offset = nr;
+               rc = 0;
+       }
+       if (!end_of_loop && ptr != NULL)
+               *ptr = ',';
+
+       return rc < 0 ? rc : nr;
+}
+
 /* functions */
 static int lfs_setstripe(int argc, char **argv)
 {
-       char                    *fname;
-       int                      result;
-       unsigned long long       st_size;
-       int                      st_offset, st_count;
-       char                    *end;
-       int                      c;
-       int                      delete = 0;
-       char                    *stripe_size_arg = NULL;
-       char                    *stripe_off_arg = NULL;
-       char                    *stripe_count_arg = NULL;
-       char                    *pool_name_arg = NULL;
-       unsigned long long       size_units = 1;
-       int                      migrate_mode = 0;
-       __u64                    migration_flags = 0;
+       struct llapi_stripe_param       *param;
+       char                            *fname;
+       int                              result;
+       unsigned long long               st_size;
+       int                              st_offset, st_count;
+       char                            *end;
+       int                              c;
+       int                              delete = 0;
+       char                            *stripe_size_arg = NULL;
+       char                            *stripe_off_arg = NULL;
+       char                            *stripe_count_arg = NULL;
+       char                            *pool_name_arg = NULL;
+       unsigned long long               size_units = 1;
+       bool                             migrate_mode = false;
+       __u64                            migration_flags = 0;
+       __u32                            osts[LOV_MAX_STRIPE_COUNT] = { 0 };
+       int                              nr_osts = 0;
 
        struct option            long_opts[] = {
                /* valid only in migrate mode */
@@ -656,12 +712,8 @@ static int lfs_setstripe(int argc, char **argv)
 #endif
                {"stripe-index", required_argument, 0, 'i'},
                {"stripe_index", required_argument, 0, 'i'},
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
-               /* 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",       required_argument, 0, 'o'},
-#endif
+               {"ost-list",     required_argument, 0, 'o'},
+               {"ost_list",     required_argument, 0, 'o'},
                {"pool",         required_argument, 0, 'p'},
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
                /* This formerly implied "--stripe-size", but was confusing
@@ -674,14 +726,13 @@ static int lfs_setstripe(int argc, char **argv)
                {0, 0, 0, 0}
        };
 
-        st_size = 0;
-        st_offset = -1;
-        st_count = 0;
+       st_size = 0;
+       st_offset = -1;
+       st_count = 0;
 
        if (strcmp(argv[0], "migrate") == 0)
-               migrate_mode = 1;
+               migrate_mode = true;
 
-       optind = 0;
        while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:",
                                long_opts, NULL)) >= 0) {
                switch (c) {
@@ -689,7 +740,7 @@ static int lfs_setstripe(int argc, char **argv)
                        /* Long options. */
                        break;
                case 'b':
-                       if (migrate_mode == 0) {
+                       if (!migrate_mode) {
                                fprintf(stderr, "--block is valid only for"
                                                " migrate mode");
                                return CMD_HELP;
@@ -708,11 +759,19 @@ static int lfs_setstripe(int argc, char **argv)
                        /* delete the default striping pattern */
                        delete = 1;
                        break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
                case 'o':
-                       fprintf(stderr, "warning: '--offset|-o' deprecated, "
-                               "use '--stripe-index|-i' instead\n");
-#endif
+                       nr_osts = parse_targets(osts, ARRAY_SIZE(osts), nr_osts,
+                                               optarg);
+                       if (nr_osts < 0) {
+                               fprintf(stderr,
+                                       "error: %s: bad OST indices '%s'\n",
+                                       argv[0], optarg);
+                               return CMD_HELP;
+                       }
+
+                       if (st_offset == -1) /* first in the command line */
+                               st_offset = osts[0];
+                       break;
                case 'i':
 #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
                        if (strcmp(argv[optind - 1], "--index") == 0)
@@ -756,6 +815,13 @@ static int lfs_setstripe(int argc, char **argv)
                return CMD_HELP;
        }
 
+       if (pool_name_arg && strlen(pool_name_arg) > LOV_MAXPOOLNAME) {
+               fprintf(stderr,
+                       "error: %s: pool name '%s' is too long (max is %d characters)\n",
+                       argv[0], pool_name_arg, LOV_MAXPOOLNAME);
+               return CMD_HELP;
+       }
+
        /* get the stripe size */
        if (stripe_size_arg != NULL) {
                result = llapi_parse_size(stripe_size_arg, &st_size,
@@ -763,7 +829,7 @@ static int lfs_setstripe(int argc, char **argv)
                if (result) {
                        fprintf(stderr, "error: %s: bad stripe size '%s'\n",
                                argv[0], stripe_size_arg);
-                       return result;
+                       return CMD_HELP;
                }
        }
         /* get the stripe offset */
@@ -785,15 +851,44 @@ static int lfs_setstripe(int argc, char **argv)
                 }
         }
 
+       /* initialize stripe parameters */
+       param = calloc(1, offsetof(typeof(*param), lsp_osts[nr_osts]));
+       if (param == NULL) {
+               fprintf(stderr, "error: %s: run out of memory\n", argv[0]);
+               return CMD_HELP;
+       }
+
+       param->lsp_stripe_size = st_size;
+       param->lsp_stripe_offset = st_offset;
+       param->lsp_stripe_count = st_count;
+       param->lsp_stripe_pattern = 0;
+       param->lsp_pool = pool_name_arg;
+       param->lsp_is_specific = false;
+       if (nr_osts > 0) {
+               if (st_count > 0 && nr_osts != st_count) {
+                       fprintf(stderr, "error: %s: stripe count '%d' doesn't "
+                               "match the number of OSTs: %d\n",
+                               argv[0], st_count, nr_osts);
+                       return CMD_HELP;
+               }
+
+               param->lsp_is_specific = true;
+               param->lsp_stripe_count = nr_osts;
+               memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts);
+       }
+
        do {
-               if (migrate_mode)
-                       result = lfs_migrate(fname, st_size, st_offset,
-                                            st_count, 0, pool_name_arg,
-                                            migration_flags);
-               else
-                       result = llapi_file_create_pool(fname, st_size,
-                                                       st_offset, st_count,
-                                                       0, pool_name_arg);
+               if (!migrate_mode) {
+                       result = llapi_file_open_param(fname,
+                                                      O_CREAT | O_WRONLY,
+                                                      0644, param);
+                       if (result >= 0) {
+                               close(result);
+                               result = 0;
+                       }
+               } else {
+                       result = lfs_migrate(fname, migration_flags, param);
+               }
                if (result) {
                        fprintf(stderr,
                                "error: %s: %s stripe file '%s' failed\n",
@@ -804,6 +899,7 @@ static int lfs_setstripe(int argc, char **argv)
                fname = argv[++optind];
        } while (fname != NULL);
 
+       free(param);
        return result;
 }
 
@@ -924,7 +1020,7 @@ static int lfs_find(int argc, char **argv)
         time_t t;
        struct find_param param = {
                .fp_max_depth = -1,
-               .quiet = 1,
+               .fp_quiet = 1,
        };
         struct option long_opts[] = {
                 {"atime",        required_argument, 0, 'A'},
@@ -965,7 +1061,6 @@ 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:L:m:M:n:O:Ppqrs:S:t:u:U:v",
@@ -1032,22 +1127,22 @@ static int lfs_find(int argc, char **argv)
                        break;
                 case 'c':
                         if (optarg[0] == '+') {
-                                param.stripecount_sign = -1;
+                               param.fp_stripe_count_sign = -1;
                                 optarg++;
                         } else if (optarg[0] == '-') {
-                                param.stripecount_sign =  1;
+                               param.fp_stripe_count_sign =  1;
                                 optarg++;
                         }
 
-                        param.stripecount = strtoul(optarg, &endptr, 0);
+                       param.fp_stripe_count = strtoul(optarg, &endptr, 0);
                         if (*endptr != '\0') {
                                 fprintf(stderr,"error: bad stripe_count '%s'\n",
                                         optarg);
                                 ret = -1;
                                 goto err;
                         }
-                        param.check_stripecount = 1;
-                        param.exclude_stripecount = !!neg_opt;
+                       param.fp_check_stripe_count = 1;
+                       param.fp_exclude_stripe_count = !!neg_opt;
                         break;
                case 'D':
                        param.fp_max_depth = strtol(optarg, 0, 0);
@@ -1068,11 +1163,11 @@ static int lfs_find(int argc, char **argv)
                        param.fp_check_gid = 1;
                         break;
                case 'L':
-                       ret = name2layout(&param.layout, optarg);
+                       ret = name2layout(&param.fp_layout, optarg);
                        if (ret)
                                goto err;
-                       param.exclude_layout = !!neg_opt;
-                       param.check_layout = 1;
+                       param.fp_exclude_layout = !!neg_opt;
+                       param.fp_check_layout = 1;
                        break;
                 case 'u':
                 case 'U':
@@ -1100,14 +1195,14 @@ static int lfs_find(int argc, char **argv)
                         }
                         /* we do check for empty pool because empty pool
                          * is used to find V1 lov attributes */
-                        strncpy(param.poolname, optarg, LOV_MAXPOOLNAME);
-                        param.poolname[LOV_MAXPOOLNAME] = '\0';
-                        param.exclude_pool = !!neg_opt;
-                        param.check_pool = 1;
+                       strncpy(param.fp_poolname, optarg, LOV_MAXPOOLNAME);
+                       param.fp_poolname[LOV_MAXPOOLNAME] = '\0';
+                       param.fp_exclude_pool = !!neg_opt;
+                       param.fp_check_pool = 1;
                         break;
                 case 'n':
-                        param.pattern = (char *)optarg;
-                        param.exclude_pattern = !!neg_opt;
+                       param.fp_pattern = (char *)optarg;
+                       param.fp_exclude_pattern = !!neg_opt;
                         break;
                 case 'm':
                 case 'i':
@@ -1122,7 +1217,7 @@ static int lfs_find(int argc, char **argv)
                                 goto err;
                         }
 
-                        param.exclude_obd = !!neg_opt;
+                       param.fp_exclude_obd = !!neg_opt;
 
                         token = buf;
                         while (token && *token) {
@@ -1133,38 +1228,38 @@ static int lfs_find(int argc, char **argv)
                                 }
                         }
                         if (c == 'm') {
-                                param.exclude_mdt = !!neg_opt;
-                                param.num_alloc_mdts += len;
-                                tmp = realloc(param.mdtuuid,
-                                              param.num_alloc_mdts *
-                                              sizeof(*param.mdtuuid));
+                               param.fp_exclude_mdt = !!neg_opt;
+                               param.fp_num_alloc_mdts += len;
+                               tmp = realloc(param.fp_mdt_uuid,
+                                             param.fp_num_alloc_mdts *
+                                             sizeof(*param.fp_mdt_uuid));
                                if (tmp == NULL) {
                                        ret = -ENOMEM;
                                        goto err_free;
                                }
 
-                                param.mdtuuid = tmp;
+                               param.fp_mdt_uuid = tmp;
                         } else {
-                                param.exclude_obd = !!neg_opt;
-                                param.num_alloc_obds += len;
-                                tmp = realloc(param.obduuid,
-                                              param.num_alloc_obds *
-                                              sizeof(*param.obduuid));
+                               param.fp_exclude_obd = !!neg_opt;
+                               param.fp_num_alloc_obds += len;
+                               tmp = realloc(param.fp_obd_uuid,
+                                             param.fp_num_alloc_obds *
+                                             sizeof(*param.fp_obd_uuid));
                                if (tmp == NULL) {
                                        ret = -ENOMEM;
                                        goto err_free;
                                }
 
-                                param.obduuid = tmp;
+                               param.fp_obd_uuid = tmp;
                         }
                         for (token = buf; token && *token; token = next) {
                                struct obd_uuid *puuid;
                                if (c == 'm') {
                                        puuid =
-                                         &param.mdtuuid[param.num_mdts++];
+                                       &param.fp_mdt_uuid[param.fp_num_mdts++];
                                } else {
                                        puuid =
-                                         &param.obduuid[param.num_obds++];
+                                       &param.fp_obd_uuid[param.fp_num_obds++];
                                }
                                 p = strchr(token, ',');
                                 next = 0;
@@ -1187,47 +1282,47 @@ err_free:
                         break;
                 }
                 case 'p':
-                        param.zeroend = 1;
+                       param.fp_zero_end = 1;
                         break;
                 case 'P':
                         break;
                case 's':
                        if (optarg[0] == '+') {
-                               param.size_sign = -1;
+                               param.fp_size_sign = -1;
                                optarg++;
                        } else if (optarg[0] == '-') {
-                               param.size_sign =  1;
+                               param.fp_size_sign =  1;
                                optarg++;
                        }
 
-                       ret = llapi_parse_size(optarg, &param.size,
-                                              &param.size_units, 0);
+                       ret = llapi_parse_size(optarg, &param.fp_size,
+                                              &param.fp_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;
+                       param.fp_check_size = 1;
+                       param.fp_exclude_size = !!neg_opt;
                        break;
                case 'S':
                        if (optarg[0] == '+') {
-                               param.stripesize_sign = -1;
+                               param.fp_stripe_size_sign = -1;
                                optarg++;
                        } else if (optarg[0] == '-') {
-                               param.stripesize_sign =  1;
+                               param.fp_stripe_size_sign =  1;
                                optarg++;
                        }
 
-                       ret = llapi_parse_size(optarg, &param.stripesize,
-                                              &param.stripesize_units, 0);
+                       ret = llapi_parse_size(optarg, &param.fp_stripe_size,
+                                              &param.fp_stripe_size_units, 0);
                        if (ret) {
                                fprintf(stderr, "error: bad stripe_size '%s'\n",
                                        optarg);
                                goto err;
                        }
-                       param.check_stripesize = 1;
-                       param.exclude_stripesize = !!neg_opt;
+                       param.fp_check_stripe_size = 1;
+                       param.fp_exclude_stripe_size = !!neg_opt;
                        break;
                case 't':
                        param.fp_exclude_type = !!neg_opt;
@@ -1286,11 +1381,11 @@ err_free:
                 fprintf(stderr, "error: %s failed for %s.\n",
                         argv[0], argv[optind - 1]);
 err:
-        if (param.obduuid && param.num_alloc_obds)
-                free(param.obduuid);
+       if (param.fp_obd_uuid && param.fp_num_alloc_obds)
+               free(param.fp_obd_uuid);
 
-        if (param.mdtuuid && param.num_alloc_mdts)
-                free(param.mdtuuid);
+       if (param.fp_mdt_uuid && param.fp_num_alloc_mdts)
+               free(param.fp_mdt_uuid);
 
         return ret;
 }
@@ -1347,33 +1442,32 @@ static int lfs_getstripe_internal(int argc, char **argv,
        int c, rc;
 
        param->fp_max_depth = 1;
-       optind = 0;
        while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv",
                                long_opts, NULL)) != -1) {
                switch (c) {
                case 'O':
-                       if (param->obduuid) {
+                       if (param->fp_obd_uuid) {
                                fprintf(stderr,
                                        "error: %s: only one obduuid allowed",
                                        argv[0]);
                                return CMD_HELP;
                        }
-                       param->obduuid = (struct obd_uuid *)optarg;
+                       param->fp_obd_uuid = (struct obd_uuid *)optarg;
                        break;
                case 'q':
-                       param->quiet++;
+                       param->fp_quiet++;
                        break;
                case 'd':
                        param->fp_max_depth = 0;
                        break;
                case 'D':
-                       param->get_default_lmv = 1;
+                       param->fp_get_default_lmv = 1;
                        break;
                case 'r':
-                       param->recursive = 1;
+                       param->fp_recursive = 1;
                        break;
                case 'v':
-                       param->verbose = VERBOSE_ALL | VERBOSE_DETAIL;
+                       param->fp_verbose = VERBOSE_ALL | VERBOSE_DETAIL;
                        break;
                case 'c':
 #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
@@ -1381,8 +1475,8 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                fprintf(stderr, "warning: '--count' deprecated,"
                                        " use '--stripe-count' instead\n");
 #endif
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_COUNT;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_COUNT;
                                param->fp_max_depth = 0;
                        }
                        break;
@@ -1394,8 +1488,8 @@ static int lfs_getstripe_internal(int argc, char **argv,
 #endif
 #endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */
                case 'S':
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_SIZE;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_SIZE;
                                param->fp_max_depth = 0;
                        }
                        break;
@@ -1410,36 +1504,36 @@ static int lfs_getstripe_internal(int argc, char **argv,
                                fprintf(stderr, "warning: '--index' deprecated"
                                        ", use '--stripe-index' instead\n");
 #endif
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_OFFSET;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_OFFSET;
                                param->fp_max_depth = 0;
                        }
                        break;
                case 'p':
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_POOL;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_POOL;
                                param->fp_max_depth = 0;
                        }
                        break;
                case 'g':
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_GENERATION;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_GENERATION;
                                param->fp_max_depth = 0;
                        }
                        break;
                case 'L':
-                       if (!(param->verbose & VERBOSE_DETAIL)) {
-                               param->verbose |= VERBOSE_LAYOUT;
+                       if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+                               param->fp_verbose |= VERBOSE_LAYOUT;
                                param->fp_max_depth = 0;
                        }
                        break;
                case 'M':
-                       if (!(param->verbose & VERBOSE_DETAIL))
+                       if (!(param->fp_verbose & VERBOSE_DETAIL))
                                param->fp_max_depth = 0;
-                       param->verbose |= VERBOSE_MDTINDEX;
+                       param->fp_verbose |= VERBOSE_MDTINDEX;
                        break;
                case 'R':
-                       param->raw = 1;
+                       param->fp_raw = 1;
                        break;
                default:
                        return CMD_HELP;
@@ -1449,13 +1543,13 @@ static int lfs_getstripe_internal(int argc, char **argv,
        if (optind >= argc)
                return CMD_HELP;
 
-       if (param->recursive)
+       if (param->fp_recursive)
                param->fp_max_depth = -1;
 
-       if (!param->verbose)
-               param->verbose = VERBOSE_ALL;
-       if (param->quiet)
-               param->verbose = VERBOSE_OBJID;
+       if (!param->fp_verbose)
+               param->fp_verbose = VERBOSE_ALL;
+       if (param->fp_quiet)
+               param->fp_verbose = VERBOSE_OBJID;
 
        do {
                rc = llapi_getstripe(argv[optind], param);
@@ -1490,7 +1584,7 @@ static int lfs_tgts(int argc, char **argv)
 
                 memset(&param, 0, sizeof(param));
                 if (!strcmp(argv[0], "mdts"))
-                        param.get_lmv = 1;
+                       param.fp_get_lmv = 1;
 
                 rc = llapi_ostlist(mntdir, &param);
                 if (rc) {
@@ -1516,7 +1610,7 @@ static int lfs_getdirstripe(int argc, char **argv)
 {
        struct find_param param = { 0 };
 
-       param.get_lmv = 1;
+       param.fp_get_lmv = 1;
        return lfs_getstripe_internal(argc, argv, &param);
 }
 
@@ -1547,8 +1641,6 @@ static int lfs_setdirstripe(int argc, char **argv)
                {0, 0, 0, 0}
        };
 
-       optind = 0;
-
        while ((c = getopt_long(argc, argv, "c:Di:m:t:", long_opts,
                                NULL)) >= 0) {
                switch (c) {
@@ -1689,7 +1781,7 @@ static int lfs_mv(int argc, char **argv)
 {
        struct  find_param param = {
                .fp_max_depth = -1,
-               .mdtindex = -1,
+               .fp_mdt_index = -1,
        };
        char   *end;
        int     c;
@@ -1703,7 +1795,7 @@ static int lfs_mv(int argc, char **argv)
        while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) {
                switch (c) {
                case 'M': {
-                       param.mdtindex = strtoul(optarg, &end, 0);
+                       param.fp_mdt_index = strtoul(optarg, &end, 0);
                        if (*end != '\0') {
                                fprintf(stderr, "%s: invalid MDT index'%s'\n",
                                        argv[0], optarg);
@@ -1712,7 +1804,7 @@ static int lfs_mv(int argc, char **argv)
                        break;
                }
                case 'v': {
-                       param.verbose = VERBOSE_DETAIL;
+                       param.fp_verbose = VERBOSE_DETAIL;
                        break;
                }
                default:
@@ -1722,7 +1814,7 @@ static int lfs_mv(int argc, char **argv)
                }
        }
 
-       if (param.mdtindex == -1) {
+       if (param.fp_mdt_index == -1) {
                fprintf(stderr, "%s MDT index must be indicated\n", argv[0]);
                return CMD_HELP;
        }
@@ -1732,11 +1824,11 @@ static int lfs_mv(int argc, char **argv)
                return CMD_HELP;
        }
 
-       param.migrate = 1;
+       param.fp_migrate = 1;
        rc = llapi_mv(argv[optind], &param);
        if (rc != 0)
                fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n",
-                       argv[optind], param.mdtindex, strerror(-rc));
+                       argv[optind], param.fp_mdt_index, strerror(-rc));
        return rc;
 }
 
@@ -1901,6 +1993,9 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow,
                         if (rc == -ENODEV)
                                 break;
 
+                       if (rc == -EAGAIN)
+                               continue;
+
                         if (poolname && tp->st_op == LL_STATFS_LOV &&
                             llapi_search_ost(fsname, poolname,
                                              obd_uuid2str(&uuid_buf)) != 1)
@@ -1963,7 +2058,6 @@ static int lfs_df(int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-       optind = 0;
        while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) {
                switch (c) {
                case 'i':
@@ -2010,7 +2104,6 @@ static int lfs_getname(int argc, char **argv)
         int rc = 0, index = 0, c;
         char buf[sizeof(struct obd_uuid)];
 
-        optind = 0;
         while ((c = getopt(argc, argv, "h")) != -1)
                 return CMD_HELP;
 
@@ -2107,7 +2200,6 @@ static int lfs_quotacheck(int argc, char **argv)
 
         memset(&qchk, 0, sizeof(qchk));
 
-        optind = 0;
         while ((c = getopt(argc, argv, "gu")) != -1) {
                 switch (c) {
                 case 'u':
@@ -2182,7 +2274,6 @@ static int lfs_quotaon(int argc, char **argv)
         memset(&qctl, 0, sizeof(qctl));
         qctl.qc_cmd = LUSTRE_Q_QUOTAON;
 
-        optind = 0;
         while ((c = getopt(argc, argv, "fgu")) != -1) {
                 switch (c) {
                 case 'u':
@@ -2250,7 +2341,6 @@ static int lfs_quotaoff(int argc, char **argv)
         memset(&qctl, 0, sizeof(qctl));
         qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
 
-        optind = 0;
         while ((c = getopt(argc, argv, "gu")) != -1) {
                 switch (c) {
                 case 'u':
@@ -2412,7 +2502,6 @@ int lfs_setquota_times(int argc, char **argv)
         qctl.qc_cmd  = LUSTRE_Q_SETINFO;
         qctl.qc_type = UGQUOTA;
 
-        optind = 0;
         while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'u':
@@ -2502,7 +2591,6 @@ int lfs_setquota(int argc, char **argv)
                                  * so it can be used as a marker that qc_type
                                  * isn't reinitialized from command line */
 
-        optind = 0;
         while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'u':
@@ -2889,7 +2977,6 @@ static int lfs_quota(int argc, char **argv)
        __u64 total_ialloc = 0, total_balloc = 0;
        bool human_readable = false;
 
-       optind = 0;
        while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) {
                 switch (c) {
                 case 'u':
@@ -3068,7 +3155,6 @@ static int lfs_flushctx(int argc, char **argv)
        int     index = 0;
        int     rc = 0;
 
-        optind = 0;
         while ((c = getopt(argc, argv, "k")) != -1) {
                 switch (c) {
                 case 'k':
@@ -3157,7 +3243,6 @@ static int lfs_changelog(int argc, char **argv)
         char short_opts[] = "f";
         int rc, follow = 0;
 
-        optind = 0;
         while ((rc = getopt_long(argc, argv, short_opts,
                                 long_opts, NULL)) != -1) {
                 switch (rc) {
@@ -3235,7 +3320,7 @@ static int lfs_changelog(int argc, char **argv)
                                printf(" s="DFID" sp="DFID" %.*s",
                                       PFID(&rnm->cr_sfid),
                                       PFID(&rnm->cr_spfid),
-                                      changelog_rec_snamelen(rec),
+                                      (int)changelog_rec_snamelen(rec),
                                       changelog_rec_sname(rec));
                }
                printf("\n");
@@ -3284,8 +3369,6 @@ static int lfs_fid2path(int argc, char **argv)
         int printcur = 0;
        int rc = 0;
 
-        optind = 0;
-
         while ((rc = getopt_long(argc, argv, short_opts,
                                 long_opts, NULL)) != -1) {
                 switch (rc) {
@@ -3373,7 +3456,6 @@ static int lfs_path2fid(int argc, char **argv)
        int               rc = 0;
        bool              show_parents = false;
 
-       optind = 0;
        while ((rc = getopt_long(argc, argv, short_opts,
                                 long_opts, NULL)) != -1) {
                switch (rc) {
@@ -3448,7 +3530,6 @@ static int lfs_data_version(int argc, char **argv)
        if (argc < 2)
                return CMD_HELP;
 
-       optind = 0;
        while ((c = getopt(argc, argv, "nrw")) != -1) {
                switch (c) {
                case 'n':
@@ -3558,7 +3639,6 @@ static int lfs_hsm_change_flags(int argc, char **argv, int mode)
        if (argc < 3)
                return CMD_HELP;
 
-       optind = 0;
        while ((c = getopt_long(argc, argv, short_opts,
                                long_opts, NULL)) != -1) {
                switch (c) {
@@ -3746,7 +3826,6 @@ static int lfs_hsm_request(int argc, char **argv, int action)
        if (argc < 2)
                return CMD_HELP;
 
-       optind = 0;
        while ((c = getopt_long(argc, argv, short_opts,
                                long_opts, NULL)) != -1) {
                switch (c) {
@@ -3950,6 +4029,10 @@ int main(int argc, char **argv)
 {
         int rc;
 
+       /* Ensure that liblustreapi constructor has run */
+       if (!liblustreapi_initialized)
+               fprintf(stderr, "liblustreapi was not properly initialized\n");
+
         setlinebuf(stdout);
 
        Parser_init("lfs > ", cmdlist);