Whamcloud - gitweb
LU-6052 utils: change "lfs mv" to "lfs migrate"
[fs/lustre-release.git] / lustre / utils / lfs.c
index f2668ae..767c5d4 100644 (file)
 #include <getopt.h>
 #include <string.h>
 #include <mntent.h>
+#include <unistd.h>
 #include <errno.h>
 #include <err.h>
 #include <pwd.h>
 #include <grp.h>
+#include <sys/ioctl.h>
 #include <sys/quota.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -65,8 +68,9 @@
 # include <sys/quota.h>
 #endif
 
-#include <libcfs/libcfs.h>
-#include <libcfs/libcfsutil.h>
+#include <libcfs/util/string.h>
+#include <libcfs/util/ioctl.h>
+#include <libcfs/util/parser.h>
 #include <lustre/lustreapi.h>
 #include <lustre_ver.h>
 
@@ -83,9 +87,6 @@ static int lfs_df(int argc, char **argv);
 static int lfs_getname(int argc, char **argv);
 static int lfs_check(int argc, char **argv);
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotacheck(int argc, char **argv);
-static int lfs_quotaon(int argc, char **argv);
-static int lfs_quotaoff(int argc, char **argv);
 static int lfs_setquota(int argc, char **argv);
 static int lfs_quota(int argc, char **argv);
 #endif
@@ -115,29 +116,46 @@ static int lfs_hsm_cancel(int argc, char **argv);
 static int lfs_swap_layouts(int argc, char **argv);
 static int lfs_mv(int argc, char **argv);
 
-#define SETSTRIPE_USAGE(_cmd, _tgt) \
-       "usage: "_cmd" [--stripe-count|-c <stripe_count>]\n"\
-       "                 [--stripe-index|-i <start_ost_idx>]\n"\
-       "                 [--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\n"\
+/* Setstripe and migrate share mostly the same parameters */
+#define SSM_CMD_COMMON(cmd) \
+       "usage: "cmd" [--stripe-count|-c <stripe_count>]\n"             \
+       "                 [--stripe-index|-i <start_ost_idx>]\n"        \
+       "                 [--stripe-size|-S <stripe_size>]\n"           \
+       "                 [--pool|-p <pool_name>]\n"                    \
+       "                 [--ost-list|-o <ost_indices>]\n"
+
+#define SSM_HELP_COMMON \
+       "\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"      \
        "\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              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 */
+#define SETSTRIPE_USAGE                                                \
+       SSM_CMD_COMMON("setstripe")                             \
+       "                 <directory|filename>\n"               \
+       SSM_HELP_COMMON
+
+#define MIGRATE_USAGE                                                  \
+       SSM_CMD_COMMON("migrate  ")                                     \
+       "                 [--block|-b]\n"                               \
+       "                 <filename>\n"                                 \
+       SSM_HELP_COMMON                                                 \
+       "\n"                                                            \
+       "\tblock:        Block file access during data migration\n"     \
+
+static const char      *progname;
+static bool             file_lease_supported = true;
+
+/* all available commands */
 command_t cmdlist[] = {
        {"setstripe", lfs_setstripe, 0,
         "Create a new file with a specific striping pattern or\n"
@@ -145,7 +163,7 @@ command_t cmdlist[] = {
         "delete the default striping pattern from an existing directory\n"
         "usage: setstripe -d <directory>   (to delete default striping)\n"\
         " or\n"
-        SETSTRIPE_USAGE("setstripe", "<directory|filename>")},
+        SETSTRIPE_USAGE},
        {"getstripe", lfs_getstripe, 0,
         "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"
@@ -232,16 +250,6 @@ command_t cmdlist[] = {
          "[for specified path only]\n"
          "Usage: getname [-h]|[path ...] "},
 #ifdef HAVE_SYS_QUOTA_H
-        {"quotacheck", lfs_quotacheck, 0,
-         "Scan the specified filesystem for disk usage, and create,\n"
-         "or update quota files. Deprecated as of 2.4.0.\n"
-         "usage: quotacheck [ -ug ] <filesystem>"},
-        {"quotaon", lfs_quotaon, 0, "Turn filesystem"
-         " quotas on. Deprecated as of 2.4.0.\n"
-         "usage: quotaon [ -ugf ] <filesystem>"},
-        {"quotaoff", lfs_quotaoff, 0, "Turn filesystem"
-         " quotas off. Deprecated as of 2.4.0.\n"
-         "usage: quotaoff [ -ug ] <filesystem>"},
         {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
          "usage: setquota <-u|-g> <uname>|<uid>|<gname>|<gid>\n"
          "                -b <block-softlimit> -B <block-hardlimit>\n"
@@ -332,17 +340,28 @@ command_t cmdlist[] = {
         "usage: hsm_release [--filelist FILELIST] [--data DATA] <file> ..."},
        {"hsm_remove", lfs_hsm_remove, 0,
         "Remove file copy from external storage.\n"
-        "usage: hsm_remove [--filelist FILELIST] [--data DATA] <file> ..."},
+        "usage: hsm_remove [--filelist FILELIST] [--data DATA]\n"
+        "                  [--mntpath MOUNTPATH] [--archive NUM] <file|FID> ...\n"
+        "\n"
+        "Note: To remove files from the archive that have been deleted on\n"
+        "Lustre, set mntpath and optionally archive. In that case, all the\n"
+        "positional arguments and entries in the file list must be FIDs."
+       },
        {"hsm_cancel", lfs_hsm_cancel, 0,
         "Cancel requests related to specified files.\n"
         "usage: hsm_cancel [--filelist FILELIST] [--data DATA] <file> ..."},
        {"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n"
         "usage: swap_layouts <path1> <path2>"},
-       {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to "
-        "another (may be not safe with concurent writes).\n"
-        SETSTRIPE_USAGE("migrate  ", "<filename>")},
+       {"migrate", lfs_setstripe, 0,
+        "migrate file/directory between MDTs, or migrate file from one OST "
+        "layout\nto another (may be not safe with concurent writes).\n"
+        "usage: migrate   [--mdt-index|-m <mdt_idx>] <directory|filename>]\n"
+        "\tmdt_idx:      MDT index to migrate to\n"
+        " or\n"
+        MIGRATE_USAGE},
        {"mv", lfs_mv, 0,
-        "To move directories between MDTs.\n"
+        "To move directories between MDTs. This command is deprecated, "
+        "use \"migrate\" instead.\n"
         "usage: mv <directory|filename> [--mdt-index|-M] <mdt_index> "
         "[--verbose|-v]\n"},
        {"help", Parser_help, 0, "help"},
@@ -353,62 +372,322 @@ command_t cmdlist[] = {
        { 0, 0, 0, NULL }
 };
 
+
 #define MIGRATION_BLOCKS 1
 
+/**
+ * Internal helper for migrate_copy_data(). Check lease and report error if
+ * need be.
+ *
+ * \param[in]  fd           File descriptor on which to check the lease.
+ * \param[out] lease_broken Set to true if the lease was broken.
+ * \param[in]  group_locked Whether a group lock was taken or not.
+ * \param[in]  path         Name of the file being processed, for error
+ *                         reporting
+ *
+ * \retval 0       Migration can keep on going.
+ * \retval -errno  Error occurred, abort migration.
+ */
+static int check_lease(int fd, bool *lease_broken, bool group_locked,
+                      const char *path)
+{
+       int rc;
+
+       if (!file_lease_supported)
+               return 0;
+
+       rc = llapi_lease_check(fd);
+       if (rc > 0)
+               return 0; /* llapi_check_lease returns > 0 on success. */
+
+       if (!group_locked) {
+               fprintf(stderr, "%s: cannot migrate '%s': file busy\n",
+                       progname, path);
+               rc = rc ? rc : -EAGAIN;
+       } else {
+               fprintf(stderr, "%s: external attempt to access file '%s' "
+                       "blocked until migration ends.\n", progname, path);
+               rc = 0;
+       }
+       *lease_broken = true;
+       return rc;
+}
+
+static int migrate_copy_data(int fd_src, int fd_dst, size_t buf_size,
+                            bool group_locked, const char *fname)
+{
+       void    *buf = NULL;
+       ssize_t  rsize = -1;
+       ssize_t  wsize = 0;
+       size_t   rpos = 0;
+       size_t   wpos = 0;
+       off_t    bufoff = 0;
+       int      rc;
+       bool     lease_broken = false;
+
+       /* Use a page-aligned buffer for direct I/O */
+       rc = posix_memalign(&buf, getpagesize(), buf_size);
+       if (rc != 0)
+               return -rc;
+
+       while (1) {
+               /* read new data only if we have written all
+                * previously read data */
+               if (wpos == rpos) {
+                       if (!lease_broken) {
+                               rc = check_lease(fd_src, &lease_broken,
+                                                group_locked, fname);
+                               if (rc < 0)
+                                       goto out;
+                       }
+                       rsize = read(fd_src, buf, buf_size);
+                       if (rsize < 0) {
+                               rc = -errno;
+                               fprintf(stderr, "%s: %s: read failed: %s\n",
+                                       progname, fname, strerror(-rc));
+                               goto out;
+                       }
+                       rpos += rsize;
+                       bufoff = 0;
+               }
+               /* eof ? */
+               if (rsize == 0)
+                       break;
+
+               wsize = write(fd_dst, buf + bufoff, rpos - wpos);
+               if (wsize < 0) {
+                       rc = -errno;
+                       fprintf(stderr,
+                               "%s: %s: write failed on volatile: %s\n",
+                               progname, fname, strerror(-rc));
+                       goto out;
+               }
+               wpos += wsize;
+               bufoff += wsize;
+       }
+
+       rc = fsync(fd_dst);
+       if (rc < 0) {
+               rc = -errno;
+               fprintf(stderr, "%s: %s: fsync failed: %s\n",
+                       progname, fname, strerror(-rc));
+       }
+
+out:
+       free(buf);
+       return rc;
+}
+
+static int migrate_copy_timestamps(int fdv, const struct stat *st)
+{
+       struct timeval  tv[2] = {
+               {.tv_sec = st->st_atime},
+               {.tv_sec = st->st_mtime}
+       };
+
+       return futimes(fdv, tv);
+}
+
+static int migrate_block(int fd, int fdv, const struct stat *st,
+                        size_t buf_size, const char *name)
+{
+       __u64   dv1;
+       int     gid;
+       int     rc;
+       int     rc2;
+
+       rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: cannot get dataversion: %s\n",
+                       progname, name, strerror(-rc));
+               return rc;
+       }
+
+       do
+               gid = random();
+       while (gid == 0);
+
+       /* The grouplock blocks all concurrent accesses to the file.
+        * It has to be taken after llapi_get_data_version as it would
+        * block it too. */
+       rc = llapi_group_lock(fd, gid);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: cannot get group lock: %s\n",
+                       progname, name, strerror(-rc));
+               return rc;
+       }
+
+       rc = migrate_copy_data(fd, fdv, buf_size, true, name);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: data copy failed\n", progname, name);
+               goto out_unlock;
+       }
+
+       /* Make sure we keep original atime/mtime values */
+       rc = migrate_copy_timestamps(fdv, st);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: timestamp copy failed\n",
+                       progname, name);
+               goto out_unlock;
+       }
+
+       /* swap layouts
+        * for a migration we need to check data version on file did
+        * not change.
+        *
+        * Pass in gid=0 since we already own grouplock. */
+       rc = llapi_fswap_layouts_grouplock(fd, fdv, dv1, 0, 0,
+                                          SWAP_LAYOUTS_CHECK_DV1);
+       if (rc == -EAGAIN) {
+               fprintf(stderr, "%s: %s: dataversion changed during copy, "
+                       "migration aborted\n", progname, name);
+               goto out_unlock;
+       } else if (rc < 0) {
+               fprintf(stderr, "%s: %s: cannot swap layouts: %s\n", progname,
+                       name, strerror(-rc));
+               goto out_unlock;
+       }
+
+out_unlock:
+       rc2 = llapi_group_unlock(fd, gid);
+       if (rc2 < 0 && rc == 0) {
+               fprintf(stderr, "%s: %s: putting group lock failed: %s\n",
+                       progname, name, strerror(-rc2));
+               rc = rc2;
+       }
+
+       return rc;
+}
+
+static int migrate_nonblock(int fd, int fdv, const struct stat *st,
+                           size_t buf_size, const char *name)
+{
+       __u64   dv1;
+       __u64   dv2;
+       int     rc;
+
+       rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: cannot get data version: %s\n",
+                       progname, name, strerror(-rc));
+               return rc;
+       }
+
+       rc = migrate_copy_data(fd, fdv, buf_size, false, name);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: data copy failed\n", progname, name);
+               return rc;
+       }
+
+       rc = llapi_get_data_version(fd, &dv2, LL_DV_RD_FLUSH);
+       if (rc != 0) {
+               fprintf(stderr, "%s: %s: cannot get data version: %s\n",
+                       progname, name, strerror(-rc));
+               return rc;
+       }
+
+       if (dv1 != dv2) {
+               rc = -EAGAIN;
+               fprintf(stderr, "%s: %s: data version changed during "
+                               "migration\n",
+                       progname, name);
+               return rc;
+       }
+
+       /* Make sure we keep original atime/mtime values */
+       rc = migrate_copy_timestamps(fdv, st);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: timestamp copy failed\n",
+                       progname, name);
+               return rc;
+       }
+
+       /* Atomically put lease, swap layouts and close.
+        * for a migration we need to check data version on file did
+        * not change. */
+       rc = llapi_fswap_layouts(fd, fdv, 0, 0, SWAP_LAYOUTS_CLOSE);
+       if (rc < 0) {
+               fprintf(stderr, "%s: %s: cannot swap layouts: %s\n",
+                       progname, name, strerror(-rc));
+               return rc;
+       }
+
+       return 0;
+}
+
 static int lfs_migrate(char *name, __u64 migration_flags,
                       struct llapi_stripe_param *param)
 {
-       int                      fd, fdv;
+       int                      fd = -1;
+       int                      fdv = -1;
        char                     volatile_file[PATH_MAX +
                                                LUSTRE_VOLATILE_HDR_LEN + 4];
        char                     parent[PATH_MAX];
        char                    *ptr;
        int                      rc;
-       __u64                    dv1;
        struct lov_user_md      *lum = NULL;
-       int                      lumsz;
-       int                      bufsz;
-       void                    *buf = NULL;
-       int                      rsize, wsize;
-       __u64                    rpos, wpos, bufoff;
-       int                      gid;
-       int                      have_gl = 0;
-       struct stat              st, stv;
+       int                      lum_size;
+       int                      buf_size;
+       bool                     have_lease_rdlck = false;
+       struct stat              st;
+       struct stat              stv;
 
        /* find the right size for the IO and allocate the buffer */
-       lumsz = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
-       lum = malloc(lumsz);
+       lum_size = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3);
+       lum = malloc(lum_size);
        if (lum == NULL) {
                rc = -ENOMEM;
                goto free;
        }
 
        rc = llapi_file_get_stripe(name, lum);
-       /* failure can come from may case and some may be not real error
+       /* failure can happen for many reasons and some may be not real errors
         * (eg: no stripe)
-        * in case of a real error, a later call will failed with a better
+        * in case of a real error, a later call will fail with better
         * error management */
        if (rc < 0)
-               bufsz = 1024*1024;
+               buf_size = 1024 * 1024;
        else
-               bufsz = lum->lmm_stripe_size;
-       rc = posix_memalign(&buf, getpagesize(), bufsz);
-       if (rc != 0) {
-               rc = -rc;
+               buf_size = lum->lmm_stripe_size;
+
+       /* 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);
+       if (fd == -1) {
+               rc = -errno;
+               fprintf(stderr, "%s: %s: cannot open: %s\n", progname, name,
+                       strerror(-rc));
                goto free;
        }
 
+       if (file_lease_supported) {
+               rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+               if (rc == -EOPNOTSUPP) {
+                       /* Older servers do not support file lease.
+                        * Disable related checks. This opens race conditions
+                        * as explained in LU-4840 */
+                       file_lease_supported = false;
+               } else if (rc < 0) {
+                       fprintf(stderr, "%s: %s: cannot get open lease: %s\n",
+                               progname, name, strerror(-rc));
+                       goto error;
+               } else {
+                       have_lease_rdlck = true;
+               }
+       }
+
        /* search for file directory pathname */
        if (strlen(name) > sizeof(parent)-1) {
                rc = -E2BIG;
-               goto free;
+               goto error;
        }
        strncpy(parent, name, sizeof(parent));
        ptr = strrchr(parent, '/');
        if (ptr == NULL) {
                if (getcwd(parent, sizeof(parent)) == NULL) {
                        rc = -errno;
-                       goto free;
+                       goto error;
                }
        } else {
                if (ptr == parent)
@@ -416,11 +695,12 @@ static int lfs_migrate(char *name, __u64 migration_flags,
                else
                        *ptr = '\0';
        }
+
        rc = snprintf(volatile_file, sizeof(volatile_file), "%s/%s::", parent,
                      LUSTRE_VOLATILE_HDR);
        if (rc >= sizeof(volatile_file)) {
                rc = -E2BIG;
-               goto free;
+               goto error;
        }
 
        /* create, open a volatile file, use caching (ie no directio) */
@@ -430,20 +710,10 @@ static int lfs_migrate(char *name, __u64 migration_flags,
                                    param);
        if (fdv < 0) {
                rc = fdv;
-               fprintf(stderr, "cannot create volatile file in %s (%s)\n",
-                       parent, strerror(-rc));
-               goto free;
-       }
-
-       /* 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);
-       if (fd == -1) {
-               rc = -errno;
-               fprintf(stderr, "cannot open %s (%s)\n", name, strerror(-rc));
-               close(fdv);
-               goto free;
+               fprintf(stderr, "%s: %s: cannot create volatile file in"
+                               " directory: %s\n",
+                       progname, parent, strerror(-rc));
+               goto error;
        }
 
        /* Not-owner (root?) special case.
@@ -453,137 +723,53 @@ static int lfs_migrate(char *name, __u64 migration_flags,
        rc = fstat(fd, &st);
        if (rc != 0) {
                rc = -errno;
-               fprintf(stderr, "cannot stat %s (%s)\n", name,
+               fprintf(stderr, "%s: %s: cannot stat: %s\n", progname, name,
                        strerror(errno));
                goto error;
        }
        rc = fstat(fdv, &stv);
        if (rc != 0) {
                rc = -errno;
-               fprintf(stderr, "cannot stat %s (%s)\n", volatile_file,
-                       strerror(errno));
+               fprintf(stderr, "%s: %s: cannot stat: %s\n", progname,
+                       volatile_file, strerror(errno));
                goto error;
        }
        if (st.st_uid != stv.st_uid || st.st_gid != stv.st_gid) {
                rc = fchown(fdv, st.st_uid, st.st_gid);
                if (rc != 0) {
                        rc = -errno;
-                       fprintf(stderr, "cannot chown %s (%s)\n", name,
-                               strerror(errno));
+                       fprintf(stderr, "%s: %s: cannot chown: %s\n", progname,
+                               name, strerror(errno));
                        goto error;
                }
        }
 
-       /* get file data version */
-       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));
-               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
-                * be implemented (see LU-2919) */
-               /* group lock is taken after data version read because it
-                * blocks data version call */
-               rc = llapi_group_lock(fd, gid);
-               if (rc < 0) {
-                       fprintf(stderr, "cannot get group lock on %s (%s)\n",
-                               name, strerror(-rc));
-                       goto error;
+       if (migration_flags & MIGRATION_BLOCKS || !file_lease_supported) {
+               /* Blocking mode, forced if servers do not support file lease */
+               rc = migrate_block(fd, fdv, &st, buf_size, name);
+       } else {
+               rc = migrate_nonblock(fd, fdv, &st, buf_size, name);
+               if (rc == 0) {
+                       have_lease_rdlck = false;
+                       fdv = -1; /* The volatile file is closed as we put the
+                                  * lease in non-blocking mode. */
                }
-               have_gl = 1;
        }
 
-       /* copy data */
-       rpos = 0;
-       wpos = 0;
-       bufoff = 0;
-       rsize = -1;
-       do {
-               /* read new data only if we have written all
-                * previously read data */
-               if (wpos == rpos) {
-                       rsize = read(fd, buf, bufsz);
-                       if (rsize < 0) {
-                               rc = -errno;
-                               fprintf(stderr, "read failed on %s"
-                                       " (%s)\n", name,
-                                       strerror(-rc));
-                               goto error;
-                       }
-                       rpos += rsize;
-                       bufoff = 0;
-               }
-               /* eof ? */
-               if (rsize == 0)
-                       break;
-               wsize = write(fdv, buf + bufoff, rpos - wpos);
-               if (wsize < 0) {
-                       rc = -errno;
-                       fprintf(stderr, "write failed on volatile"
-                               " for %s (%s)\n", name, strerror(-rc));
-                       goto error;
-               }
-               wpos += wsize;
-               bufoff += wsize;
-       } while (1);
-
-       /* flush data */
-       fsync(fdv);
-
-       if (migration_flags & MIGRATION_BLOCKS) {
-               /* give back group lock */
-               rc = llapi_group_unlock(fd, gid);
-               if (rc < 0)
-                       fprintf(stderr, "cannot put group lock on %s (%s)\n",
-                               name, strerror(-rc));
-               have_gl = 0;
-       }
-
-       /* swap layouts
-        * for a migration we need to:
-        * - check data version on file did not change
-        * - keep file mtime
-        * - keep file atime
-        */
-       rc = llapi_fswap_layouts(fd, fdv, dv1, 0,
-                                SWAP_LAYOUTS_CHECK_DV1 |
-                                SWAP_LAYOUTS_KEEP_MTIME |
-                                SWAP_LAYOUTS_KEEP_ATIME);
-       if (rc == -EAGAIN) {
-               fprintf(stderr, "%s: dataversion changed during copy, "
-                       "migration aborted\n", name);
-               goto error;
-       }
-       if (rc != 0)
-               fprintf(stderr, "%s: swap layout to new file failed: %s\n",
-                       name, strerror(-rc));
-
 error:
-       /* give back group lock */
-       if ((migration_flags & MIGRATION_BLOCKS) && have_gl) {
-               int rc2;
+       if (have_lease_rdlck)
+               llapi_lease_put(fd);
 
-               /* we keep the original error in rc */
-               rc2 = llapi_group_unlock(fd, gid);
-               if (rc2 < 0)
-                       fprintf(stderr, "cannot put group lock on %s (%s)\n",
-                               name, strerror(-rc2));
-       }
+       if (fd >= 0)
+               close(fd);
+
+       if (fdv >= 0)
+               close(fdv);
 
-       close(fdv);
-       close(fd);
 free:
        if (lum)
                free(lum);
-       if (buf)
-               free(buf);
+
        return rc;
 }
 
@@ -674,9 +860,14 @@ static int parse_targets(__u32 *osts, int size, int offset, char *arg)
 /* functions */
 static int lfs_setstripe(int argc, char **argv)
 {
-       struct llapi_stripe_param       *param;
+       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                              result2 = 0;
        unsigned long long               st_size;
        int                              st_offset, st_count;
        char                            *end;
@@ -686,6 +877,7 @@ static int lfs_setstripe(int argc, char **argv)
        char                            *stripe_off_arg = NULL;
        char                            *stripe_count_arg = NULL;
        char                            *pool_name_arg = NULL;
+       char                            *mdt_idx_arg = NULL;
        unsigned long long               size_units = 1;
        bool                             migrate_mode = false;
        __u64                            migration_flags = 0;
@@ -712,6 +904,8 @@ static int lfs_setstripe(int argc, char **argv)
 #endif
                {"stripe-index", required_argument, 0, 'i'},
                {"stripe_index", required_argument, 0, 'i'},
+               {"mdt-index",    required_argument, 0, 'm'},
+               {"mdt_index",    required_argument, 0, 'm'},
                {"ost-list",     required_argument, 0, 'o'},
                {"ost_list",     required_argument, 0, 'o'},
                {"pool",         required_argument, 0, 'p'},
@@ -733,7 +927,7 @@ static int lfs_setstripe(int argc, char **argv)
        if (strcmp(argv[0], "migrate") == 0)
                migrate_mode = true;
 
-       while ((c = getopt_long(argc, argv, "bc:di:o:p:s:S:",
+       while ((c = getopt_long(argc, argv, "bc:di:m:o:p:s:S:",
                                long_opts, NULL)) >= 0) {
                switch (c) {
                case 0:
@@ -742,7 +936,7 @@ static int lfs_setstripe(int argc, char **argv)
                case 'b':
                        if (!migrate_mode) {
                                fprintf(stderr, "--block is valid only for"
-                                               " migrate mode");
+                                               " migrate mode\n");
                                return CMD_HELP;
                        }
                        migration_flags |= MIGRATION_BLOCKS;
@@ -760,8 +954,9 @@ static int lfs_setstripe(int argc, char **argv)
                        delete = 1;
                        break;
                case 'o':
-                       nr_osts = parse_targets(osts, ARRAY_SIZE(osts), nr_osts,
-                                               optarg);
+                       nr_osts = parse_targets(osts,
+                                               sizeof(osts) / sizeof(__u32),
+                                               nr_osts, optarg);
                        if (nr_osts < 0) {
                                fprintf(stderr,
                                        "error: %s: bad OST indices '%s'\n",
@@ -780,6 +975,14 @@ static int lfs_setstripe(int argc, char **argv)
 #endif
                        stripe_off_arg = optarg;
                        break;
+               case 'm':
+                       if (!migrate_mode) {
+                               fprintf(stderr, "--mdt-index is valid only for"
+                                               " migrate mode\n");
+                               return CMD_HELP;
+                       }
+                       mdt_idx_arg = optarg;
+                       break;
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
                case 's':
 #if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
@@ -815,6 +1018,12 @@ static int lfs_setstripe(int argc, char **argv)
                return CMD_HELP;
        }
 
+       if (mdt_idx_arg != NULL && optind > 3) {
+               fprintf(stderr, "error: %s: cannot specify -m with other "
+                       "options\n", argv[0]);
+               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",
@@ -851,33 +1060,46 @@ 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);
+       if (mdt_idx_arg != NULL) {
+               /* initialize migrate mdt parameters */
+               migrate_mdt_param.fp_mdt_index = strtoul(mdt_idx_arg, &end, 0);
+               if (*end != '\0') {
+                       fprintf(stderr, "error: %s: bad MDT index '%s'\n",
+                               argv[0], mdt_idx_arg);
+                       return CMD_HELP;
+               }
+               migrate_mdt_param.fp_migrate = 1;
+       } else {
+               /* 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_is_specific = true;
-               param->lsp_stripe_count = nr_osts;
-               memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts);
+               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);
+                               free(param);
+                               return CMD_HELP;
+                       }
+
+                       param->lsp_is_specific = true;
+                       param->lsp_stripe_count = nr_osts;
+                       memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts);
+               }
        }
 
-       do {
+       for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
                if (!migrate_mode) {
                        result = llapi_file_open_param(fname,
                                                       O_CREAT | O_WRONLY,
@@ -886,21 +1108,25 @@ static int lfs_setstripe(int argc, char **argv)
                                close(result);
                                result = 0;
                        }
+               } else if (mdt_idx_arg != NULL) {
+                       result = llapi_migrate_mdt(fname, &migrate_mdt_param);
                } else {
                        result = lfs_migrate(fname, migration_flags, param);
                }
                if (result) {
+                       /* Save the first error encountered. */
+                       if (result2 == 0)
+                               result2 = result;
                        fprintf(stderr,
-                               "error: %s: %s stripe file '%s' failed\n",
+                               "error: %s: %s file '%s' failed\n",
                                argv[0], migrate_mode ? "migrate" : "create",
                                fname);
-                       break;
+                       continue;
                }
-               fname = argv[++optind];
-       } while (fname != NULL);
+       }
 
        free(param);
-       return result;
+       return result2;
 }
 
 static int lfs_poollist(int argc, char **argv)
@@ -1842,7 +2068,7 @@ static int lfs_mv(int argc, char **argv)
        }
 
        param.fp_migrate = 1;
-       rc = llapi_mv(argv[optind], &param);
+       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,
@@ -2207,206 +2433,6 @@ static int lfs_join(int argc, char **argv)
 }
 
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotacheck(int argc, char **argv)
-{
-        int c, check_type = 0;
-        char *mnt;
-        struct if_quotacheck qchk;
-        struct if_quotactl qctl;
-        char *obd_type = (char *)qchk.obd_type;
-        int rc;
-
-        memset(&qchk, 0, sizeof(qchk));
-
-        while ((c = getopt(argc, argv, "gu")) != -1) {
-                switch (c) {
-                case 'u':
-                        check_type |= 0x01;
-                        break;
-                case 'g':
-                        check_type |= 0x02;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-
-        if (check_type)
-                check_type--;
-        else    /* do quotacheck for both user & group quota by default */
-                check_type = 0x02;
-
-        if (argc == optind)
-                return CMD_HELP;
-
-        mnt = argv[optind];
-
-        rc = llapi_quotacheck(mnt, check_type);
-       if (rc == -EOPNOTSUPP) {
-               fprintf(stderr, "error: quotacheck not supported by the quota "
-                       "master.\nPlease note that quotacheck is deprecated as "
-                       "of lustre 2.4.0 since space accounting is always "
-                       "enabled.\nFilesystems not formatted with 2.4 utils or "
-                       "beyond can be upgraded with tunefs.lustre --quota.\n");
-               return rc;
-       } else if (rc) {
-                fprintf(stderr, "quotacheck failed: %s\n", strerror(-rc));
-                return rc;
-        }
-
-        rc = llapi_poll_quotacheck(mnt, &qchk);
-        if (rc) {
-                if (*obd_type)
-                        fprintf(stderr, "%s %s ", obd_type,
-                                obd_uuid2str(&qchk.obd_uuid));
-                fprintf(stderr, "quota check failed: %s\n", strerror(-rc));
-                return rc;
-        }
-
-        memset(&qctl, 0, sizeof(qctl));
-        qctl.qc_cmd = LUSTRE_Q_QUOTAON;
-        qctl.qc_type = check_type;
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc && rc != -EALREADY) {
-                if (*obd_type)
-                        fprintf(stderr, "%s %s ", (char *)qctl.obd_type,
-                                obd_uuid2str(&qctl.obd_uuid));
-                fprintf(stderr, "%s turn on quota failed: %s\n",
-                        argv[0], strerror(-rc));
-                return rc;
-        }
-
-        return 0;
-}
-
-static int lfs_quotaon(int argc, char **argv)
-{
-        int c;
-        char *mnt;
-        struct if_quotactl qctl;
-        char *obd_type = (char *)qctl.obd_type;
-        int rc;
-
-        memset(&qctl, 0, sizeof(qctl));
-        qctl.qc_cmd = LUSTRE_Q_QUOTAON;
-
-        while ((c = getopt(argc, argv, "fgu")) != -1) {
-                switch (c) {
-                case 'u':
-                        qctl.qc_type |= 0x01;
-                        break;
-                case 'g':
-                        qctl.qc_type |= 0x02;
-                        break;
-                case 'f':
-                        qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-
-        if (qctl.qc_type)
-                qctl.qc_type--;
-        else /* by default, enable quota for both user & group */
-                qctl.qc_type = 0x02;
-
-        if (argc == optind)
-                return CMD_HELP;
-
-        mnt = argv[optind];
-
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc) {
-                if (rc == -EOPNOTSUPP) {
-                        fprintf(stderr, "error: quotaon not supported by the "
-                                "quota master.\nPlease note that quotaon/off is"
-                                " deprecated as of lustre 2.4.0.\nQuota "
-                                "enforcement should now be enabled on the MGS "
-                                "via:\nmgs# lctl conf_param ${FSNAME}.quota."
-                                "<ost|mdt>=<u|g|ug>\n(ost for block quota, mdt "
-                                "for inode quota, u for user and g for group"
-                                "\n");
-                } else if (rc == -EALREADY) {
-                        rc = 0;
-                } else if (rc == -ENOENT) {
-                        fprintf(stderr, "error: cannot find quota database, "
-                                        "make sure you have run quotacheck\n");
-                } else {
-                        if (*obd_type)
-                                fprintf(stderr, "%s %s ", obd_type,
-                                        obd_uuid2str(&qctl.obd_uuid));
-                        fprintf(stderr, "%s failed: %s\n", argv[0],
-                                strerror(-rc));
-                }
-        }
-
-        return rc;
-}
-
-static int lfs_quotaoff(int argc, char **argv)
-{
-        int c;
-        char *mnt;
-        struct if_quotactl qctl;
-        char *obd_type = (char *)qctl.obd_type;
-        int rc;
-
-        memset(&qctl, 0, sizeof(qctl));
-        qctl.qc_cmd = LUSTRE_Q_QUOTAOFF;
-
-        while ((c = getopt(argc, argv, "gu")) != -1) {
-                switch (c) {
-                case 'u':
-                        qctl.qc_type |= 0x01;
-                        break;
-                case 'g':
-                        qctl.qc_type |= 0x02;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-
-        if (qctl.qc_type)
-                qctl.qc_type--;
-        else /* by default, disable quota for both user & group */
-                qctl.qc_type = 0x02;
-
-        if (argc == optind)
-                return CMD_HELP;
-
-        mnt = argv[optind];
-
-        rc = llapi_quotactl(mnt, &qctl);
-        if (rc) {
-                if (rc == -EOPNOTSUPP) {
-                        fprintf(stderr, "error: quotaoff not supported by the "
-                                "quota master.\nPlease note that quotaon/off is"
-                                " deprecated as of lustre 2.4.0.\nQuota "
-                                "enforcement can be disabled on the MGS via:\n"
-                                "mgs# lctl conf_param ${FSNAME}.quota.<ost|mdt>"
-                                "=\"\"\n");
-                } else if (rc == -EALREADY) {
-                        rc = 0;
-                } else {
-                        if (*obd_type)
-                                fprintf(stderr, "%s %s ", obd_type,
-                                        obd_uuid2str(&qctl.obd_uuid));
-                        fprintf(stderr, "quotaoff failed: %s\n",
-                                strerror(-rc));
-                }
-        }
-
-        return rc;
-}
-
 #define ARG2INT(nr, str, msg)                                           \
 do {                                                                    \
         char *endp;                                                     \
@@ -3750,12 +3776,15 @@ static int lfs_hsm_action(int argc, char **argv)
 
                if ((hps == HPS_RUNNING) &&
                    (hua == HUA_ARCHIVE || hua == HUA_RESTORE))
-                       printf("("LPX64 " bytes moved)\n", he.length);
+                       printf("(%llu bytes moved)\n",
+                              (unsigned long long)he.length);
                else if ((he.offset + he.length) == LUSTRE_EOF)
-                       printf("(from "LPX64 " to EOF)\n", he.offset);
+                       printf("(from %llu to EOF)\n",
+                              (unsigned long long)he.offset);
                else
-                       printf("(from "LPX64 " to "LPX64")\n",
-                              he.offset, he.offset + he.length);
+                       printf("(from %llu to %llu)\n",
+                              (unsigned long long)he.offset,
+                              (unsigned long long)(he.offset + he.length));
 
        } while (++i < argc);
 
@@ -3781,7 +3810,7 @@ static int lfs_hsm_clear(int argc, char **argv)
  *
  * \return 0 on success.
  */
-static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid,
+static int lfs_hsm_prepare_file(const char *file, struct lu_fid *fid,
                                dev_t *last_dev)
 {
        struct stat     st;
@@ -3816,16 +3845,62 @@ static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid,
        return 0;
 }
 
+/* Fill an HSM HUR item with a given file name.
+ *
+ * If mntpath is set, then the filename is actually a FID, and no
+ * lookup on the filesystem will be performed.
+ *
+ * \param[in]  hur         the user request to fill
+ * \param[in]  idx         index of the item inside the HUR to fill
+ * \param[in]  mntpath     mountpoint of Lustre
+ * \param[in]  fname       filename (if mtnpath is NULL)
+ *                         or FID (if mntpath is set)
+ * \param[in]  last_dev    pointer to last device id used
+ *
+ * \retval 0 on success
+ * \retval CMD_HELP or a negative errno on error
+ */
+static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx,
+                        const char *mntpath, const char *fname,
+                        dev_t *last_dev)
+{
+       struct hsm_user_item *hui = &hur->hur_user_item[idx];
+       int rc;
+
+       hui->hui_extent.length = -1;
+
+       if (mntpath != NULL) {
+               if (*fname == '[')
+                       fname++;
+               rc = sscanf(fname, SFID, RFID(&hui->hui_fid));
+               if (rc == 3) {
+                       rc = 0;
+               } else {
+                       fprintf(stderr, "hsm: '%s' is not a valid FID\n",
+                               fname);
+                       rc = -EINVAL;
+               }
+       } else {
+               rc = lfs_hsm_prepare_file(fname, &hui->hui_fid, last_dev);
+       }
+
+       if (rc == 0)
+               hur->hur_request.hr_itemcount++;
+
+       return rc;
+}
+
 static int lfs_hsm_request(int argc, char **argv, int action)
 {
        struct option            long_opts[] = {
                {"filelist", 1, 0, 'l'},
                {"data", 1, 0, 'D'},
                {"archive", 1, 0, 'a'},
+               {"mntpath", 1, 0, 'm'},
                {0, 0, 0, 0}
        };
        dev_t                    last_dev = 0;
-       char                     short_opts[] = "l:D:a:";
+       char                     short_opts[] = "l:D:a:m:";
        struct hsm_user_request *hur, *oldhur;
        int                      c, i;
        size_t                   len;
@@ -3838,7 +3913,8 @@ static int lfs_hsm_request(int argc, char **argv, int action)
        int                      archive_id = 0;
        FILE                    *fp;
        int                      nbfile_alloc = 0;
-       char                     some_file[PATH_MAX+1] = "";
+       char                    *some_file = NULL;
+       char                    *mntpath = NULL;
        int                      rc;
 
        if (argc < 2)
@@ -3854,14 +3930,21 @@ static int lfs_hsm_request(int argc, char **argv, int action)
                        opaque = optarg;
                        break;
                case 'a':
-                       if (action != HUA_ARCHIVE) {
+                       if (action != HUA_ARCHIVE &&
+                           action != HUA_REMOVE) {
                                fprintf(stderr,
                                        "error: -a is supported only "
-                                       "when archiving\n");
+                                       "when archiving or removing\n");
                                return CMD_HELP;
                        }
                        archive_id = atoi(optarg);
                        break;
+               case 'm':
+                       if (some_file == NULL) {
+                               mntpath = optarg;
+                               some_file = strdup(optarg);
+                       }
+                       break;
                case '?':
                        return CMD_HELP;
                default:
@@ -3895,20 +3978,12 @@ 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) {
-               if (strlen(argv[optind]) > sizeof(some_file)-1) {
-                       free(hur);
-                       return -E2BIG;
-               }
-               strncpy(some_file, argv[optind], sizeof(some_file));
-       }
+       if (nbfile != 0 && some_file == NULL)
+               some_file = strdup(argv[optind]);
 
        for (i = 0; i < nbfile; i++) {
-               hur->hur_user_item[i].hui_extent.length = -1;
-               rc = lfs_hsm_prepare_file(argv[optind + i],
-                                         &hur->hur_user_item[i].hui_fid,
-                                         &last_dev);
-               hur->hur_request.hr_itemcount++;
+               rc = fill_hur_item(hur, i, mntpath, argv[optind + i],
+                                  &last_dev);
                if (rc)
                        goto out_free;
        }
@@ -3926,12 +4001,11 @@ static int lfs_hsm_request(int argc, char **argv, int action)
                }
 
                while ((rc = getline(&line, &len, fp)) != -1) {
-                       struct hsm_user_item *hui;
-
-                       /* If allocated buffer was too small, gets something
-                        * bigger */
+                       /* If allocated buffer was too small, get something
+                        * larger */
                        if (nbfile_alloc <= hur->hur_request.hr_itemcount) {
                                ssize_t size;
+
                                nbfile_alloc = nbfile_alloc * 2 + 1;
                                oldhur = hur;
                                hur = llapi_hsm_user_request_alloc(nbfile_alloc,
@@ -3965,25 +4039,21 @@ static int lfs_hsm_request(int argc, char **argv, int action)
                        if (line[strlen(line) - 1] == '\n')
                                line[strlen(line) - 1] = '\0';
 
-                       hui =
-                            &hur->hur_user_item[hur->hur_request.hr_itemcount];
-                       hui->hui_extent.length = -1;
-                       rc = lfs_hsm_prepare_file(line, &hui->hui_fid,
-                                                 &last_dev);
-                       hur->hur_request.hr_itemcount++;
+                       rc = fill_hur_item(hur, hur->hur_request.hr_itemcount,
+                                          mntpath, line, &last_dev);
                        if (rc) {
                                fclose(fp);
                                goto out_free;
                        }
 
-                       if ((some_file[0] == '\0') &&
-                           (strlen(line) < sizeof(some_file)))
-                               strcpy(some_file, line);
+                       if (some_file == NULL) {
+                               some_file = line;
+                               line = NULL;
+                       }
                }
 
                rc = fclose(fp);
-               if (line)
-                       free(line);
+               free(line);
        }
 
        /* If a --data was used, add it to the request */
@@ -4004,6 +4074,7 @@ static int lfs_hsm_request(int argc, char **argv, int action)
        }
 
 out_free:
+       free(some_file);
        free(hur);
        return rc;
 }
@@ -4055,6 +4126,7 @@ int main(int argc, char **argv)
 
        Parser_init("lfs > ", cmdlist);
 
+       progname = argv[0]; /* Used in error messages */
         if (argc > 1) {
                 rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
         } else {