Whamcloud - gitweb
LU-2714 hsm: limit MDT-side allocations for HSM RPCs
[fs/lustre-release.git] / lustre / utils / lfs.c
index 7a0198f..8fef145 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 /* For dirname() */
 #include <libgen.h>
 
-#include <lnet/api-support.h>
 #include <lnet/lnetctl.h>
 
 #include <liblustre.h>
-#include <lustre/lustre_idl.h>
-#include <lustre/liblustreapi.h>
-#include <lustre/lustre_user.h>
-#include <lustre_quota.h>
+#include <lustre/lustreapi.h>
 
 #include <libcfs/libcfsutil.h>
 #include "obdctl.h"
 
-unsigned int libcfs_subsystem_debug = 0;
-
 /* all functions */
 static int lfs_setstripe(int argc, char **argv);
 static int lfs_find(int argc, char **argv);
 static int lfs_getstripe(int argc, char **argv);
+static int lfs_getdirstripe(int argc, char **argv);
+static int lfs_setdirstripe(int argc, char **argv);
+static int lfs_rmentry(int argc, char **argv);
 static int lfs_osts(int argc, char **argv);
 static int lfs_mdts(int argc, char **argv);
 static int lfs_df(int argc, char **argv);
 static int lfs_getname(int argc, char **argv);
 static int lfs_check(int argc, char **argv);
-static int lfs_catinfo(int argc, char **argv);
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotachown(int argc, char **argv);
 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);
-static int lfs_quotainv(int argc, char **argv);
 #endif
 static int lfs_flushctx(int argc, char **argv);
 static int lfs_join(int argc, char **argv);
@@ -115,6 +107,16 @@ static int lfs_changelog_clear(int argc, char **argv);
 static int lfs_fid2path(int argc, char **argv);
 static int lfs_path2fid(int argc, char **argv);
 static int lfs_data_version(int argc, char **argv);
+static int lfs_hsm_state(int argc, char **argv);
+static int lfs_hsm_set(int argc, char **argv);
+static int lfs_hsm_clear(int argc, char **argv);
+static int lfs_hsm_action(int argc, char **argv);
+static int lfs_hsm_archive(int argc, char **argv);
+static int lfs_hsm_restore(int argc, char **argv);
+static int lfs_hsm_release(int argc, char **argv);
+static int lfs_hsm_remove(int argc, char **argv);
+static int lfs_hsm_cancel(int argc, char **argv);
+static int lfs_swap_layouts(int argc, char **argv);
 
 /* all avaialable commands */
 command_t cmdlist[] = {
@@ -142,6 +144,27 @@ command_t cmdlist[] = {
          "                 [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
          "                 [--mdt-index|-M] [--recursive|-r] [--raw|-R]\n"
          "                 <directory|filename> ..."},
+       {"setdirstripe", lfs_setdirstripe, 0,
+        "To create a remote directory on a specified MDT.\n"
+        "usage: setdirstripe <--index|-i mdt_index> <dir>\n"
+        "\tmdt_index:    MDT index of first stripe\n"},
+       {"getdirstripe", lfs_getdirstripe, 0,
+        "To list the striping info for a given directory\n"
+        "or recursively for all directories in a directory tree.\n"
+        "usage: getdirstripe [--obd|-O <uuid>] [--quiet|-q] [--verbose|-v]\n"
+        "               [--count|-c ] [--index|-i ] [--raw|-R]\n"
+        "               [--recursive | -r] <dir> ..."},
+       {"mkdir", lfs_setdirstripe, 0,
+        "To create a remote directory on a specified MDT. And this can only\n"
+        "be done on MDT0 by administrator.\n"
+        "usage: mkdir <--index|-i mdt_index> <dir>\n"
+        "\tmdt_index:    MDT index of the remote directory.\n"},
+       {"rm_entry", lfs_rmentry, 0,
+        "To remove the name entry of the remote directory. Note: This\n"
+        "command will only delete the name entry, i.e. the remote directory\n"
+        "will become inaccessable after this command. This can only be done\n"
+        "by the administrator\n"
+        "usage: rm_entry <dir>\n"},
         {"pool_list", lfs_poollist, 0,
          "List pools or pool OSTs\n"
          "usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
@@ -165,11 +188,6 @@ command_t cmdlist[] = {
          "Display the status of MDS or OSTs (as specified in the command)\n"
          "or all the servers (MDS and OSTs).\n"
          "usage: check <osts|mds|servers>"},
-        {"catinfo", lfs_catinfo, 0,
-         "Show information of specified type logs.\n"
-         "usage: catinfo {keyword} [node name]\n"
-         "\tkeywords are one of followings: config, deletions.\n"
-         "\tnode name must be provided when use keyword config."},
         {"join", lfs_join, 0,
          "join two lustre files into one.\n"
          "obsolete, HEAD does not support it anymore.\n"},
@@ -180,28 +198,25 @@ command_t cmdlist[] = {
         {"df", lfs_df, 0,
          "report filesystem disk space usage or inodes usage"
          "of each MDS and all OSDs or a batch belonging to a specific pool .\n"
-         "Usage: df [-i] [-h] [--pool|-p <fsname>[.<pool>] [path]"},
+         "Usage: df [-i] [-h] [--lazy|-l] [--pool|-p <fsname>[.<pool>] [path]"},
         {"getname", lfs_getname, 0, "list instances and specified mount points "
          "[for specified path only]\n"
          "Usage: getname [-h]|[path ...] "},
 #ifdef HAVE_SYS_QUOTA_H
-        {"quotachown",lfs_quotachown, 0,
-         "Change files' owner or group on the specified filesystem.\n"
-         "usage: quotachown [-i] <filesystem>\n"
-         "\t-i: ignore error if file is not exist\n"},
         {"quotacheck", lfs_quotacheck, 0,
          "Scan the specified filesystem for disk usage, and create,\n"
-         "or update quota files.\n"
+         "or update quota files. Deprecated as of 2.4.0.\n"
          "usage: quotacheck [ -ug ] <filesystem>"},
-        {"quotaon", lfs_quotaon, 0, "Turn filesystem quotas on.\n"
+        {"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.\n"
+        {"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"
          "                -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
-         "       setquota -t <-u|-g> <block-grace> <inode-grace> <filesystem>\n"
          "       setquota <-u|--user|-g|--group> <uname>|<uid>|<gname>|<gid>\n"
          "                [--block-softlimit <block-softlimit>]\n"
          "                [--block-hardlimit <block-hardlimit>]\n"
@@ -218,8 +233,6 @@ command_t cmdlist[] = {
          "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
          "             [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
          "       quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
-        {"quotainv", lfs_quotainv, 0, "Invalidate quota data.\n"
-         "usage: quotainv [-u|-g] <filesystem>"},
 #endif
         {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n"
          "usage: flushctx [-k] [mountpoint...]"},
@@ -259,6 +272,35 @@ command_t cmdlist[] = {
          "usage: path2fid <path>"},
         {"data_version", lfs_data_version, 0, "Display file data version for "
          "a given path.\n" "usage: data_version [-n] <path>"},
+       {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, "
+        "undergoing actions) for given files.\n usage: hsm_state <file> ..."},
+       {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n"
+        "usage: hsm_set [--norelease] [--noarchive] [--dirty] [--exists] "
+        "[--archived] [--lost] <file> ..."},
+       {"hsm_clear", lfs_hsm_clear, 0, "Clear HSM user flag on specified "
+        "files.\n"
+        "usage: hsm_clear [--norelease] [--noarchive] [--dirty] [--exists] "
+        "[--archived] [--lost] <file> ..."},
+       {"hsm_action", lfs_hsm_action, 0, "Display current HSM request for "
+        "given files.\n" "usage: hsm_action <file> ..."},
+       {"hsm_archive", lfs_hsm_archive, 0,
+        "Archive file to external storage.\n"
+        "usage: hsm_archive [--filelist FILELIST] [--data DATA] [--archive NUM] "
+        "<file> ..."},
+       {"hsm_restore", lfs_hsm_restore, 0,
+        "Restore file from external storage.\n"
+        "usage: hsm_restore [--filelist FILELIST] [--data DATA] <file> ..."},
+       {"hsm_release", lfs_hsm_release, 0,
+        "Release files from Lustre.\n"
+        "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> ..."},
+       {"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>"},
         {"help", Parser_help, 0, "help"},
         {"exit", Parser_quit, 0, "quit"},
         {"quit", Parser_quit, 0, "quit"},
@@ -583,6 +625,7 @@ static int lfs_find(int argc, char **argv)
                 {"mdt",          required_argument, 0, 'm'},
                 {"mtime",        required_argument, 0, 'M'},
                 {"name",         required_argument, 0, 'n'},
+     /* reserve {"or",           no_argument,     , 0, 'o'}, to match find(1) */
                 {"obd",          required_argument, 0, 'O'},
                 {"ost",          required_argument, 0, 'O'},
                 /* no short option for pool, p/P already used */
@@ -902,7 +945,8 @@ err:
         return ret;
 }
 
-static int lfs_getstripe(int argc, char **argv)
+static int lfs_getstripe_internal(int argc, char **argv,
+                                 struct find_param *param)
 {
         struct option long_opts[] = {
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
@@ -957,127 +1001,126 @@ static int lfs_getstripe(int argc, char **argv)
                 {0, 0, 0, 0}
         };
         int c, rc;
-        struct find_param param = { 0 };
 
-        param.maxdepth = 1;
-        optind = 0;
-        while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsSv",
-                                long_opts, NULL)) != -1) {
-                switch (c) {
-                case 'O':
-                        if (param.obduuid) {
-                                fprintf(stderr,
-                                        "error: %s: only one obduuid allowed",
-                                        argv[0]);
-                                return CMD_HELP;
-                        }
-                        param.obduuid = (struct obd_uuid *)optarg;
-                        break;
-                case 'q':
-                        param.quiet++;
-                        break;
-                case 'd':
-                        param.maxdepth = 0;
-                        break;
-                case 'r':
-                        param.recursive = 1;
-                        break;
-                case 'v':
-                        param.verbose = VERBOSE_ALL | VERBOSE_DETAIL;
-                        break;
-                case 'c':
+       param->maxdepth = 1;
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "cdghiMoO:pqrRsSv",
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'O':
+                       if (param->obduuid) {
+                               fprintf(stderr,
+                                       "error: %s: only one obduuid allowed",
+                                       argv[0]);
+                               return CMD_HELP;
+                       }
+                       param->obduuid = (struct obd_uuid *)optarg;
+                       break;
+               case 'q':
+                       param->quiet++;
+                       break;
+               case 'd':
+                       param->maxdepth = 0;
+                       break;
+               case 'r':
+                       param->recursive = 1;
+                       break;
+               case 'v':
+                       param->verbose = VERBOSE_ALL | VERBOSE_DETAIL;
+                       break;
+               case 'c':
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --count option"
 #elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
-                        if (strcmp(argv[optind - 1], "--count") == 0)
-                                fprintf(stderr, "warning: '--count' deprecated,"
-                                        " use '--stripe-count' instead\n");
+                       if (strcmp(argv[optind - 1], "--count") == 0)
+                               fprintf(stderr, "warning: '--count' deprecated,"
+                                       " use '--stripe-count' instead\n");
 #endif
-                        if (!(param.verbose & VERBOSE_DETAIL)) {
-                                param.verbose |= VERBOSE_COUNT;
-                                param.maxdepth = 0;
-                        }
-                        break;
-                case 's':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_COUNT;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 's':
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --size option"
 #elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
-                        fprintf(stderr, "warning: '--size|-s' deprecated, "
-                                "use '--stripe-size|-S' instead\n");
+                       fprintf(stderr, "warning: '--size|-s' deprecated, "
+                               "use '--stripe-size|-S' instead\n");
 #endif
-                case 'S':
-                        if (!(param.verbose & VERBOSE_DETAIL)) {
-                                param.verbose |= VERBOSE_SIZE;
-                                param.maxdepth = 0;
-                        }
-                        break;
-                case 'o':
+               case 'S':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_SIZE;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'o':
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0)
-                        fprintf(stderr, "warning: '--offset|-o' deprecated, "
-                                "use '--stripe-index|-i' instead\n");
+                       fprintf(stderr, "warning: '--offset|-o' deprecated, "
+                               "use '--stripe-index|-i' instead\n");
 #else
-                        if (strcmp(argv[optind - 1], "--offset") == 0)
-                                /* need --stripe-index established first */
-                                fprintf(stderr, "warning: '--offset' deprecated"
-                                        ", use '--index' instead\n");
+                       if (strcmp(argv[optind - 1], "--offset") == 0)
+                               /* need --stripe-index established first */
+                               fprintf(stderr, "warning: '--offset' deprecated"
+                                       ", use '--index' instead\n");
 #endif
-                case 'i':
+               case 'i':
 #if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
 #warning "remove deprecated --offset and --index options"
 #elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0)
-                        if (strcmp(argv[optind - 1], "--index") == 0)
-                                fprintf(stderr, "warning: '--index' deprecated"
-                                        ", use '--stripe-index' instead\n");
+                       if (strcmp(argv[optind - 1], "--index") == 0)
+                               fprintf(stderr, "warning: '--index' deprecated"
+                                       ", use '--stripe-index' instead\n");
 #endif
-                        if (!(param.verbose & VERBOSE_DETAIL)) {
-                                param.verbose |= VERBOSE_OFFSET;
-                                param.maxdepth = 0;
-                        }
-                        break;
-                case 'p':
-                        if (!(param.verbose & VERBOSE_DETAIL)) {
-                                param.verbose |= VERBOSE_POOL;
-                                param.maxdepth = 0;
-                        }
-                        break;
-                case 'g':
-                        if (!(param.verbose & VERBOSE_DETAIL)) {
-                                param.verbose |= VERBOSE_GENERATION;
-                                param.maxdepth = 0;
-                        }
-                        break;
-                case 'M':
-                        if (!(param.verbose & VERBOSE_DETAIL))
-                                param.maxdepth = 0;
-                        param.verbose |= VERBOSE_MDTINDEX;
-                        break;
-                case 'R':
-                        param.raw = 1;
-                        break;
-                default:
-                        return CMD_HELP;
-                }
-        }
-
-        if (optind >= argc)
-                return CMD_HELP;
-
-        if (param.recursive)
-                param.maxdepth = -1;
-
-        if (!param.verbose)
-                param.verbose = VERBOSE_ALL;
-        if (param.quiet)
-                param.verbose = VERBOSE_OBJID;
-
-        do {
-                rc = llapi_getstripe(argv[optind], &param);
-        } while (++optind < argc && !rc);
-
-        if (rc)
-                fprintf(stderr, "error: %s failed for %s.\n",
-                        argv[0], argv[optind - 1]);
-        return rc;
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_OFFSET;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'p':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_POOL;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'g':
+                       if (!(param->verbose & VERBOSE_DETAIL)) {
+                               param->verbose |= VERBOSE_GENERATION;
+                               param->maxdepth = 0;
+                       }
+                       break;
+               case 'M':
+                       if (!(param->verbose & VERBOSE_DETAIL))
+                               param->maxdepth = 0;
+                       param->verbose |= VERBOSE_MDTINDEX;
+                       break;
+               case 'R':
+                       param->raw = 1;
+                       break;
+               default:
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind >= argc)
+               return CMD_HELP;
+
+       if (param->recursive)
+               param->maxdepth = -1;
+
+       if (!param->verbose)
+               param->verbose = VERBOSE_ALL;
+       if (param->quiet)
+               param->verbose = VERBOSE_OBJID;
+
+       do {
+               rc = llapi_getstripe(argv[optind], param);
+       } while (++optind < argc && !rc);
+
+       if (rc)
+               fprintf(stderr, "error: %s failed for %s.\n",
+                       argv[0], argv[optind - 1]);
+       return rc;
 }
 
 static int lfs_tgts(int argc, char **argv)
@@ -1118,6 +1161,117 @@ static int lfs_tgts(int argc, char **argv)
         return rc;
 }
 
+static int lfs_getstripe(int argc, char **argv)
+{
+       struct find_param param = { 0 };
+       return lfs_getstripe_internal(argc, argv, &param);
+}
+
+/* functions */
+static int lfs_getdirstripe(int argc, char **argv)
+{
+       struct find_param param = { 0 };
+
+       param.get_lmv = 1;
+       return lfs_getstripe_internal(argc, argv, &param);
+}
+
+/* functions */
+static int lfs_setdirstripe(int argc, char **argv)
+{
+       char *dname;
+       int result;
+       int  st_offset, st_count;
+       char *end;
+       int c;
+       char *stripe_off_arg = NULL;
+       int  flags = 0;
+
+       struct option long_opts[] = {
+               {"index",    required_argument, 0, 'i'},
+               {0, 0, 0, 0}
+       };
+
+       st_offset = -1;
+       st_count = 1;
+       optind = 0;
+       while ((c = getopt_long(argc, argv, "i:o",
+                               long_opts, NULL)) >= 0) {
+               switch (c) {
+               case 0:
+                       /* Long options. */
+                       break;
+               case 'i':
+                       stripe_off_arg = optarg;
+                       break;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' "
+                                       "unrecognized\n",
+                                       argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       if (optind == argc) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       dname = argv[optind];
+       if (stripe_off_arg == NULL) {
+               fprintf(stderr, "error: %s: missing stripe_off.\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+       /* get the stripe offset */
+       st_offset = strtoul(stripe_off_arg, &end, 0);
+       if (*end != '\0') {
+               fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
+                       argv[0], stripe_off_arg);
+               return CMD_HELP;
+       }
+       do {
+               result = llapi_dir_create_pool(dname, flags, st_offset,
+                                              st_count, 0, NULL);
+               if (result) {
+                       fprintf(stderr, "error: %s: create stripe dir '%s' "
+                               "failed\n", argv[0], dname);
+                       break;
+               }
+               dname = argv[++optind];
+       } while (dname != NULL);
+
+       return result;
+}
+
+/* functions */
+static int lfs_rmentry(int argc, char **argv)
+{
+       char *dname;
+       int   index;
+       int   result = 0;
+
+       if (argc <= 1) {
+               fprintf(stderr, "error: %s: missing dirname\n",
+                       argv[0]);
+               return CMD_HELP;
+       }
+
+       index = 1;
+       dname = argv[index];
+       while (dname != NULL) {
+               result = llapi_direntry_remove(dname);
+               if (result) {
+                       fprintf(stderr, "error: %s: remove dir entry '%s' "
+                               "failed\n", argv[0], dname);
+                       break;
+               }
+               dname = argv[++index];
+       }
+       return result;
+}
+
 static int lfs_osts(int argc, char **argv)
 {
         return lfs_tgts(argc, argv);
@@ -1230,7 +1384,8 @@ struct ll_stat_type {
         char *st_name;
 };
 
-static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
+static int mntdf(char *mntdir, char *fsname, char *pool, int ishow,
+               int cooked, int lazy)
 {
         struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
         struct obd_uuid uuid_buf;
@@ -1240,6 +1395,7 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
                                         { 0, NULL } };
         struct ll_stat_type *tp;
         __u32 index;
+        __u32 type;
         int rc;
 
         if (pool) {
@@ -1267,7 +1423,8 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
                 for (index = 0; ; index++) {
                         memset(&stat_buf, 0, sizeof(struct obd_statfs));
                         memset(&uuid_buf, 0, sizeof(struct obd_uuid));
-                        rc = llapi_obd_statfs(mntdir, tp->st_op, index,
+                       type = lazy ? tp->st_op | LL_STATFS_NODELAY : tp->st_op;
+                       rc = llapi_obd_statfs(mntdir, type, index,
                                               &stat_buf, &uuid_buf);
                         if (rc == -ENODEV)
                                 break;
@@ -1284,9 +1441,9 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked)
                          * it in so that we can print an error message. */
                         if (uuid_buf.uuid[0] == '\0')
                                 sprintf(uuid_buf.uuid, "%s%04x",
-                                       tp->st_name, index);
-                       showdf(mntdir,&stat_buf,obd_uuid2str(&uuid_buf),
-                              ishow, cooked, tp->st_name, index, rc);
+                                        tp->st_name, index);
+                        showdf(mntdir, &stat_buf, obd_uuid2str(&uuid_buf),
+                               ishow, cooked, tp->st_name, index, rc);
 
                         if (rc == 0) {
                                 if (tp->st_op == LL_STATFS_LMV) {
@@ -1316,15 +1473,17 @@ static int lfs_df(int argc, char **argv)
 {
         char mntdir[PATH_MAX] = {'\0'}, path[PATH_MAX] = {'\0'};
         int ishow = 0, cooked = 0;
+       int lazy = 0;
         int c, rc = 0, index = 0;
         char fsname[PATH_MAX] = "", *pool_name = NULL;
         struct option long_opts[] = {
                 {"pool", required_argument, 0, 'p'},
+                {"lazy", 0, 0, 'l'},
                 {0, 0, 0, 0}
         };
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, "hip:", long_opts, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "hilp:", long_opts, NULL)) != -1) {
                 switch (c) {
                 case 'i':
                         ishow = 1;
@@ -1332,6 +1491,8 @@ static int lfs_df(int argc, char **argv)
                 case 'h':
                         cooked = 1;
                         break;
+                case 'l':
+                        lazy = 1;
                 case 'p':
                         pool_name = optarg;
                         break;
@@ -1351,7 +1512,7 @@ static int lfs_df(int argc, char **argv)
                 if (mntdir[0] == '\0')
                         continue;
 
-                rc = mntdf(mntdir, fsname, pool_name, ishow, cooked);
+               rc = mntdf(mntdir, fsname, pool_name, ishow, cooked, lazy);
                 if (rc || path[0] != '\0')
                         break;
                 fsname[0] = '\0'; /* avoid matching in next loop */
@@ -1447,31 +1608,6 @@ static int lfs_check(int argc, char **argv)
 
 }
 
-static int lfs_catinfo(int argc, char **argv)
-{
-        char mntdir[PATH_MAX] = {'\0'};
-        int rc;
-
-        if (argc < 2 || (!strcmp(argv[1],"config") && argc < 3))
-                return CMD_HELP;
-
-        if (strcmp(argv[1], "config") && strcmp(argv[1], "deletions"))
-                return CMD_HELP;
-
-        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
-        if (rc == 0 && mntdir[0] != '\0') {
-                if (argc == 3)
-                        rc = llapi_catinfo(mntdir, argv[1], argv[2]);
-                else
-                        rc = llapi_catinfo(mntdir, argv[1], NULL);
-        } else {
-                fprintf(stderr, "no lustre_lite mounted.\n");
-                rc = -1;
-        }
-
-        return rc;
-}
-
 static int lfs_join(int argc, char **argv)
 {
         fprintf(stderr, "join two lustre files into one.\n"
@@ -1480,32 +1616,6 @@ static int lfs_join(int argc, char **argv)
 }
 
 #ifdef HAVE_SYS_QUOTA_H
-static int lfs_quotachown(int argc, char **argv)
-{
-
-        int c,rc;
-        int flag = 0;
-
-        optind = 0;
-        while ((c = getopt(argc, argv, "i")) != -1) {
-                switch (c) {
-                case 'i':
-                        flag++;
-                        break;
-                default:
-                        fprintf(stderr, "error: %s: option '-%c' "
-                                        "unrecognized\n", argv[0], c);
-                        return CMD_HELP;
-                }
-        }
-        if (optind == argc)
-                return CMD_HELP;
-        rc = llapi_quotachown(argv[optind], flag);
-        if(rc)
-                fprintf(stderr,"error: change file owner/group failed.\n");
-        return rc;
-}
-
 static int lfs_quotacheck(int argc, char **argv)
 {
         int c, check_type = 0;
@@ -1544,7 +1654,14 @@ static int lfs_quotacheck(int argc, char **argv)
         mnt = argv[optind];
 
         rc = llapi_quotacheck(mnt, check_type);
-        if (rc) {
+       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;
         }
@@ -1616,7 +1733,16 @@ static int lfs_quotaon(int argc, char **argv)
 
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
-                if (rc == -EALREADY) {
+                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, "
@@ -1672,7 +1798,14 @@ static int lfs_quotaoff(int argc, char **argv)
 
         rc = llapi_quotactl(mnt, &qctl);
         if (rc) {
-                if (rc == -EALREADY) {
+                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)
@@ -1686,54 +1819,6 @@ static int lfs_quotaoff(int argc, char **argv)
         return rc;
 }
 
-static int lfs_quotainv(int argc, char **argv)
-{
-        int c;
-        char *mnt;
-        struct if_quotactl qctl;
-        int rc;
-
-        memset(&qctl, 0, sizeof(qctl));
-        qctl.qc_cmd = LUSTRE_Q_INVALIDATE;
-
-        optind = 0;
-        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_FINVALIDATE;
-                        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, invalidate 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) {
-                fprintf(stderr, "quotainv failed: %s\n", strerror(-rc));
-                return rc;
-        }
-
-        return 0;
-}
-
 #define ARG2INT(nr, str, msg)                                           \
 do {                                                                    \
         char *endp;                                                     \
@@ -2438,7 +2523,7 @@ static int flushctx_ioctl(char *mp)
 static int lfs_flushctx(int argc, char **argv)
 {
         int     kdestroy = 0, c;
-        FILE   *proc;
+       FILE   *proc = NULL;
         char    procline[PATH_MAX], *line;
         int     rc = 0;
 
@@ -2481,7 +2566,8 @@ static int lfs_flushctx(int argc, char **argv)
                                 fprintf(stderr, "%s: unexpected format in "
                                                 "/proc/mounts\n",
                                         argv[0]);
-                                return -1;
+                               rc = -1;
+                               goto out;
                         }
 
                         if (strcmp(fs, "lustre") != 0)
@@ -2503,6 +2589,9 @@ static int lfs_flushctx(int argc, char **argv)
                 }
         }
 
+out:
+       if (proc != NULL)
+               fclose(proc);
         return rc;
 }
 
@@ -2543,7 +2632,7 @@ static int lfs_ls(int argc, char **argv)
 static int lfs_changelog(int argc, char **argv)
 {
         void *changelog_priv;
-        struct changelog_rec *rec;
+       struct changelog_ext_rec *rec;
         long long startrec = 0, endrec = 0;
         char *mdd;
         struct option long_opts[] = {
@@ -2607,14 +2696,18 @@ static int lfs_changelog(int argc, char **argv)
                        changelog_type2str(rec->cr_type),
                        ts.tm_hour, ts.tm_min, ts.tm_sec,
                        (int)(rec->cr_time & ((1<<30) - 1)),
-                       ts.tm_year+1900, ts.tm_mon+1, ts.tm_mday,
+                       ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday,
                        rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
                 if (rec->cr_namelen)
                         /* namespace rec includes parent and filename */
-                        printf(" p="DFID" %.*s\n", PFID(&rec->cr_pfid),
-                               rec->cr_namelen, rec->cr_name);
-                else
-                        printf("\n");
+                       printf(" p="DFID" %.*s", PFID(&rec->cr_pfid),
+                               rec->cr_namelen, rec->cr_name);
+               if (fid_is_sane(&rec->cr_sfid))
+                       printf(" s="DFID" sp="DFID" %.*s",
+                               PFID(&rec->cr_sfid), PFID(&rec->cr_spfid),
+                               changelog_rec_snamelen(rec),
+                               changelog_rec_sname(rec));
+               printf("\n");
 
                 llapi_changelog_free(&rec);
         }
@@ -2783,14 +2876,446 @@ static int lfs_data_version(int argc, char **argv)
         if (rc) {
                 fprintf(stderr, "can't get version for %s: %s\n", path,
                         strerror(errno = -rc));
-                return rc;
-        }
+       } else
+               printf(LPU64 "\n", data_version);
 
-        printf("%llu\n", data_version);
+       close(fd);
 
-        close(fd);
+       return rc;
+}
 
-        return 0;
+static int lfs_hsm_state(int argc, char **argv)
+{
+       int rc;
+       int i = 1;
+       char *path;
+       struct hsm_user_state hus;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       do {
+               path = argv[i];
+
+               rc = llapi_hsm_state_get(path, &hus);
+               if (rc) {
+                       fprintf(stderr, "can't get hsm state for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+
+               /* Display path name and status flags */
+               printf("%s: (0x%08x)", path, hus.hus_states);
+
+               if (hus.hus_states & HS_RELEASED)
+                       printf(" released");
+               if (hus.hus_states & HS_EXISTS)
+                       printf(" exists");
+               if (hus.hus_states & HS_DIRTY)
+                       printf(" dirty");
+               if (hus.hus_states & HS_ARCHIVED)
+                       printf(" archived");
+               /* Display user-settable flags */
+               if (hus.hus_states & HS_NORELEASE)
+                       printf(" never_release");
+               if (hus.hus_states & HS_NOARCHIVE)
+                       printf(" never_archive");
+               if (hus.hus_states & HS_LOST)
+                       printf(" lost_from_hsm");
+
+               if (hus.hus_archive_id != 0)
+                       printf(", archive_id:%d", hus.hus_archive_id);
+               printf("\n");
+
+       } while (++i < argc);
+
+       return 0;
+}
+
+#define LFS_HSM_SET   0
+#define LFS_HSM_CLEAR 1
+
+/**
+ * Generic function to set or clear HSM flags.
+ * Used by hsm_set and hsm_clear.
+ *
+ * @mode  if LFS_HSM_SET, set the flags, if LFS_HSM_CLEAR, clear the flags.
+ */
+static int lfs_hsm_change_flags(int argc, char **argv, int mode)
+{
+       struct option long_opts[] = {
+               {"lost", 0, 0, 'l'},
+               {"norelease", 0, 0, 'r'},
+               {"noarchive", 0, 0, 'a'},
+               {"archived", 0, 0, 'A'},
+               {"dirty", 0, 0, 'd'},
+               {"exists", 0, 0, 'e'},
+               {0, 0, 0, 0}
+       };
+       char short_opts[] = "lraAde";
+       __u64 mask = 0;
+       int c, rc;
+       char *path;
+
+       if (argc < 3)
+               return CMD_HELP;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'l':
+                       mask |= HS_LOST;
+                       break;
+               case 'a':
+                       mask |= HS_NOARCHIVE;
+                       break;
+               case 'A':
+                       mask |= HS_ARCHIVED;
+                       break;
+               case 'r':
+                       mask |= HS_NORELEASE;
+                       break;
+               case 'd':
+                       mask |= HS_DIRTY;
+                       break;
+               case 'e':
+                       mask |= HS_EXISTS;
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       /* User should have specified a flag */
+       if (mask == 0)
+               return CMD_HELP;
+
+       while (optind < argc) {
+
+               path = argv[optind];
+
+               /* If mode == 0, this means we apply the mask. */
+               if (mode == LFS_HSM_SET)
+                       rc = llapi_hsm_state_set(path, mask, 0, 0);
+               else
+                       rc = llapi_hsm_state_set(path, 0, mask, 0);
+
+               if (rc != 0) {
+                       fprintf(stderr, "Can't change hsm flags for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+               optind++;
+       }
+
+       return 0;
+}
+
+static int lfs_hsm_action(int argc, char **argv)
+{
+       int                              rc;
+       int                              i = 1;
+       char                            *path;
+       struct hsm_current_action        hca;
+       struct hsm_extent                he;
+       enum hsm_user_action             hua;
+       enum hsm_progress_states         hps;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       do {
+               path = argv[i];
+
+               rc = llapi_hsm_current_action(path, &hca);
+               if (rc) {
+                       fprintf(stderr, "can't get hsm action for %s: %s\n",
+                               path, strerror(errno = -rc));
+                       return rc;
+               }
+               he = hca.hca_location;
+               hua = hca.hca_action;
+               hps = hca.hca_state;
+
+               printf("%s: %s", path, hsm_user_action2name(hua));
+
+               /* Skip file without action */
+               if (hca.hca_action == HUA_NONE) {
+                       printf("\n");
+                       continue;
+               }
+
+               printf(" %s ", hsm_progress_state2name(hps));
+
+               if ((hps == HPS_RUNNING) &&
+                   (hua == HUA_ARCHIVE || hua == HUA_RESTORE))
+                       printf("("LPX64 " bytes moved)\n", he.length);
+               else if ((he.offset + he.length) == OBD_OBJECT_EOF)
+                       printf("(from "LPX64 " to EOF)\n", he.offset);
+               else
+                       printf("(from "LPX64 " to "LPX64")\n",
+                              he.offset, he.offset + he.length);
+
+       } while (++i < argc);
+
+       return 0;
+}
+
+static int lfs_hsm_set(int argc, char **argv)
+{
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_SET);
+}
+
+static int lfs_hsm_clear(int argc, char **argv)
+{
+       return lfs_hsm_change_flags(argc, argv, LFS_HSM_CLEAR);
+}
+
+/**
+ * Check file state and return its fid, to be used by lfs_hsm_request().
+ *
+ * \param[in]     file      Path to file to check
+ * \param[in,out] fid       Pointer to allocated lu_fid struct.
+ * \param[in,out] last_dev  Pointer to last device id used.
+ *
+ * \return 0 on success.
+ */
+static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid,
+                               dev_t *last_dev)
+{
+       struct stat     st;
+       int             rc;
+
+       rc = lstat(file, &st);
+       if (rc) {
+               fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno));
+               return -errno;
+       }
+       /* A request should be ... */
+       if (*last_dev != st.st_dev && *last_dev != 0) {
+               fprintf(stderr, "All files should be "
+                       "on the same filesystem: %s\n", file);
+               return -EINVAL;
+       }
+       *last_dev = st.st_dev;
+
+       rc = llapi_path2fid(file, fid);
+       if (rc) {
+               fprintf(stderr, "Cannot read FID of %s: %s\n",
+                       file, strerror(-rc));
+               return rc;
+       }
+       return 0;
+}
+
+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'},
+               {0, 0, 0, 0}
+       };
+       dev_t                    last_dev = 0;
+       char                     short_opts[] = "l:D:a:";
+       struct hsm_user_request *hur, *oldhur;
+       int                      c, i;
+       size_t                   len;
+       int                      nbfile;
+       char                    *line = NULL;
+       char                    *filelist = NULL;
+       char                     fullpath[PATH_MAX];
+       char                    *opaque = NULL;
+       int                      opaque_len = 0;
+       int                      archive_id = 0;
+       FILE                    *fp;
+       int                      nbfile_alloc = 0;
+       char                     some_file[PATH_MAX+1] = "";
+       int                      rc;
+
+       if (argc < 2)
+               return CMD_HELP;
+
+       optind = 0;
+       while ((c = getopt_long(argc, argv, short_opts,
+                               long_opts, NULL)) != -1) {
+               switch (c) {
+               case 'l':
+                       filelist = optarg;
+                       break;
+               case 'D':
+                       opaque = optarg;
+                       break;
+               case 'a':
+                       if (action != HUA_ARCHIVE) {
+                               fprintf(stderr,
+                                       "error: -a is supported only "
+                                       "when archiving\n");
+                               return CMD_HELP;
+                       }
+                       archive_id = atoi(optarg);
+                       break;
+               case '?':
+                       return CMD_HELP;
+               default:
+                       fprintf(stderr, "error: %s: option '%s' unrecognized\n",
+                               argv[0], argv[optind - 1]);
+                       return CMD_HELP;
+               }
+       }
+
+       /* All remaining args are files, so we have at least nbfile */
+       nbfile = argc - optind;
+
+       if ((nbfile == 0) && (filelist == NULL))
+               return CMD_HELP;
+
+       if (opaque != NULL)
+               opaque_len = strlen(opaque);
+
+       /* Alloc the request structure with enough place to store all files
+        * from command line. */
+       hur = llapi_hsm_user_request_alloc(nbfile, opaque_len);
+       if (hur == NULL) {
+               fprintf(stderr, "Cannot create the request: %s\n",
+                       strerror(errno));
+               return errno;
+       }
+       nbfile_alloc = nbfile;
+
+       hur->hur_request.hr_action = action;
+       hur->hur_request.hr_archive_id = archive_id;
+       hur->hur_request.hr_flags = 0;
+
+       /* All remaining args are files, add them */
+       if (nbfile != 0)
+               strcpy(some_file, 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++;
+               if (rc)
+                       goto out_free;
+       }
+
+       /* from here stop using nb_file, use hur->hur_request.hr_itemcount */
+
+       /* If a filelist was specified, read the filelist from it. */
+       if (filelist != NULL) {
+               fp = fopen(filelist, "r");
+               if (fp == NULL) {
+                       fprintf(stderr, "Cannot read the file list %s: %s\n",
+                               filelist, strerror(errno));
+                       rc = -errno;
+                       goto out_free;
+               }
+
+               while ((rc = getline(&line, &len, fp)) != -1) {
+                       struct hsm_user_item *hui;
+
+                       /* If allocated buffer was too small, gets something
+                        * bigger */
+                       if (nbfile_alloc <= hur->hur_request.hr_itemcount) {
+                               nbfile_alloc = nbfile_alloc * 2 + 1;
+                               oldhur = hur;
+                               hur = llapi_hsm_user_request_alloc(nbfile_alloc,
+                                                                  opaque_len);
+                               if (hur == NULL) {
+                                       fprintf(stderr, "Cannot allocate "
+                                               "the request: %s\n",
+                                               strerror(errno));
+                                       hur = oldhur;
+                                       rc = -errno;
+                                       goto out_free;
+                               }
+                               memcpy(hur, oldhur, hur_len(oldhur));
+                               free(oldhur);
+                       }
+
+                       /* Chop CR */
+                       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++;
+                       if (rc)
+                               goto out_free;
+
+                       if ((some_file[0] == '\0') &&
+                           (strlen(line) < sizeof(some_file)))
+                               strcpy(some_file, line);
+               }
+
+               rc = fclose(fp);
+               if (line)
+                       free(line);
+       }
+
+       /* If a --data was used, add it to the request */
+       hur->hur_request.hr_data_len = opaque_len;
+       if (opaque != NULL)
+               memcpy(hur_data(hur), opaque, opaque_len);
+
+       /* Send the HSM request */
+       if (realpath(some_file, fullpath) == NULL) {
+               fprintf(stderr, "Could not find path '%s': %s\n",
+                       some_file, strerror(errno));
+       }
+       rc = llapi_hsm_request(fullpath, hur);
+       if (rc) {
+               fprintf(stderr, "Cannot send HSM request (use of %s): %s\n",
+                       some_file, strerror(-rc));
+               goto out_free;
+       }
+
+out_free:
+       free(hur);
+       return rc;
+}
+
+static int lfs_hsm_archive(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_ARCHIVE);
+}
+
+static int lfs_hsm_restore(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RESTORE);
+}
+
+static int lfs_hsm_release(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_RELEASE);
+}
+
+static int lfs_hsm_remove(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_REMOVE);
+}
+
+static int lfs_hsm_cancel(int argc, char **argv)
+{
+       return lfs_hsm_request(argc, argv, HUA_CANCEL);
+}
+
+static int lfs_swap_layouts(int argc, char **argv)
+{
+       if (argc != 3)
+               return CMD_HELP;
+
+       return llapi_swap_layouts(argv[1], argv[2]);
 }
 
 int main(int argc, char **argv)
@@ -2802,8 +3327,6 @@ int main(int argc, char **argv)
         ptl_initialize(argc, argv);
         if (obd_initialize(argc, argv) < 0)
                 exit(2);
-        if (dbg_initialize(argc, argv) < 0)
-                exit(3);
 
         Parser_init("lfs > ", cmdlist);