#include <err.h>
#include <pwd.h>
#include <grp.h>
+#include <sys/quota.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
# include <sys/quota.h>
#endif
-/* For dirname() */
-#include <libgen.h>
-
+#include <libcfs/libcfs.h>
+#include <libcfs/libcfsutil.h>
#include <lnet/lnetctl.h>
-
-#include <liblustre.h>
#include <lustre/lustreapi.h>
-
-#include <libcfs/libcfsutil.h>
-#include <obd.h>
-#include <obd_lov.h>
+#include <lustre_ver.h>
#include "obdctl.h"
/* all functions */
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);
+static int lfs_mv(int argc, char **argv);
#define SETSTRIPE_USAGE(_cmd, _tgt) \
"usage: "_cmd" [--stripe-count|-c <stripe_count>]\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"},
+ "usage: setdirstripe <--count|-c stripe_count>\n"
+ "[--index|-i mdt_index] [--hash-type|-t hash_type]\n"
+ "[--default_stripe|-D ] <dir>\n"
+ "\tstripe_count: stripe count of the striped directory\n"
+ "\tmdt_index: MDT index of first stripe\n"
+ "\thash_type: hash type of the striped directory. Hash types:\n"
+ " -t fnv_1a_64 FNV-1a hash algorithm(default)\n"
+ " -t all_char sum of characters % MDT_COUNT. (not recommended)\n"
+ "\tdefault_stripe: set default dirstripe of the directory\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> ..."},
+ " [--recursive | -r] [ --default_stripe | -D ] <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"
" while many targets still have 1MB or 1K inodes of spare\n"
" quota space."},
{"quota", lfs_quota, 0, "Display disk usage and limits.\n"
- "usage: quota [-q] [-v] [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>]\n"
+ "usage: quota [-q] [-v] [-h] [-o <obd_uuid>|-i <mdt_idx>|-I "
+ "<ost_idx>]\n"
" [<-u|-g> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
" quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
#endif
"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 layout to "
+ {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to "
"another (may be not safe with concurent writes).\n"
SETSTRIPE_USAGE("migrate ", "<filename>")},
- {"help", Parser_help, 0, "help"},
- {"exit", Parser_quit, 0, "quit"},
- {"quit", Parser_quit, 0, "quit"},
- { 0, 0, 0, NULL }
+ {"mv", lfs_mv, 0,
+ "To move directories between MDTs.\n"
+ "usage: mv <directory|filename> [--mdt-index|-M] <mdt_index> "
+ "[--verbose|-v]\n"},
+ {"help", Parser_help, 0, "help"},
+ {"exit", Parser_quit, 0, "quit"},
+ {"quit", Parser_quit, 0, "quit"},
+ { 0, 0, 0, NULL }
};
-static int isnumber(const char *str)
-{
- const char *ptr;
-
- if (str[0] != '-' && !isdigit(str[0]))
- return 0;
-
- for (ptr = str + 1; *ptr != '\0'; ptr++) {
- if (!isdigit(*ptr))
- return 0;
- }
-
- return 1;
-}
-
#define MIGRATION_BLOCKS 1
static int lfs_migrate(char *name, unsigned long long stripe_size,
__u64 rpos, wpos, bufoff;
int gid = 0, sz;
int have_gl = 0;
+ struct stat st, 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);
}
/* search for file directory pathname */
- strcpy(parent, name);
+ if (strlen(name) > sizeof(parent)-1) {
+ rc = -E2BIG;
+ goto free;
+ }
+ strncpy(parent, name, sizeof(parent));
ptr = strrchr(parent, '/');
if (ptr == NULL) {
if (getcwd(parent, sizeof(parent)) == NULL) {
goto free;
}
+ /* Not-owner (root?) special case.
+ * Need to set owner/group of volatile file like original.
+ * This will allow to pass related check during layout_swap.
+ */
+ rc = fstat(fd, &st);
+ if (rc != 0) {
+ rc = -errno;
+ fprintf(stderr, "cannot stat %s (%s)\n", 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));
+ 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));
+ goto error;
+ }
+ }
+
/* get file data version */
rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH);
if (rc != 0) {
SWAP_LAYOUTS_KEEP_MTIME |
SWAP_LAYOUTS_KEEP_ATIME);
if (rc == -EAGAIN) {
- fprintf(stderr, "file dataversion for %s has changed"
- " during copy, migration is aborted\n",
- name);
+ fprintf(stderr, "%s: dataversion changed during copy, "
+ "migration aborted\n", name);
goto error;
}
if (rc != 0)
- fprintf(stderr, "cannot swap layouts between %s and "
- "a volatile file (%s)\n",
+ fprintf(stderr, "%s: swap layout to new file failed: %s\n",
name, strerror(-rc));
error:
struct option long_opts[] = {
/* valid only in migrate mode */
{"block", no_argument, 0, 'b'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --count option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-count", but was explicitly
* made "stripe-count" for consistency with other options,
* and to separate it from "mdt-count" when DNE arrives. */
{"stripe-count", required_argument, 0, 'c'},
{"stripe_count", required_argument, 0, 'c'},
{"delete", no_argument, 0, 'd'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --index option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-index", but was explicitly
* made "stripe-index" for consistency with other options,
* and to separate it from "mdt-index" when DNE arrives. */
#endif
{"stripe-index", required_argument, 0, 'i'},
{"stripe_index", required_argument, 0, 'i'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --offset option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-index", but was confusing
* with "file offset" (which will eventually be needed for
* with different layouts by offset), so deprecate it. */
- {"offset", required_argument, 0, 'o'},
+ {"offset", required_argument, 0, 'o'},
#endif
{"pool", required_argument, 0, 'p'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --size option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "--stripe-size", but was confusing
* with "lfs find --size|-s", which means "file size", so use
* the consistent "--stripe-size|-S" for all commands. */
if (strcmp(argv[0], "migrate") == 0)
migrate_mode = 1;
-#if LUSTRE_VERSION < OBD_OCD_VERSION(2,4,50,0)
- if (argc == 5 && argv[1][0] != '-' &&
- isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) {
- fprintf(stderr, "error: obsolete usage of setstripe "
- "positional parameters. Use -c, -i, -S instead.\n");
- return CMD_HELP;
- } else
-#else
-#warning "remove obsolete positional parameter error"
-#endif
- {
- optind = 0;
- while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:",
- long_opts, NULL)) >= 0) {
- switch (c) {
- case 0:
- /* Long options. */
- break;
+ optind = 0;
+ while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:",
+ long_opts, NULL)) >= 0) {
+ switch (c) {
+ case 0:
+ /* Long options. */
+ break;
case 'b':
if (migrate_mode == 0) {
fprintf(stderr, "--block is valid only for"
}
migration_flags |= MIGRATION_BLOCKS;
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");
+ case 'c':
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
+ if (strcmp(argv[optind - 1], "--count") == 0)
+ fprintf(stderr, "warning: '--count' deprecated"
+ ", use '--stripe-count' instead\n");
#endif
- stripe_count_arg = optarg;
- break;
- case 'd':
- /* delete the default striping pattern */
- delete = 1;
- 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");
-#else
- if (strcmp(argv[optind - 1], "--offset") == 0)
- /* need --stripe-index established first */
- fprintf(stderr, "warning: '--offset' deprecated"
- ", use '--index' instead\n");
+ stripe_count_arg = optarg;
+ break;
+ case 'd':
+ /* delete the default striping pattern */
+ delete = 1;
+ break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
+ case 'o':
+ fprintf(stderr, "warning: '--offset|-o' deprecated, "
+ "use '--stripe-index|-i' instead\n");
#endif
- 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");
+ case 'i':
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
+ if (strcmp(argv[optind - 1], "--index") == 0)
+ fprintf(stderr, "warning: '--index' deprecated"
+ ", use '--stripe-index' instead\n");
#endif
- stripe_off_arg = optarg;
- 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");
+ stripe_off_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)
+ fprintf(stderr, "warning: '--size|-s' deprecated, "
+ "use '--stripe-size|-S' instead\n");
#endif
- case 'S':
- stripe_size_arg = optarg;
- break;
- case 'p':
- pool_name_arg = optarg;
- break;
- default:
- return CMD_HELP;
- }
- }
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */
+ case 'S':
+ stripe_size_arg = optarg;
+ break;
+ case 'p':
+ pool_name_arg = optarg;
+ break;
+ default:
+ return CMD_HELP;
+ }
+ }
- fname = argv[optind];
+ fname = argv[optind];
- if (delete &&
- (stripe_size_arg != NULL || stripe_off_arg != NULL ||
- stripe_count_arg != NULL || pool_name_arg != NULL)) {
- fprintf(stderr, "error: %s: cannot specify -d with "
- "-s, -c, -o, or -p options\n",
- argv[0]);
- return CMD_HELP;
- }
- }
+ if (delete &&
+ (stripe_size_arg != NULL || stripe_off_arg != NULL ||
+ stripe_count_arg != NULL || pool_name_arg != NULL)) {
+ fprintf(stderr, "error: %s: cannot specify -d with "
+ "-s, -c, -o, or -p options\n",
+ argv[0]);
+ return CMD_HELP;
+ }
- if (optind == argc) {
- fprintf(stderr, "error: %s: missing filename|dirname\n",
- argv[0]);
- return CMD_HELP;
- }
+ if (optind == argc) {
+ fprintf(stderr, "error: %s: missing filename|dirname\n",
+ argv[0]);
+ return CMD_HELP;
+ }
/* get the stripe size */
if (stripe_size_arg != NULL) {
{
int c, ret;
time_t t;
- struct find_param param = { .maxdepth = -1, .quiet = 1 };
+ struct find_param param = {
+ .fp_max_depth = -1,
+ .quiet = 1,
+ };
struct option long_opts[] = {
{"atime", required_argument, 0, 'A'},
{"stripe-count", required_argument, 0, 'c'},
if (strcmp(optarg, "!") == 0)
neg_opt = 2;
break;
- case 'A':
- xtime = ¶m.atime;
- xsign = ¶m.asign;
- param.exclude_atime = !!neg_opt;
- /* no break, this falls through to 'C' for ctime */
- case 'C':
- if (c == 'C') {
- xtime = ¶m.ctime;
- xsign = ¶m.csign;
- param.exclude_ctime = !!neg_opt;
- }
- /* no break, this falls through to 'M' for mtime */
- case 'M':
- if (c == 'M') {
- xtime = ¶m.mtime;
- xsign = ¶m.msign;
- param.exclude_mtime = !!neg_opt;
- }
+ case 'A':
+ xtime = ¶m.fp_atime;
+ xsign = ¶m.fp_asign;
+ param.fp_exclude_atime = !!neg_opt;
+ /* no break, this falls through to 'C' for ctime */
+ case 'C':
+ if (c == 'C') {
+ xtime = ¶m.fp_ctime;
+ xsign = ¶m.fp_csign;
+ param.fp_exclude_ctime = !!neg_opt;
+ }
+ /* no break, this falls through to 'M' for mtime */
+ case 'M':
+ if (c == 'M') {
+ xtime = ¶m.fp_mtime;
+ xsign = ¶m.fp_msign;
+ param.fp_exclude_mtime = !!neg_opt;
+ }
ret = set_time(&t, xtime, optarg);
if (ret == INT_MAX) {
ret = -1;
param.check_stripecount = 1;
param.exclude_stripecount = !!neg_opt;
break;
- case 'D':
- param.maxdepth = strtol(optarg, 0, 0);
- break;
- case 'g':
- case 'G':
- ret = name2id(¶m.gid, optarg, GROUP);
- if (ret) {
- param.gid = strtoul(optarg, &endptr, 10);
+ case 'D':
+ param.fp_max_depth = strtol(optarg, 0, 0);
+ break;
+ case 'g':
+ case 'G':
+ ret = name2id(¶m.fp_gid, optarg, GROUP);
+ if (ret) {
+ param.fp_gid = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "Group/GID: %s cannot "
"be found.\n", optarg);
goto err;
}
}
- param.exclude_gid = !!neg_opt;
- param.check_gid = 1;
+ param.fp_exclude_gid = !!neg_opt;
+ param.fp_check_gid = 1;
break;
case 'L':
ret = name2layout(¶m.layout, optarg);
break;
case 'u':
case 'U':
- ret = name2id(¶m.uid, optarg, USER);
- if (ret) {
- param.uid = strtoul(optarg, &endptr, 10);
+ ret = name2id(¶m.fp_uid, optarg, USER);
+ if (ret) {
+ param.fp_uid = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
fprintf(stderr, "User/UID: %s cannot "
"be found.\n", optarg);
goto err;
}
}
- param.exclude_uid = !!neg_opt;
- param.check_uid = 1;
+ param.fp_exclude_uid = !!neg_opt;
+ param.fp_check_uid = 1;
break;
case FIND_POOL_OPT:
if (strlen(optarg) > LOV_MAXPOOLNAME) {
param.obduuid = tmp;
}
for (token = buf; token && *token; token = next) {
- char *uuid;
- if (c == 'm')
- uuid =
- param.mdtuuid[param.num_mdts++].uuid;
- else
- uuid =
- param.obduuid[param.num_obds++].uuid;
+ struct obd_uuid *puuid;
+ if (c == 'm') {
+ puuid =
+ ¶m.mdtuuid[param.num_mdts++];
+ } else {
+ puuid =
+ ¶m.obduuid[param.num_obds++];
+ }
p = strchr(token, ',');
next = 0;
if (p) {
*p = 0;
next = p+1;
}
- strcpy((char *)uuid, token);
+ if (strlen(token) > sizeof(puuid->uuid)-1)
+ GOTO(err_free, ret = -E2BIG);
+ strncpy(puuid->uuid, token,
+ sizeof(puuid->uuid));
}
err_free:
if (buf)
param.check_stripesize = 1;
param.exclude_stripesize = !!neg_opt;
break;
- case 't':
- param.exclude_type = !!neg_opt;
- switch(optarg[0]) {
- case 'b': param.type = S_IFBLK; break;
- case 'c': param.type = S_IFCHR; break;
- case 'd': param.type = S_IFDIR; break;
- case 'f': param.type = S_IFREG; break;
- case 'l': param.type = S_IFLNK; break;
- case 'p': param.type = S_IFIFO; break;
- case 's': param.type = S_IFSOCK; break;
-#ifdef S_IFDOOR /* Solaris only */
- case 'D': param.type = S_IFDOOR; break;
-#endif
- default: fprintf(stderr, "error: %s: bad type '%s'\n",
- argv[0], optarg);
- ret = CMD_HELP;
- goto err;
- };
- break;
+ case 't':
+ param.fp_exclude_type = !!neg_opt;
+ switch (optarg[0]) {
+ case 'b':
+ param.fp_type = S_IFBLK;
+ break;
+ case 'c':
+ param.fp_type = S_IFCHR;
+ break;
+ case 'd':
+ param.fp_type = S_IFDIR;
+ break;
+ case 'f':
+ param.fp_type = S_IFREG;
+ break;
+ case 'l':
+ param.fp_type = S_IFLNK;
+ break;
+ case 'p':
+ param.fp_type = S_IFIFO;
+ break;
+ case 's':
+ param.fp_type = S_IFSOCK;
+ break;
+ default:
+ fprintf(stderr, "error: %s: bad type '%s'\n",
+ argv[0], optarg);
+ ret = CMD_HELP;
+ goto err;
+ };
+ break;
default:
ret = CMD_HELP;
goto err;
struct find_param *param)
{
struct option long_opts[] = {
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --count option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-count", but was explicitly
* made "stripe-count" for consistency with other options,
* and to separate it from "mdt-count" when DNE arrives. */
{"stripe-count", no_argument, 0, 'c'},
{"stripe_count", no_argument, 0, 'c'},
{"directory", no_argument, 0, 'd'},
+ {"default", no_argument, 0, 'D'},
{"generation", no_argument, 0, 'g'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --index option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-index", but was explicitly
* made "stripe-index" for consistency with other options,
* and to separate it from "mdt-index" when DNE arrives. */
{"layout", no_argument, 0, 'L'},
{"mdt-index", no_argument, 0, 'M'},
{"mdt_index", no_argument, 0, 'M'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --offset option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "stripe-index", but was confusing
* with "file offset" (which will eventually be needed for
* with different layouts by offset), so deprecate it. */
{"quiet", no_argument, 0, 'q'},
{"recursive", no_argument, 0, 'r'},
{"raw", no_argument, 0, 'R'},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0)
-#warning "remove deprecated --size option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
/* This formerly implied "--stripe-size", but was confusing
* with "lfs find --size|-s", which means "file size", so use
* the consistent "--stripe-size|-S" for all commands. */
};
int c, rc;
- param->maxdepth = 1;
+ param->fp_max_depth = 1;
optind = 0;
- while ((c = getopt_long(argc, argv, "cdghiLMoO:pqrRsSv",
+ while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv",
long_opts, NULL)) != -1) {
switch (c) {
case 'O':
param->quiet++;
break;
case 'd':
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
+ break;
+ case 'D':
+ param->get_default_lmv = 1;
break;
case 'r':
param->recursive = 1;
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 LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
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;
+ param->fp_max_depth = 0;
}
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
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)
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
fprintf(stderr, "warning: '--size|-s' deprecated, "
"use '--stripe-size|-S' instead\n");
#endif
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */
case 'S':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_SIZE;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0)
case 'o':
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0)
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");
#endif
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 LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
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;
+ param->fp_max_depth = 0;
}
break;
case 'p':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_POOL;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'g':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_GENERATION;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'L':
if (!(param->verbose & VERBOSE_DETAIL)) {
param->verbose |= VERBOSE_LAYOUT;
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
}
break;
case 'M':
if (!(param->verbose & VERBOSE_DETAIL))
- param->maxdepth = 0;
+ param->fp_max_depth = 0;
param->verbose |= VERBOSE_MDTINDEX;
break;
case 'R':
return CMD_HELP;
if (param->recursive)
- param->maxdepth = -1;
+ param->fp_max_depth = -1;
if (!param->verbose)
param->verbose = VERBOSE_ALL;
/* 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;
+ char *dname;
+ int result;
+ unsigned int stripe_offset = -1;
+ unsigned int stripe_count = 1;
+ enum lmv_hash_type hash_type;
+ char *end;
+ int c;
+ char *stripe_offset_opt = NULL;
+ char *stripe_count_opt = NULL;
+ char *stripe_hash_opt = NULL;
+ int default_stripe = 0;
struct option long_opts[] = {
- {"index", required_argument, 0, 'i'},
+ {"count", required_argument, 0, 'c'},
+ {"index", required_argument, 0, 'i'},
+ {"hash-type", required_argument, 0, 't'},
+ {"default_stripe", required_argument, 0, 'D'},
{0, 0, 0, 0}
};
- st_offset = -1;
- st_count = 1;
optind = 0;
- while ((c = getopt_long(argc, argv, "i:o",
- long_opts, NULL)) >= 0) {
+
+ while ((c = getopt_long(argc, argv, "c:Di:t:", long_opts, NULL)) >= 0) {
switch (c) {
case 0:
/* Long options. */
break;
+ case 'c':
+ stripe_count_opt = optarg;
+ break;
+ case 'D':
+ default_stripe = 1;
+ break;
case 'i':
- stripe_off_arg = optarg;
+ stripe_offset_opt = optarg;
+ break;
+ case 't':
+ stripe_hash_opt = optarg;
break;
default:
fprintf(stderr, "error: %s: option '%s' "
return CMD_HELP;
}
- dname = argv[optind];
- if (stripe_off_arg == NULL) {
- fprintf(stderr, "error: %s: missing stripe_off.\n",
+ if (stripe_offset_opt == NULL && stripe_count_opt == NULL) {
+ fprintf(stderr, "error: %s: missing stripe offset and count.\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);
+
+ if (stripe_offset_opt != NULL) {
+ /* get the stripe offset */
+ stripe_offset = strtoul(stripe_offset_opt, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
+ argv[0], stripe_offset_opt);
+ return CMD_HELP;
+ }
+ }
+
+ if (stripe_hash_opt == NULL ||
+ strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) {
+ hash_type = LMV_HASH_TYPE_FNV_1A_64;
+ } else if (strcmp(stripe_hash_opt, LMV_HASH_NAME_ALL_CHARS) == 0) {
+ hash_type = LMV_HASH_TYPE_ALL_CHARS;
+ } else {
+ fprintf(stderr, "error: %s: bad stripe hash type '%s'\n",
+ argv[0], stripe_hash_opt);
return CMD_HELP;
}
+
+ /* get the stripe count */
+ if (stripe_count_opt != NULL) {
+ stripe_count = strtoul(stripe_count_opt, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe count '%s'\n",
+ argv[0], stripe_count_opt);
+ return CMD_HELP;
+ }
+ }
+
+ dname = argv[optind];
do {
- result = llapi_dir_create_pool(dname, flags, st_offset,
- st_count, 0, NULL);
+ if (default_stripe == 1) {
+ result = llapi_dir_set_default_lmv_stripe(dname,
+ stripe_offset, stripe_count,
+ hash_type, NULL);
+ } else {
+ result = llapi_dir_create_pool(dname, 0, stripe_offset,
+ stripe_count, hash_type,
+ NULL);
+ }
+
if (result) {
fprintf(stderr, "error: %s: create stripe dir '%s' "
"failed\n", argv[0], dname);
return result;
}
+static int lfs_mv(int argc, char **argv)
+{
+ struct find_param param = {
+ .fp_max_depth = -1,
+ .mdtindex = -1,
+ };
+ char *end;
+ int c;
+ int rc = 0;
+ struct option long_opts[] = {
+ {"--mdt-index", required_argument, 0, 'M'},
+ {"verbose", no_argument, 0, 'v'},
+ {0, 0, 0, 0}
+ };
+
+ while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) {
+ switch (c) {
+ case 'M': {
+ param.mdtindex = strtoul(optarg, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "%s: invalid MDT index'%s'\n",
+ argv[0], optarg);
+ return CMD_HELP;
+ }
+ break;
+ }
+ case 'v': {
+ param.verbose = VERBOSE_DETAIL;
+ break;
+ }
+ default:
+ fprintf(stderr, "error: %s: unrecognized option '%s'\n",
+ argv[0], argv[optind - 1]);
+ return CMD_HELP;
+ }
+ }
+
+ if (param.mdtindex == -1) {
+ fprintf(stderr, "%s MDT index must be indicated\n", argv[0]);
+ return CMD_HELP;
+ }
+
+ if (optind >= argc) {
+ fprintf(stderr, "%s missing operand path\n", argv[0]);
+ return CMD_HELP;
+ }
+
+ param.migrate = 1;
+ rc = llapi_mv(argv[optind], ¶m);
+ if (rc != 0)
+ fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n",
+ argv[optind], param.mdtindex, strerror(-rc));
+ return rc;
+}
+
static int lfs_osts(int argc, char **argv)
{
return lfs_tgts(argc, argv);
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;
- char *poolname = NULL;
- struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
- { LL_STATFS_LOV, "OST" },
- { 0, NULL } };
- struct ll_stat_type *tp;
- __u32 index;
- __u32 type;
- int rc;
+ struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
+ struct obd_uuid uuid_buf;
+ char *poolname = NULL;
+ struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
+ { LL_STATFS_LOV, "OST" },
+ { 0, NULL } };
+ struct ll_stat_type *tp;
+ __u64 ost_ffree = 0;
+ __u32 index;
+ __u32 type;
+ int rc;
if (pool) {
poolname = strchr(pool, '.');
sum.os_ffree += stat_buf.os_ffree;
sum.os_files += stat_buf.os_files;
} else /* if (tp->st_op == LL_STATFS_LOV) */ {
- sum.os_blocks += stat_buf.os_blocks *
- stat_buf.os_bsize;
- sum.os_bfree += stat_buf.os_bfree *
- stat_buf.os_bsize;
- sum.os_bavail += stat_buf.os_bavail *
- stat_buf.os_bsize;
- }
- } else if (rc == -EINVAL || rc == -EFAULT) {
- break;
- }
- }
- }
+ sum.os_blocks += stat_buf.os_blocks *
+ stat_buf.os_bsize;
+ sum.os_bfree += stat_buf.os_bfree *
+ stat_buf.os_bsize;
+ sum.os_bavail += stat_buf.os_bavail *
+ stat_buf.os_bsize;
+ ost_ffree += stat_buf.os_ffree;
+ }
+ } else if (rc == -EINVAL || rc == -EFAULT) {
+ break;
+ }
+ }
+ }
- printf("\n");
- showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0);
- printf("\n");
- return 0;
+ /* If we don't have as many objects free on the OST as inodes
+ * on the MDS, we reduce the total number of inodes to
+ * compensate, so that the "inodes in use" number is correct.
+ * Matches ll_statfs_internal() so the results are consistent. */
+ if (ost_ffree < sum.os_ffree) {
+ sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree;
+ sum.os_ffree = ost_ffree;
+ }
+ printf("\n");
+ showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0, 0);
+ printf("\n");
+ return 0;
}
static int lfs_df(int argc, char **argv)
__sec2str(seconds - now, buf);
}
-static void print_quota_title(char *name, struct if_quotactl *qctl)
+static void print_quota_title(char *name, struct if_quotactl *qctl,
+ bool human_readable)
+{
+ printf("Disk quotas for %s %s (%cid %u):\n",
+ type2name(qctl->qc_type), name,
+ *type2name(qctl->qc_type), qctl->qc_id);
+ printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
+ "Filesystem", human_readable ? "used" : "kbytes",
+ "quota", "limit", "grace",
+ "files", "quota", "limit", "grace");
+}
+
+static void kbytes2str(__u64 num, char *buf, bool h)
{
- printf("Disk quotas for %s %s (%cid %u):\n",
- type2name(qctl->qc_type), name,
- *type2name(qctl->qc_type), qctl->qc_id);
- printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
- "Filesystem",
- "kbytes", "quota", "limit", "grace",
- "files", "quota", "limit", "grace");
+ if (!h) {
+ sprintf(buf, LPU64, num);
+ } else {
+ if (num >> 30)
+ sprintf(buf, "%5.4gT", (double)num / (1 << 30));
+ else if (num >> 20)
+ sprintf(buf, "%5.4gG", (double)num / (1 << 20));
+ else if (num >> 10)
+ sprintf(buf, "%5.4gM", (double)num / (1 << 10));
+ else
+ sprintf(buf, LPU64"%s", num, "k");
+ }
}
-static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc)
+static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
+ int rc, bool h)
{
time_t now;
time(&now);
if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) {
- int bover = 0, iover = 0;
- struct obd_dqblk *dqb = &qctl->qc_dqblk;
+ int bover = 0, iover = 0;
+ struct obd_dqblk *dqb = &qctl->qc_dqblk;
+ char numbuf[3][32];
+ char timebuf[40];
+ char strbuf[32];
if (dqb->dqb_bhardlimit &&
- toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
+ lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) {
bover = 1;
} else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) {
if (dqb->dqb_btime > now) {
}
}
-#if 0 /* XXX: always print quotas even when no usages */
- if (dqb->dqb_curspace || dqb->dqb_curinodes)
-#endif
- {
- char numbuf[3][32];
- char timebuf[40];
- if (strlen(mnt) > 15)
- printf("%s\n%15s", mnt, "");
- else
- printf("%15s", mnt);
+ if (strlen(mnt) > 15)
+ printf("%s\n%15s", mnt, "");
+ else
+ printf("%15s", mnt);
+
+ if (bover)
+ diff2str(dqb->dqb_btime, timebuf, now);
+
+ kbytes2str(lustre_stoqb(dqb->dqb_curspace), strbuf, h);
+ if (rc == -EREMOTEIO)
+ sprintf(numbuf[0], "%s*", strbuf);
+ else
+ sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ?
+ "%s" : "[%s]", strbuf);
+
+ kbytes2str(dqb->dqb_bsoftlimit, strbuf, h);
+ if (type == QC_GENERAL)
+ sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ?
+ "%s" : "[%s]", strbuf);
+ else
+ sprintf(numbuf[1], "%s", "-");
+
+ kbytes2str(dqb->dqb_bhardlimit, strbuf, h);
+ sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ?
+ "%s" : "[%s]", strbuf);
+
+ printf(" %7s%c %6s %7s %7s",
+ numbuf[0], bover ? '*' : ' ', numbuf[1],
+ numbuf[2], bover > 1 ? timebuf : "-");
+
+ if (iover)
+ diff2str(dqb->dqb_itime, timebuf, now);
+
+ sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
+ LPU64 : "["LPU64"]", dqb->dqb_curinodes);
+
+ if (type == QC_GENERAL)
+ sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ?
+ LPU64 : "["LPU64"]", dqb->dqb_isoftlimit);
+ else
+ sprintf(numbuf[1], "%s", "-");
+
+ sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
+ LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
+
+ if (type != QC_OSTIDX)
+ printf(" %7s%c %6s %7s %7s",
+ numbuf[0], iover ? '*' : ' ', numbuf[1],
+ numbuf[2], iover > 1 ? timebuf : "-");
+ else
+ printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
+ printf("\n");
- if (bover)
- diff2str(dqb->dqb_btime, timebuf, now);
- if (rc == -EREMOTEIO)
- sprintf(numbuf[0], LPU64"*",
- toqb(dqb->dqb_curspace));
- else
- sprintf(numbuf[0],
- (dqb->dqb_valid & QIF_SPACE) ?
- LPU64 : "["LPU64"]",
- toqb(dqb->dqb_curspace));
- if (type == QC_GENERAL)
- sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS)
- ? LPU64 : "["LPU64"]",
- dqb->dqb_bsoftlimit);
- else
- sprintf(numbuf[1], "%s", "-");
- sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS)
- ? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit);
- printf(" %7s%c %6s %7s %7s",
- numbuf[0], bover ? '*' : ' ', numbuf[1],
- numbuf[2], bover > 1 ? timebuf : "-");
-
- if (iover)
- diff2str(dqb->dqb_itime, timebuf, now);
-
- sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ?
- LPU64 : "["LPU64"]", dqb->dqb_curinodes);
- if (type == QC_GENERAL)
- sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS)
- ? LPU64 : "["LPU64"]",
- dqb->dqb_isoftlimit);
- else
- sprintf(numbuf[1], "%s", "-");
- sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ?
- LPU64 : "["LPU64"]", dqb->dqb_ihardlimit);
- if (type != QC_OSTIDX)
- printf(" %7s%c %6s %7s %7s",
- numbuf[0], iover ? '*' : ' ', numbuf[1],
- numbuf[2], iover > 1 ? timebuf : "-");
- else
- printf(" %7s %7s %7s %7s", "-", "-", "-", "-");
- printf("\n");
- }
} else if (qctl->qc_cmd == LUSTRE_Q_GETINFO ||
qctl->qc_cmd == Q_GETOINFO) {
char bgtimebuf[40];
}
}
-static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt)
+static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt,
+ bool h, __u64 *total)
{
int rc = 0, rc1 = 0, count = 0;
__u32 valid = qctl->qc_valid;
continue;
}
- print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0);
- }
-
+ print_quota(obd_uuid2str(&qctl->obd_uuid), qctl,
+ qctl->qc_valid, 0, h);
+ *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit :
+ qctl->qc_dqblk.dqb_bhardlimit;
+ }
out:
- qctl->qc_valid = valid;
- return rc ? : rc1;
+ qctl->qc_valid = valid;
+ return rc ? : rc1;
}
static int lfs_quota(int argc, char **argv)
{
- int c;
- char *mnt, *name = NULL;
- struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
- .qc_type = UGQUOTA };
- char *obd_type = (char *)qctl.obd_type;
- char *obd_uuid = (char *)qctl.obd_uuid.uuid;
- int rc, rc1 = 0, rc2 = 0, rc3 = 0,
- verbose = 0, pass = 0, quiet = 0, inacc;
- char *endptr;
- __u32 valid = QC_GENERAL, idx = 0;
+ int c;
+ char *mnt, *name = NULL;
+ struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
+ .qc_type = UGQUOTA };
+ char *obd_type = (char *)qctl.obd_type;
+ char *obd_uuid = (char *)qctl.obd_uuid.uuid;
+ int rc, rc1 = 0, rc2 = 0, rc3 = 0,
+ verbose = 0, pass = 0, quiet = 0, inacc;
+ char *endptr;
+ __u32 valid = QC_GENERAL, idx = 0;
+ __u64 total_ialloc = 0, total_balloc = 0;
+ bool human_readable = false;
- optind = 0;
- while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) {
+ optind = 0;
+ while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) {
switch (c) {
case 'u':
if (qctl.qc_type != UGQUOTA) {
case 'q':
quiet = 1;
break;
+ case 'h':
+ human_readable = true;
+ break;
default:
fprintf(stderr, "error: %s: option '-%c' "
"unrecognized\n", argv[0], c);
}
}
- if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
- print_quota_title(name, &qctl);
+ if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet)
+ print_quota_title(name, &qctl, human_readable);
if (rc1 && *obd_type)
fprintf(stderr, "%s %s ", obd_type, obd_uuid);
if (qctl.qc_valid != QC_GENERAL)
mnt = "";
- inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
- ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE));
+ inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) &&
+ ((qctl.qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) !=
+ (QIF_LIMITS|QIF_USAGE));
- print_quota(mnt, &qctl, QC_GENERAL, rc1);
+ print_quota(mnt, &qctl, QC_GENERAL, rc1, human_readable);
- if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) {
- rc2 = print_obd_quota(mnt, &qctl, 1);
- rc3 = print_obd_quota(mnt, &qctl, 0);
- }
+ if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO &&
+ verbose) {
+ char strbuf[32];
+
+ rc2 = print_obd_quota(mnt, &qctl, 1, human_readable,
+ &total_ialloc);
+ rc3 = print_obd_quota(mnt, &qctl, 0, human_readable,
+ &total_balloc);
+ kbytes2str(total_balloc, strbuf, human_readable);
+ printf("Total allocated inode limit: "LPU64", total "
+ "allocated block limit: %s\n", total_ialloc, strbuf);
+ }
if (rc1 || rc2 || rc3 || inacc)
printf("Some errors happened when getting quota info. "
/* namespace rec includes parent and filename */
printf(" p="DFID" %.*s", PFID(&rec->cr_pfid),
rec->cr_namelen, rec->cr_name);
- if (fid_is_sane(&rec->cr_sfid))
+
+ if (!fid_is_zero(&rec->cr_sfid))
printf(" s="DFID" sp="DFID" %.*s",
PFID(&rec->cr_sfid), PFID(&rec->cr_spfid),
changelog_rec_snamelen(rec),
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)
+ else if ((he.offset + he.length) == LUSTRE_EOF)
printf("(from "LPX64 " to EOF)\n", he.offset);
else
printf("(from "LPX64 " to "LPX64")\n",
hur->hur_request.hr_flags = 0;
/* All remaining args are files, add them */
- if (nbfile != 0)
- strcpy(some_file, argv[optind]);
+ if (nbfile != 0) {
+ if (strlen(argv[optind]) > sizeof(some_file)-1) {
+ free(hur);
+ return -E2BIG;
+ }
+ strncpy(some_file, argv[optind], sizeof(some_file));
+ }
for (i = 0; i < nbfile; i++) {
hur->hur_user_item[i].hui_extent.length = -1;
strerror(errno));
hur = oldhur;
rc = -errno;
+ fclose(fp);
goto out_free;
}
memcpy(hur, oldhur, hur_len(oldhur));
rc = lfs_hsm_prepare_file(line, &hui->hui_fid,
&last_dev);
hur->hur_request.hr_itemcount++;
- if (rc)
+ if (rc) {
+ fclose(fp);
goto out_free;
+ }
if ((some_file[0] == '\0') &&
(strlen(line) < sizeof(some_file)))
return rc < 0 ? -rc : rc;
}
+#ifdef _LUSTRE_IDL_H_
+/* Everything we need here should be included by lustreapi.h. */
+# error "lfs should not depend on lustre_idl.h"
+#endif /* _LUSTRE_IDL_H_ */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff