*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* lustre/utils/lfs.c
*
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_unlink_foreign(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);
struct llapi_stripe_param *param,
struct llapi_layout *layout);
+struct pool_to_id_cbdata {
+ const char *pool;
+ __u32 id;
+};
+static int find_comp_id_by_pool(struct llapi_layout *layout, void *cbdata);
+static int find_mirror_id_by_pool(struct llapi_layout *layout, void *cbdata);
+
enum setstripe_origin {
SO_SETSTRIPE,
SO_MIGRATE,
/* Setstripe and migrate share mostly the same parameters */
#define SSM_CMD_COMMON(cmd) \
- "usage: "cmd" [--component-end|-E <comp_end>]\n" \
- " [--stripe-count|-c <stripe_count>]\n" \
- " [--overstripe-count|-C <stripe_count>]\n" \
- " [--stripe-index|-i <start_ost_idx>]\n" \
- " [--stripe-size|-S <stripe_size>]\n" \
- " [--extension-size|--ext-size|-z]\n" \
- " [--layout|-L <pattern>]\n" \
- " [--mirror-count|-N[mirror_count]]\n" \
- " [--ost|-o <ost_indices>]\n" \
- " [--pool|-p <pool_name>]\n" \
- " [--yaml|-y <yaml_template_file>]\n" \
- " [--copy=<lustre_src>]\n"
+ "usage: "cmd" [--component-end|-E COMP_END]\n" \
+ " [--stripe-count|-c STRIPE_COUNT]\n" \
+ " [--overstripe-count|-C STRIPE_COUNT]\n" \
+ " [--stripe-index|-i START_OST_IDX]\n" \
+ " [--stripe-size|-S STRIPE_SIZE]\n" \
+ " [--extension-size|--ext-size|-z]\n" \
+ " [--help|-h] [--layout|-L PATTERN]\n" \
+ " [--mirror_count|-N[MIRROR_COUNT]]\n" \
+ " [--ost|-o OST_INDICES]\n" \
+ " [--pool|-p POOL_NAME]\n" \
+ " [--yaml|-y YAML_TEMPLATE_FILE]\n" \
+ " [--copy=LUSTRE_SRC]\n"
#define SSM_HELP_COMMON \
- "\tstripe_count: Number of OSTs to stripe over (0=fs default, -1 all)\n" \
- "\t Using -C instead of -c allows overstriping, which\n" \
- "\t will place more than one stripe per OST if\n" \
- "\t stripe_count is greater than the number of OSTs\n" \
- "\tstart_ost_idx: OST index of first stripe (-1=default round robin)\n"\
- "\tstripe_size: Number of bytes on each OST (0=fs default)\n" \
- "\t Can be specified with K, M or G (for KB, MB, GB\n" \
- "\t respectively)\n" \
- "\textension_size:\n" \
+ "\tSTRIPE_COUNT: Number of OSTs to stripe on (0=fs default, -1 all)\n" \
+ "\t Using -C instead of -c allows overstriping, which\n" \
+ "\t will place more than one stripe per OST if\n" \
+ "\t stripe_count is greater than the number of OSTs.\n" \
+ "\tSTART_OST_IDX: OST index of first stripe (-1=default round robin)\n"\
+ "\tSTRIPE_SIZE: Number of bytes on each OST (0=fs default)\n" \
+ "\t Optional K, M, or G suffix (for KB, MB, GB\n" \
+ "\t respectively). Must be a multiple of 64KiB.\n" \
+ "\tEXTENSION_SIZE:\n" \
"\t Number of bytes the previous component is extended\n" \
- "\t each time. Can be specified with K, M, G (for KB,\n" \
- "\t MB, GB respectively)\n" \
- "\tpool_name: Name of OST pool to use (default none)\n" \
- "\tlayout: stripe pattern type: raid0, mdt (default raid0)\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 then the OSTs\n" \
- "\t must be the members of the pool.\n" \
- "\tcomp_end: Extent end of component, start after previous end.\n"\
- "\t Can be specified with K, M or G (for KB, MB, GB\n" \
- "\t respectively, -1 for EOF). Must be a multiple of\n"\
- "\t stripe_size.\n" \
- "\tyaml_template_file:\n" \
- "\t YAML layout template file, can't be used with -c,\n" \
- "\t -i, -S, -p, -o, or -E arguments.\n" \
- "\tlustre_src: Lustre file/dir whose layout info is used to set\n" \
- "\t another lustre file or directory, can't used with\n" \
+ "\t each time. Optional K, M, or G suffix (for KB,\n" \
+ "\t MB, GB respectively)\n" \
+ "\tPOOL_NAME: Name of OST pool to use (default none)\n" \
+ "\tLAYOUT: stripe pattern type: raid0, mdt (default raid0)\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 then the OSTs\n" \
+ "\t must be the members of the pool.\n" \
+ "\tCOMP_END: Extent end of component, start after previous end.\n" \
+ "\t Optional K, M, or G suffix (for KiB, MiB, GiB), or\n" \
+ "\t -1 or 'eof' for max file size). Must be a multiple\n" \
+ "\t of stripe_size and a multiple of 64KiB.\n" \
+ "\tYAML_TEMPLATE_FILE:\n" \
+ "\t YAML layout template file, can't be used with -c,\n" \
+ "\t -i, -S, -p, -o, or -E arguments.\n" \
+ "\tLUSTRE_SRC: Lustre file/dir whose layout info is used to set\n" \
+ "\t another lustre file or directory, can't used with\n" \
"\t -c, -i, -S, -p, -o, or -E arguments.\n"
#define MIRROR_CREATE_HELP \
- "\tmirror_count: Number of mirrors to be created with the upcoming\n" \
+ "\tMIRROR_COUNT: Number of mirrors to be created with the upcoming\n" \
"\t setstripe layout options\n" \
"\t It defaults to 1 if not specified; if specified,\n" \
"\t it must follow the option without a space.\n" \
"\t It can be a plain layout or a composite layout.\n" \
"\t If not specified, the stripe options inherited\n" \
"\t from the previous component will be used.\n" \
- "\tflags: set flags to the component of the current mirror.\n" \
+ "\tFLAGS: set flags to the component of the current mirror.\n" \
"\t Only \"prefer\" flag is supported so far.\n"
#define MIRROR_EXTEND_HELP \
MIRROR_CREATE_HELP \
- "\tvictim_file: The layout of victim_file will be split and used\n" \
+ "\tVICTIM_FILE: The layout of victim_file will be split and used\n" \
"\t as a mirror added to the mirrored file.\n" \
"\tno-verify: This option indicates not to verify the mirror(s)\n" \
"\t from victim file(s) in case the victim file(s)\n" \
#define MIRROR_EXTEND_USAGE \
" {--mirror-count|-N[mirror_count]}\n" \
- " [SETSTRIPE_OPTIONS|-f|--file <victim_file>]\n" \
+ " [SETSTRIPE_OPTIONS|-f|--file VICTIM_FILE]\n" \
" [--no-verify]\n"
#define SETSTRIPE_USAGE \
#define SETDIRSTRIPE_USAGE \
" [--mdt-count|-c stripe_count>\n" \
- " [--mdt-hash|-H mdt_hash]\n" \
+ " [--help|-h] [--mdt-hash|-H mdt_hash]\n" \
" [--mdt-index|-i mdt_index[,mdt_index,...]\n" \
- " [--default|-D] [--mode|-o mode] <dir>\n" \
+ " [--default|-D] [--mode|-o mode]\n" \
+ " [--max-inherit|-X max_inherit]\n" \
+ " [--max-inherit-rr max_inherit_rr] <dir>\n" \
"\tstripe_count: stripe count of the striped directory\n" \
"\tmdt_index: MDT index of first stripe\n" \
"\tmdt_hash: hash type of the striped directory. mdt types:\n" \
" all_char sum of characters % MDT_COUNT (not recommended)\n" \
"\tdefault_stripe: set default dirstripe of the directory\n" \
"\tmode: the file access permission of the directory (octal)\n" \
- "To create dir with a foreign (free format) layout :\n" \
- "setdirstripe|mkdir --foreign[=<foreign_type>] -x|-xattr <string> " \
- "[--mode|-o mode] [--flags <hex>] <dir>\n" \
- "\tmode: the mode of the directory\n" \
- "\tforeign_type: none or daos\n"
+ "To create dir with a foreign (free format) layout :\n" \
+ "setdirstripe|mkdir --foreign[=FOREIGN_TYPE] -x|-xattr STRING " \
+ "[--mode|-o MODE] [--flags HEX] <dir>\n" \
+ "\tmode: the file access permissions of the directory\n" \
+ "\tforeign_type: none, daos, symlink, or numeric value\n"
/**
* command_t mirror_cmdlist - lfs mirror commands.
command_t mirror_cmdlist[] = {
{ .pc_name = "create", .pc_func = lfs_mirror_create,
.pc_help = "Create a mirrored file.\n"
- "usage: lfs mirror create "
- "<--mirror-count|-N[mirror_count]> "
- "[SETSTRIPE_OPTIONS] ... <filename|directory> ...\n"
+ "usage: lfs mirror create {--mirror-count|-N[MIRROR_COUNT]}\n"
+ "\t\t[SETSTRIPE_OPTIONS] <filename|directory> ...\n"
MIRROR_CREATE_HELP },
{ .pc_name = "delete", .pc_func = lfs_mirror_delete,
.pc_help = "Delete a mirror from a file.\n"
- "usage: lfs mirror delete {--mirror-id <mirror_id> |\n"
- "\t --component-id|--comp-id|-I <comp_id> |\n"
- "\t -p <pool>} <mirrored_file> ...\n"
+ "usage: lfs mirror delete {--mirror-id MIRROR_ID|-p POOL|\n"
+ "\t --component-id|--comp-id|-I COMP_ID} <mirror_file>\n"
},
{ .pc_name = "extend", .pc_func = lfs_mirror_extend,
.pc_help = "Extend a mirrored file.\n"
- "usage: lfs mirror extend "
- "<--mirror-count|-N[mirror_count]> [--no-verify] "
- "[SETSTRIPE_OPTIONS|-f <victim_file>] ... <filename> ...\n"
+ "usage: lfs mirror extend {--mirror-count|-N[MIRROR_COUNT]}\n"
+ "\t\t[--no-verify] [SETSTRIPE_OPTIONS|-f VICTIM_FILE] ... <filename> ...\n"
MIRROR_EXTEND_HELP },
{ .pc_name = "split", .pc_func = lfs_mirror_split,
.pc_help = "Split a mirrored file.\n"
- "usage: lfs mirror split <--mirror-id <mirror_id> |\n"
- "\t --component-id|-I <comp_id>|-p <pool>> [--destroy|-d]\n"
- "\t [-f <new_file>] <mirrored_file> ...\n"
- "\tmirror_id: The numerical unique identifier for a mirror. It\n"
- "\t can be fetched by lfs getstripe command.\n"
- "\tcomp_id: Unique component ID within a mirror.\n"
- "\tpool: Components on specified pool.\n"
- "\tnew_file: This option indicates the layout of the split\n"
- "\t mirror will be stored into. If not specified,\n"
- "\t a new file named <mirrored_file>.mirror~<mirror_id>\n"
- "\t will be used.\n" },
+ "usage: lfs mirror split [--destroy|-d] [-f NEW_FILE] [--help|-h]\n"
+ "\t\t{--mirror-id MIRROR_ID|--component-id|-I COMP_ID|-p POOL}\n"
+ "\t\t<mirrored file> ...\n"
+ "\tMIRROR_ID: The numerical unique identifier for a mirror.\n"
+ "\t It can be fetched by the 'lfs getstripe' command.\n"
+ "\tCOMP_ID: Unique component ID within a mirror.\n"
+ "\tPOOL: Components using specified pool.\n"
+ "\tNEW_FILE: This option indicates the layout of the split\n"
+ "\t mirror will be stored into. If not specified,\n"
+ "\t a new file named <mirrored_file>.mirror~MIRROR_ID\n"
+ "\t will be used.\n" },
{ .pc_name = "read", .pc_func = lfs_mirror_read,
.pc_help = "Read the content of a specified mirror of a file.\n"
- "usage: lfs mirror read <--mirror-id|-N <mirror_id> "
- "[--outfile|-o <output_file>] <mirrored_file>\n" },
+ "usage: lfs mirror read {--mirror-id|-N MIRROR_ID}\n"
+ "\t\t[--outfile|-o <output_file>] <mirrored_file>\n" },
{ .pc_name = "write", .pc_func = lfs_mirror_write,
.pc_help = "Write to a specified mirror of a file.\n"
- "usage: lfs mirror write <--mirror-id|-N <mirror_id> "
- "[--inputfile|-i <input_file>] <mirrored_file>\n" },
+ "usage: lfs mirror write {--mirror-id|-N MIRROR_ID}\n"
+ "\t\t[--inputfile|-i <input_file>] <mirrored_file>\n" },
{ .pc_name = "copy", .pc_func = lfs_mirror_copy,
.pc_help = "Copy a specified mirror to other mirror(s) of a file.\n"
- "usage: lfs mirror copy <--read-mirror|-i <id0>> "
- "<--write-mirror|-o <id1,id2>> <mirrored_file>\n" },
+ "usage: lfs mirror copy {--read-mirror|-i MIRROR_ID0}\n"
+ "\t\t{--write-mirror|-o MIRROR_ID1[,...]} <mirrored_file>\n" },
{ .pc_name = "resync", .pc_func = lfs_mirror_resync,
.pc_help = "Resynchronizes out-of-sync mirrored file(s).\n"
- "usage: lfs mirror resync [--only <mirror_id[,...]>] "
- "<mirrored file> [<mirrored file2>...]\n"},
+ "usage: lfs mirror resync [--only MIRROR_ID[,...]>]\n"
+ "\t\t<mirrored_file> [<mirrored_file2>...]\n" },
{ .pc_name = "verify", .pc_func = lfs_mirror_verify,
.pc_help = "Verify mirrored file(s).\n"
- "usage: lfs mirror verify "
- "[--only <mirror_id,mirror_id2[,...]>] "
- "[--verbose|-v] <mirrored_file> [<mirrored_file2> ...]\n"},
+ "usage: lfs mirror verify [--only MIRROR_ID[,...]]\n"
+ "\t\t[--verbose|-v] <mirrored_file> [<mirrored_file2> ...]\n" },
{ .pc_name = "list-commands", .pc_func = lfs_mirror_list_commands,
.pc_help = "list commands supported by lfs mirror"},
{ .pc_name = "help", .pc_func = Parser_help, .pc_help = "help" },
"\t-i: archive id for RW-PCC\n" },
{ .pc_name = "attach_fid", .pc_func = lfs_pcc_attach_fid,
.pc_help = "Attach given files into PCC by FID(s).\n"
- "usage: lfs pcc attach_id <--id|-i NUM> <--mnt|-m mnt> "
- "<fid> ...\n"
+ "usage: lfs pcc attach_id {--id|-i NUM} {--mnt|-m MOUNTPOINT} FID ...\n"
"\t-i: archive id for RW-PCC\n"
"\t-m: Lustre mount point\n" },
{ .pc_name = "state", .pc_func = lfs_pcc_state,
"To create a file with specified striping/composite layout, or\n"
"create/replace the default layout on an existing directory:\n"
SSM_CMD_COMMON("setstripe")
- " [--mode <mode>]\n"
+ " [--mode MODE]\n"
" <directory|filename>\n"
" or\n"
"To add component(s) to an existing composite file:\n"
"usage: setstripe [--delete|-d] <directory>\n"
" or\n"
"To create a mirrored file or set s default mirror layout on a directory:\n"
- "usage: setstripe {--mirror-count|-N}[mirror_count] [SETSTRIPE_OPTIONS] <directory|filename>\n"
+ "usage: setstripe {--mirror-count|-N}[MIRROR_COUNT] [SETSTRIPE_OPTIONS] <directory|filename>\n"
" or\n"
"To delete the last component(s) from an existing composite file\n"
"(note that this will also delete any data in those components):\n"
- "usage: setstripe --component-del [--component-id|-I <comp_id>]\n"
- " [--component-flags|-F <comp_flags>]\n"
+ "usage: setstripe --component-del [--component-id|-I COMP_ID]\n"
+ " [--component-flags|-F COMP_FLAGS]\n"
" <filename>\n"
- "\tcomp_id: Unique component ID to delete\n"
- "\tcomp_flags: 'init' indicating all instantiated components\n"
+ "\tCOMP_ID: Unique component ID to delete\n"
+ "\tCOMP_FLAGS: 'init' indicating all instantiated components\n"
"\t '^init' indicating all uninstantiated components\n"
"\t-I and -F cannot be specified at the same time\n"
+ " or\n"
+ "To set or clear flags on a specific component\n"
+ "(note that this command can only be applied to mirrored files:\n"
+ "usage: setstripe --comp-set {-I COMP_ID|--comp-flags=COMP_FLAGS}\n"
+ " <filename>\n"
+ " or\n"
"To create a file with a foreign (free format) layout:\n"
- "usage: setstripe --foreign[=<foreign_type>]\n"
- " --xattr|-x <layout_string> [--flags <hex>]\n"
- " [--mode <mode>] <filename>\n"},
+ "usage: setstripe --foreign[=FOREIGN_TYPE]\n"
+ " --xattr|-x LAYOUT_STRING [--flags HEX]\n"
+ " [--mode MODE] <filename>\n"},
{"getstripe", lfs_getstripe, 0,
"To list the layout pattern for a given file or files in a\n"
"directory or recursively for all files in a directory tree.\n"
- "usage: getstripe [--ost|-O <uuid>] [--quiet|-q] [--verbose|-v]\n"
+ "usage: getstripe [--ost|-O UUID] [--quiet|-q] [--verbose|-v]\n"
" [--stripe-count|-c] [--stripe-index|-i] [--fid|-F]\n"
" [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
" [--mdt-index|-m] [--recursive|-r] [--raw|-R]\n"
" [--layout|-L] [--generation|-g] [--yaml|-y]\n"
- " [--component-id[=comp_id]|-I[comp_id]]\n"
- " [--component-flags[=comp_flags]]\n"
+ " [--help|-h] [--component-id|-I[=COMP_ID]]\n"
+ " [--component-flags[=COMP_FLAGS]]\n"
" [--component-count]\n"
" [--extension-size|--ext-size|-z]\n"
- " [--component-start[=[+-]comp_start]]\n"
- " [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n"
- " [[!] --mirror-index=[+-]<index> |\n"
- " [!] --mirror-id=[+-]<id>] [--mirror-count|-N]\n"
+ " [--component-start[=[+-]COMP_START]]\n"
+ " [--component-end[=[+-]COMP_END]|-E[[+-]comp_end]]\n"
+ " [[!] --mirror-index=[+-]INDEX |\n"
+ " [!] --mirror-id=[+-]MIRROR_ID] [--mirror-count|-N]\n"
" <directory|filename> ..."},
{"setdirstripe", lfs_setdirstripe, 0,
"Create striped directory on specified MDT, same as mkdir.\n"
"To list the layout pattern info for a given directory\n"
"or recursively for all directories in a directory tree.\n"
"usage: getdirstripe [--mdt-count|-c] [--mdt-index|-m|-i]\n"
- " [--mdt-hash|-H] [--obd|-O <uuid>]\n"
+ " [--help|-h] [--mdt-hash|-H] [--obd|-O UUID]\n"
" [--recursive|-r] [--yaml|-y]\n"
- " [--verbose|-v] [--default|-D] <dir> ..."},
+ " [--verbose|-v] [--default|-D]\n"
+ " [--max-inherit|-X]\n"
+ " [--max-inherit-rr] <dir> ..."},
{"mkdir", lfs_setdirstripe, 0,
"Create striped directory on specified MDT, same as setdirstripe.\n"
"usage: mkdir [OPTION] <directory>\n"
"will become inaccessable after this command. This can only be done\n"
"by the administrator\n"
"usage: rm_entry <dir>\n"},
+ {"unlink_foreign", lfs_unlink_foreign, 0,
+ "To remove the foreign file/dir.\n"
+ "Note: This is for files/dirs prevented to be removed using\n"
+ "unlink/rmdir, but works also for regular ones\n"
+ "usage: unlink_foreign <foreign_dir/file> [<foreign_dir/file> ...]\n"},
{"pool_list", lfs_poollist, 0,
"List pools or pool OSTs\n"
"usage: pool_list <fsname>[.<pool>] | <pathname>\n"},
"usage: find <directory|filename> ...\n"
" [[!] --atime|-A [+-]N[smhdwy]] [[!] --ctime|-C [+-]N[smhdwy]]\n"
" [[!] --mtime|-M [+-]N[smhdwy]]\n"
- " [[!] --btime|--Btime|-B [+-]N[smhdwy]]\n"
+ " [[!] --btime|--Btime|-B [+-]N[smhdwy]] [--help|-h]\n"
" [[!] --newer[XY] <reference>] [[!] --blocks|-b N]\n"
" [--maxdepth|-D N] [[!] --mdt-index|--mdt|-m <uuid|index,...>]\n"
" [[!] --name|-n <pattern>] [[!] --ost|-O <uuid|index,...>]\n"
- " [--print|-P] [--print0|-0] [[!] --size|-s [+-]N[bkMGTPE]]\n"
+ " [[!] --perm [/-]mode] [[!] --pool <pool>] [--print|-P]\n"
+ " [--print0|-0] [[!] --projid <projid>]\n"
+ " [[!] --size|-s [+-]N[bkMGTPE]]\n"
" [[!] --stripe-count|-c [+-]<stripes>]\n"
" [[!] --stripe-index|-i <index,...>]\n"
" [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
" [[!] --extension-size|--ext-size|-z [+-]N[kMGT]]\n"
" [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
- " [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
- " [[!] --projid <projid>]\n"
- " [[!] --foreign[=<foreign_type>]]\n"
+ " [[!] --uid|-u|--user|-U <uid>|<uname>]\n"
" [[!] --layout|-L released,raid0,mdt]\n"
" [[!] --foreign[=<foreign_type>]]\n"
" [[!] --component-count [+-]<comp_cnt>]\n"
" [[!] --mirror-count|-N [+-]<n>]\n"
" [[!] --mirror-state <[^]state>]\n"
" [[!] --mdt-count|-T [+-]<stripes>]\n"
- " [[!] --mdt-hash|-H <hashtype>\n"
+ " [[!] --mdt-hash|-H <[^][blm],[^]fnv_1a_64,all_char,crush,...>\n"
" [[!] --mdt-index|-m <uuid|index,...>]\n"
"\t !: used before an option indicates 'NOT' requested attribute\n"
"\t -: used before a value indicates less than requested value\n"
"\t +: used before a value indicates more than requested value\n"
- "\thashtype: hash type of the striped directory.\n"
- "\t fnv_1a_64 FNV-1a hash algorithm\n"
- "\t all_char sum of characters % MDT_COUNT\n"},
+ "\t ^: used before a flag indicates to exclude it\n"},
{"check", lfs_check, 0,
"Display the status of MGTs, MDTs or OSTs (as specified in the command)\n"
"or all the servers (MGTs, MDTs and OSTs).\n"
- "usage: check <mgts|osts|mdts|all>"},
+ "usage: check {mgts|osts|mdts|all}"},
{"osts", lfs_osts, 0, "list OSTs connected to client "
"[for specified path only]\n" "usage: osts [path]"},
{"mdts", lfs_mdts, 0, "list MDTs connected to client "
"Usage: getname [--help|-h] [--instance|-i] [--fsname|-n] [path ...]"},
#ifdef HAVE_SYS_QUOTA_H
{"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
- "usage: setquota <-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>\n"
- " -b <block-softlimit> -B <block-hardlimit>\n"
- " -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
- " setquota <-u|--user|-g|--group|-p|--projid> <uname>|<uid>|<gname>|<gid>|<projid>\n"
- " [--block-softlimit <block-softlimit>]\n"
- " [--block-hardlimit <block-hardlimit>]\n"
- " [--inode-softlimit <inode-softlimit>]\n"
- " [--inode-hardlimit <inode-hardlimit>] <filesystem>\n"
- " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n"
- " [--block-grace 'notify'|<block-grace>]\n"
- " [--inode-grace 'notify'|<inode-grace>] <filesystem>\n"
- " setquota <-U|-G|-P>\n"
- " -b <block-softlimit> -B <block-hardlimit>\n"
- " -i <inode-softlimit> -I <inode-hardlimit> <filesystem>\n"
- " setquota <-U|--default-usr|-G|--default-grp|-P|--default-prj>\n"
- " [--block-softlimit <block-softlimit>]\n"
- " [--block-hardlimit <block-hardlimit>]\n"
- " [--inode-softlimit <inode-softlimit>]\n"
- " [--inode-hardlimit <inode-hardlimit>] <filesystem>\n"
- " setquota <-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>\n"
- " <-d|--default>\n"
+ "usage: setquota {-u|-g|-p} UNAME|UID|GNAME|GID|PROJID\n"
+ " -b BLOCK_SOFTLIMIT -B BLOCK_HARDLIMIT\n"
+ " -i INODE_SOFTLIMIT -I INODE_HARDLIMIT <filesystem>\n"
+ " setquota {-u|--user USER|UID|-g|--group GROUP|GID|-p|--projid PROJID}\n"
+ " [--block-softlimit BLOCK_SOFTLIMIT]\n"
+ " [--block-hardlimit BLOCK_HARDLIMIT]\n"
+ " [--inode-softlimit INODE_SOFTLIMIT]\n"
+ " [--inode-hardlimit INODE_HARDLIMIT] <filesystem>\n"
+ " setquota [-t] {-h|--help|-u|--user|-g|--group|-p|--projid}\n"
+ " [--block-grace 'notify'|BLOCK_GRACE]\n"
+ " [--inode-grace 'notify'|INODE_GRACE] <filesystem>\n"
+ " setquota {-U|-G|-P}\n"
+ " -b BLOCK_SOFTLIMIT -B BLOCK_HARDLIMIT\n"
+ " -i INODE_SOFTLIMIT -I INODE_HARDLIMIT <filesystem>\n"
+ " setquota {-U|--default-usr|-G|--default-grp|-P|--default-prj}\n"
+ " [--block-softlimit BLOCK_SOFTLIMIT]\n"
+ " [--block-hardlimit BLOCK_HARDLIMIT]\n"
+ " [--inode-softlimit INODE_SOFTLIMIT]\n"
+ " [--inode-hardlimit INODE_HARDLIMIT] <filesystem>\n"
+ " setquota {-u|-g|-p} UNAME|UID|GNAME|GID|PROJID\n"
+ " {-d|--default}\n"
" -b can be used instead of --block-softlimit/--block-grace\n"
" -B can be used instead of --block-hardlimit\n"
" -i can be used instead of --inode-softlimit/--inode-grace\n"
" be notified after the quota is over soft limit but prevents\n"
" the soft limit from becoming the hard limit."},
{"quota", lfs_quota, 0, "Display disk usage and limits.\n"
- "usage: quota [-q] [-v] [-h] [-o <obd_uuid>|-i <mdt_idx>|-I "
- "<ost_idx>]\n"
- " [<-u|-g|-p> <uname>|<uid>|<gname>|<gid>|<projid>] <filesystem>\n"
- " quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g|-p> <filesystem>\n"
- " quota [-q] [-v] [h] <-U|-G|-P> <filesystem>"},
+ "usage: quota [-q] [-v] [-h] [-o OBD_UUID|-i MDT_IDX|-I OST_IDX]\n"
+ " [{-u|-g|-p} UNAME|UID|GNAME|GID|PROJID] <filesystem>\n"
+ " quota [-o OBD_UUID|-i MDT_IDX|-I OST_IDX] -t {-u|-g|-p} <filesystem>\n"
+ " quota [-q] [-v] [h] {-U|-G|-P} <filesystem>"},
{"project", lfs_project, 0,
"Change or list project attribute for specified file or directory.\n"
"usage: project [-d|-r] <file|directory...>\n"
" clear the project inherit flag and ID on the file or directory\n"
},
#endif
- {"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n"
- "usage: flushctx [-k] [mountpoint...]"},
+ {"flushctx", lfs_flushctx, 0,
+ "Flush security context for current user.\n"
+ "usage: flushctx [-k] [-r] [mountpoint...]"},
{"changelog", lfs_changelog, 0,
"Show the metadata changes on an MDT."
"\nusage: changelog <mdtname> [startrec [endrec]]"},
{"fid2path", lfs_fid2path, 0,
"Resolve the full path(s) for given FID(s). For a specific hardlink "
"specify link number <linkno>.\n"
- "usage: fid2path [-c] [--link|-l <linkno>] <fsname|root> <fid> ..."},
+ "usage: fid2path [--print-fid|-f] [--print-link|-c] [--link|-l <linkno>] "
+ "<fsname|root> <fid>..."},
{"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n"
"usage: path2fid [--parents] <path> ..."},
{"rmfid", lfs_rmfid, 0, "Remove file(s) by FID(s)\n"
"usage: swap_layouts <path1> <path2>"},
{"migrate", lfs_setstripe_migrate, 0,
"migrate a directory between MDTs.\n"
- "usage: migrate [--mdt-count|-c] <stripe_count>\n"
- " [--mdt-hash|-H] <hash_type>\n"
- " [--mdt-index|-m] <start_mdt_index>\n"
- " [--verbose|-v]\n"
- " <directory>\n"
+ "usage: migrate [--mdt-count|-c STRIPE_COUNT]\n"
+ " [--mdt-hash|-H HASH_TYPE]\n"
+ " [--mdt-index|-m START_MDT_INDEX] [--verbose|-v]\n"
+ " <directory>\n"
"\tmdt: MDTs to stripe over, if only one MDT is specified\n"
" it's the MDT index of first stripe\n"
"\tmdt_count: number of MDTs to stripe a directory over\n"
"\n"
"migrate file objects from one OST "
"layout\nto another (may be not safe with concurent writes).\n"
- "usage: migrate "
- "[--stripe-count|-c] <stripe_count>\n"
- "[--overstripe-count|-C] <stripe_count>\n"
- " [--stripe-index|-i] <start_ost_index>\n"
- " [--stripe-size|-S] <stripe_size>\n"
- " [--pool|-p] <pool_name>\n"
- " [--ost|-o] <ost_indices>\n"
- " [--block|-b]\n"
- " [--non-block|-n]\n"
- " [--non-direct|-D]\n"
- " <file|directory>\n"
- "\tstripe_count: number of OSTs to stripe a file over\n"
- "\t Using -C instead of -c allows overstriping, which\n"
- "\t will place more than one stripe per OST if\n"
- "\t stripe_count is greater than the number of OSTs\n"
+ "usage: migrate [--stripe-count|-c STRIPE_COUNT]\n"
+ " [--overstripe-count|-C STRIPE_COUNT]\n"
+ " [--stripe-index|-i START_OST_INDEX]\n"
+ " [--stripe-size|-S STRIPE_SIZE]\n"
+ " [--pool|-p <pool_name>] [--ost|-o OST_INDICES]\n"
+ " [--block|-b] [--non-block|-n] [--non-direct|-D]\n"
+ " <file|directory>\n"
+ "\tstripe_count: number of OSTs to stripe a file over\n"
+ "\t Using -C instead of -c allows overstriping, which\n"
+ "\t will place more than one stripe per OST if\n"
+ "\t stripe_count is greater than the number of OSTs\n"
"\tstripe_ost_index: index of the first OST to stripe a file over\n"
"\tstripe_size: number of bytes to store before moving to the next OST\n"
"\tpool_name: name of the predefined pool of OSTs\n"
{"mv", lfs_mv, 0,
"To move directories between MDTs. This command is deprecated, "
"use \"migrate\" instead.\n"
- "usage: mv <directory|filename> [--mdt-index|-m] <mdt_index> "
+ "usage: mv <directory|filename> [--mdt-index|-m MDT_INDEX] "
"[--verbose|-v]\n"},
{"ladvise", lfs_ladvise, 0,
"Provide servers with advice about access patterns for a file.\n"
"usage: ladvise [--advice|-a ADVICE] [--start|-s START[kMGT]]\n"
" [--background|-b] [--unset|-u]\n\n"
- " {[--end|-e END[kMGT]] | [--length|-l LENGTH[kMGT]]}\n"
+ " {--end|-e END[kMGT]|--length|-l LENGTH[kMGT]}\n"
" {[--mode|-m [READ,WRITE]}\n"
" <file> ...\n"},
{"mirror", lfs_mirror, mirror_cmdlist,
MIGRATION_VERBOSE = 0x0008,
};
-static int lfs_component_create(char *fname, int open_flags, mode_t open_mode,
- struct llapi_layout *layout);
-
static int
migrate_open_files(const char *name, __u64 migration_flags,
const struct llapi_stripe_param *param,
random_value = random();
rc = snprintf(volatile_file, sizeof(volatile_file),
- "%s/%s:%.4X:%.4X", parent, LUSTRE_VOLATILE_HDR,
- mdt_index, random_value);
+ "%s/%s:%.4X:%.4X:fd=%.2d", parent,
+ LUSTRE_VOLATILE_HDR, mdt_index,
+ random_value, fd);
if (rc >= sizeof(volatile_file)) {
rc = -ENAMETOOLONG;
break;
}
/* create, open a volatile file, use caching (ie no directio) */
- if (layout)
- fdv = lfs_component_create(volatile_file, open_flags,
- open_mode, layout);
- else
+ if (layout) {
+ /* Returns -1 and sets errno on error: */
+ fdv = llapi_layout_file_open(volatile_file, open_flags,
+ open_mode, layout);
+ if (fdv < 0)
+ fdv = -errno;
+ } else {
+ /* Does the right thing on error: */
fdv = llapi_file_open_param(volatile_file, open_flags,
open_mode, param);
+ }
} while (fdv < 0 && (rc = fdv) == -EEXIST);
if (rc < 0) {
static int migrate_copy_data(int fd_src, int fd_dst, int (*check_file)(int))
{
struct llapi_layout *layout;
- size_t buf_size = 4 * 1024 * 1024;
- 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;
+ size_t buf_size = 4 * 1024 * 1024;
+ void *buf = NULL;
+ off_t pos = 0;
+ off_t data_end = 0;
+ size_t page_size = sysconf(_SC_PAGESIZE);
+ bool sparse;
+ int rc;
layout = llapi_layout_get_by_fd(fd_src, 0);
if (layout) {
}
/* Use a page-aligned buffer for direct I/O */
- rc = posix_memalign(&buf, getpagesize(), buf_size);
+ rc = posix_memalign(&buf, page_size, buf_size);
if (rc != 0)
return -rc;
+ sparse = llapi_file_is_sparse(fd_src);
+ if (sparse) {
+ rc = ftruncate(fd_dst, pos);
+ if (rc < 0) {
+ rc = -errno;
+ return rc;
+ }
+ }
+
while (1) {
- /*
- * read new data only if we have written all
- * previously read data
- */
- if (wpos == rpos) {
- if (check_file) {
- rc = check_file(fd_src);
+ off_t data_off;
+ size_t to_read, to_write;
+ ssize_t rsize;
+
+ if (sparse && pos >= data_end) {
+ size_t data_size;
+
+ data_off = llapi_data_seek(fd_src, pos, &data_size);
+ if (data_off < 0) {
+ /* Non-fatal, switch to full copy */
+ sparse = false;
+ continue;
+ }
+ /* hole at the end of file, truncate up to it */
+ if (!data_size) {
+ rc = ftruncate(fd_dst, data_off);
if (rc < 0)
- break;
+ goto out;
}
+ pos = data_off & ~(page_size - 1);
+ data_end = data_off + data_size;
+ to_read = ((data_end - pos - 1) | (page_size - 1)) + 1;
+ to_read = MIN(to_read, buf_size);
+ } else {
+ to_read = buf_size;
+ }
- rsize = read(fd_src, buf, buf_size);
- if (rsize < 0) {
- rc = -errno;
- break;
- }
- rpos += rsize;
- bufoff = 0;
+ if (check_file) {
+ rc = check_file(fd_src);
+ if (rc < 0)
+ goto out;
}
- /* eof ? */
- if (rsize == 0)
- break;
- wsize = write(fd_dst, buf + bufoff, rpos - wpos);
- if (wsize < 0) {
+ rsize = pread(fd_src, buf, to_read, pos);
+ if (rsize < 0) {
rc = -errno;
+ goto out;
+ }
+ /* EOF */
+ if (rsize == 0)
break;
+
+ to_write = rsize;
+ while (to_write > 0) {
+ ssize_t written;
+
+ written = pwrite(fd_dst, buf, to_write, pos);
+ if (written < 0) {
+ rc = -errno;
+ goto out;
+ }
+ pos += written;
+ to_write -= written;
}
- wpos += wsize;
- bufoff += wsize;
+ if (rc || rsize < to_read)
+ break;
}
- if (rc == 0) {
- rc = fsync(fd_dst);
- if (rc < 0)
- rc = -errno;
- }
+ rc = fsync(fd_dst);
+ if (rc < 0)
+ rc = -errno;
+out:
+ /* Try to avoid page cache pollution after migration. */
+ (void)posix_fadvise(fd_src, 0, 0, POSIX_FADV_DONTNEED);
+ (void)posix_fadvise(fd_dst, 0, 0, POSIX_FADV_DONTNEED);
free(buf);
return rc;
return 0;
}
-static int lfs_component_set(char *fname, int comp_id,
+static
+int lfs_layout_compid_by_pool(char *fname, const char *pool, int *comp_id)
+{
+ struct pool_to_id_cbdata data = { .pool = pool };
+ struct llapi_layout *layout = NULL;
+ int rc;
+
+ layout = llapi_layout_get_by_path(fname, 0);
+ if (!layout) {
+ fprintf(stderr,
+ "error %s: file '%s' couldn't get layout: rc=%d\n",
+ progname, fname, errno);
+ rc = -errno;
+ goto free_layout;
+ }
+ rc = llapi_layout_sanity(layout, fname, false, true);
+ if (rc < 0) {
+ llapi_layout_sanity_perror(errno);
+ goto free_layout;
+ }
+ rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool, &data);
+ if (rc < 0)
+ goto free_layout;
+
+ *comp_id = data.id;
+ rc = 0;
+
+free_layout:
+ if (layout)
+ llapi_layout_free(layout);
+ return rc;
+}
+
+static int lfs_component_set(char *fname, int comp_id, const char *pool,
__u32 flags, __u32 neg_flags)
{
__u32 ids[2];
size_t count = 0;
int rc;
+ if (!comp_id) {
+ if (pool == NULL) {
+ fprintf(stderr,
+ "error %s: neither component id nor pool is specified\n",
+ progname);
+ return -EINVAL;
+ }
+ rc = lfs_layout_compid_by_pool(fname, pool, &comp_id);
+ if (rc)
+ return rc;
+ }
+
if (flags) {
ids[count] = comp_id;
flags_array[count] = flags;
static int comp_str2flags(char *string, __u32 *flags, __u32 *neg_flags)
{
char *name;
-
- if (!string)
- return -EINVAL;
+ char *dup_string = NULL;
+ int rc = 0;
*flags = 0;
*neg_flags = 0;
- for (name = strtok(string, ","); name; name = strtok(NULL, ",")) {
+
+ if (!string || !string[0])
+ return -EINVAL;
+
+ dup_string = strdup(string);
+ if (!dup_string) {
+ llapi_printf(LLAPI_MSG_ERROR,
+ "%s: insufficient memory\n",
+ progname);
+ return -ENOMEM;
+ }
+
+ for (name = strtok(dup_string, ","); name; name = strtok(NULL, ",")) {
bool found = false;
int i;
llapi_printf(LLAPI_MSG_ERROR,
"%s: component flag '%s' not supported\n",
progname, name);
- return -EINVAL;
+ rc = -EINVAL;
+ goto out_free;
}
}
if (!*flags && !*neg_flags)
- return -EINVAL;
+ rc = -EINVAL;
/* don't allow to set and exclude the same flag */
if (*flags & *neg_flags)
+ rc = -EINVAL;
+
+out_free:
+ free(dup_string);
+ return rc;
+}
+
+static int mdthash_input(char *string, __u32 *inflags,
+ __u32 *exflags, __u32 *type)
+{
+ char *name;
+ struct mhf_list {
+ char *name;
+ __u32 flag;
+ } mhflist[] = {
+ {"migrating", LMV_HASH_FLAG_MIGRATION},
+ {"badtype", LMV_HASH_FLAG_BAD_TYPE},
+ {"lostlmv", LMV_HASH_FLAG_LOST_LMV},
+ };
+
+ if (string == NULL)
+ return -EINVAL;
+
+ *inflags = 0;
+ *exflags = 0;
+ *type = 0;
+ for (name = strtok(string, ","); name; name = strtok(NULL, ",")) {
+ bool found = false;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(mhflist); i++) {
+ if (strcmp(name, mhflist[i].name) == 0 ||
+ name[0] == mhflist[i].name[0]) {
+ *inflags |= mhflist[i].flag;
+ found = true;
+ } else if (name[0] == '^' &&
+ (strcmp(name + 1, mhflist[i].name) == 0 ||
+ name[1] == mhflist[i].name[0])) {
+ *exflags |= mhflist[i].flag;
+ found = true;
+ }
+ }
+ if (!found) {
+ i = check_hashtype(name);
+ if (i > 0) {
+ *type |= 1 << i;
+ continue;
+ }
+ llapi_printf(LLAPI_MSG_ERROR,
+ "%s: invalid mdt_hash value '%s'\n",
+ progname, name);
+ return -EINVAL;
+ }
+ }
+
+ /* don't allow to include and exclude the same flag */
+ if (*inflags & *exflags) {
+ llapi_printf(LLAPI_MSG_ERROR,
+ "%s: include and exclude same flag '%s'\n",
+ progname, string);
return -EINVAL;
+ }
return 0;
}
* Return: 0 on success or a negative error code on failure.
*/
static int mirror_create_sanity_check(const char *fname,
- struct mirror_args *list)
+ struct mirror_args *list,
+ bool check_fname)
{
int rc = 0;
bool has_m_file = false;
if (!list)
return -EINVAL;
- if (fname) {
+ if (fname && check_fname) {
struct llapi_layout *layout;
layout = llapi_layout_get_by_path(fname, 0);
return -ENODATA;
}
- rc = llapi_layout_sanity(layout, false, true);
+ rc = llapi_layout_sanity(layout, fname, false, true);
llapi_layout_free(layout);
}
}
- rc = llapi_layout_sanity(list->m_layout, false, true);
+ rc = llapi_layout_sanity(list->m_layout, fname, false, true);
if (rc) {
llapi_layout_sanity_perror(rc);
return rc;
int i = 0;
int rc = 0;
- rc = mirror_create_sanity_check(NULL, mirror_list);
+ rc = mirror_create_sanity_check(fname, mirror_list, false);
if (rc)
return rc;
}
}
llapi_layout_comp_flags_set(m_layout, flags);
- rc = migrate_open_files(name, 0, NULL, m_layout, &fd, &fdv);
+ rc = migrate_open_files(name, MIGRATION_NONDIRECT, NULL, m_layout, &fd,
+ &fdv);
if (rc < 0)
goto out;
{
int rc;
- rc = mirror_create_sanity_check(fname, mirror_list);
+ rc = mirror_create_sanity_check(fname, mirror_list, true);
if (rc)
return rc;
return LLAPI_LAYOUT_ITER_CONT;
}
-struct pool_to_id_cbdata {
- const char *pool;
- __u32 id;
-};
+static int find_mirror_id_by_pool(struct llapi_layout *layout, void *cbdata)
+{
+ char buf[LOV_MAXPOOLNAME + 1];
+ struct pool_to_id_cbdata *d = (void *)cbdata;
+ uint32_t id;
+ int rc;
+
+ rc = llapi_layout_pool_name_get(layout, buf, sizeof(buf));
+ if (rc < 0)
+ return rc;
+ if (strcmp(d->pool, buf))
+ return LLAPI_LAYOUT_ITER_CONT;
+
+ rc = llapi_layout_mirror_id_get(layout, &id);
+ if (rc < 0)
+ return rc;
+ d->id = id;
+
+ return LLAPI_LAYOUT_ITER_STOP;
+}
static int find_comp_id_by_pool(struct llapi_layout *layout, void *cbdata)
{
if (strcmp(d->pool, buf))
return LLAPI_LAYOUT_ITER_CONT;
- rc = llapi_layout_mirror_id_get(layout, &id);
+ rc = llapi_layout_comp_id_get(layout, &id);
if (rc < 0)
return rc;
d->id = id;
__u32 mirror_id;
int mdt_index;
int fd, fdv;
+ bool purge = true; /* delete mirror by setting fdv=fd */
+ bool is_encrypted;
int rc;
+ if (victim_file && (strcmp(fname, victim_file) == 0)) {
+ fprintf(stderr,
+ "error %s: the source file '%s' and -f file are the same\n",
+ progname, fname);
+ return -EINVAL;
+ }
+
/* check fname contains mirror with mirror_id/comp_id */
layout = llapi_layout_get_by_path(fname, 0);
if (!layout) {
return -EINVAL;
}
- rc = llapi_layout_sanity(layout, false, true);
+ rc = llapi_layout_sanity(layout, fname, false, true);
if (rc) {
llapi_layout_sanity_perror(rc);
goto free_layout;
if (mflags & MF_COMP_POOL) {
struct pool_to_id_cbdata data = { .pool = pool };
- rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool,
+ rc = llapi_layout_comp_iterate(layout, find_mirror_id_by_pool,
&data);
mirror_id = data.id;
} else if (mflags & MF_COMP_ID) {
goto close_fd;
}
+ rc = llapi_file_is_encrypted(fd);
+ if (rc < 0) {
+ fprintf(stderr, "%s: cannot get flags of '%s': %d\n",
+ progname, fname, rc);
+ goto close_fd;
+ }
+ is_encrypted = rc;
+
+again:
if (!victim_file) {
/* use a temp file to store the splitted layout */
if (mflags & MF_DESTROY) {
+ char file_path[PATH_MAX];
+ unsigned int rnumber;
+ int open_flags;
+
if (last_non_stale_mirror(mirror_id, layout)) {
rc = -EUCLEAN;
fprintf(stderr,
goto close_fd;
}
- fdv = llapi_create_volatile_idx(parent, mdt_index,
- O_LOV_DELAY_CREATE);
+ if (purge) {
+ /* don't use volatile file for mirror destroy */
+ fdv = fd;
+ } else {
+ /**
+ * try the old way to delete mirror using
+ * volatile file.
+ */
+ do {
+ rnumber = random();
+ rc = snprintf(file_path,
+ sizeof(file_path),
+ "%s/" LUSTRE_VOLATILE_HDR ":%.4X:%.4X:fd=%.2d",
+ parent, mdt_index,
+ rnumber, fd);
+ if (rc < 0 ||
+ rc >= sizeof(file_path)) {
+ fdv = -ENAMETOOLONG;
+ break;
+ }
+
+ open_flags = O_RDWR |
+ (O_LOV_DELAY_CREATE & ~O_ACCMODE) |
+ O_CREAT | O_EXCL | O_NOFOLLOW;
+ fdv = open(file_path, open_flags,
+ S_IRUSR | S_IWUSR);
+ if (fdv < 0)
+ rc = -errno;
+ } while (fdv < 0 && rc == -EEXIST);
+ }
} else {
+ if (is_encrypted) {
+ rc = -1;
+ fprintf(stderr,
+ "error %s: not permitted on encrypted file '%s': %d\n",
+ progname, fname, rc);
+ goto close_fd;
+ }
+
snprintf(victim, sizeof(victim), "%s.mirror~%u",
fname, mirror_id);
fdv = open(victim, flags, S_IRUSR | S_IWUSR);
}
} else {
/* user specified victim file */
+ if (is_encrypted) {
+ rc = -1;
+ fprintf(stderr,
+ "error %s: not permitted on encrypted file '%s': %d\n",
+ progname, fname, rc);
+ goto close_fd;
+ }
fdv = open(victim_file, flags, S_IRUSR | S_IWUSR);
}
data->lil_ids[1] = mirror_id;
rc = llapi_lease_set(fd, data);
if (rc <= 0) {
+ if (rc == -EINVAL && purge) {
+ /* could be old MDS which prohibit fd==fdv */
+ purge = false;
+ goto again;
+
+ }
if (rc == 0) /* lost lease lock */
rc = -EBUSY;
fprintf(stderr,
free(data);
close_victim:
- close(fdv);
+ if (!purge)
+ close(fdv);
close_fd:
close(fd);
free_layout:
end_of_loop = *ptr == '\0';
*ptr = '\0';
+ errno = 0;
start_index = strtol(arg, &endptr, 0);
if (endptr == arg) /* no data at all */
break;
- if (*endptr != '-' && *endptr != '\0') /* has invalid data */
+ if (errno != 0 || start_index < -1 ||
+ (*endptr != '-' && *endptr != '\0'))
break;
end_index = start_index;
if (*endptr == '-') {
+ errno = 0;
end_index = strtol(endptr + 1, &endptr, 0);
- if (*endptr != '\0')
+ if (errno != 0 || *endptr != '\0' || end_index < -1)
break;
if (end_index < start_index)
break;
lsa->lsa_comp_end != 0);
}
+static int lsa_args_stripe_count_check(struct lfs_setstripe_args *lsa)
+{
+ if (lsa->lsa_nr_tgts) {
+ if (lsa->lsa_nr_tgts < 0 ||
+ lsa->lsa_nr_tgts >= LOV_MAX_STRIPE_COUNT) {
+ fprintf(stderr, "Invalid nr_tgts(%d)\n",
+ lsa->lsa_nr_tgts);
+ errno = EINVAL;
+ return -1;
+ }
+
+ if (lsa->lsa_stripe_count > 0 &&
+ lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
+ lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
+ lsa->lsa_nr_tgts != lsa->lsa_stripe_count) {
+ fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n",
+ lsa->lsa_stripe_count,
+ lsa->lsa_nr_tgts);
+ errno = EINVAL;
+ return -1;
+ }
+ }
+
+ return 0;
+
+}
+
/**
* comp_args_to_layout() - Create or extend a composite layout.
* @composite: Pointer to the composite layout.
* This function creates or extends a composite layout by adding a new
* component with stripe options from @lsa.
*
+ * When modified, adjust llapi_stripe_param_verify() if needed as well.
+ *
* Return: 0 on success or an error code on failure.
*/
static int comp_args_to_layout(struct llapi_layout **composite,
}
}
+ rc = lsa_args_stripe_count_check(lsa);
+ if (rc)
+ return rc;
+
if (lsa->lsa_nr_tgts > 0) {
- if (lsa->lsa_stripe_count > 0 &&
- lsa->lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
- lsa->lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
- lsa->lsa_nr_tgts != lsa->lsa_stripe_count) {
- fprintf(stderr, "stripe_count(%lld) != nr_tgts(%d)\n",
- lsa->lsa_stripe_count,
- lsa->lsa_nr_tgts);
- errno = EINVAL;
- return -1;
- }
+ bool found = false;
+
for (i = 0; i < lsa->lsa_nr_tgts; i++) {
rc = llapi_layout_ost_index_set(layout, i,
lsa->lsa_tgts[i]);
if (rc)
break;
+
+ /* Make sure stripe offset is in OST list. */
+ if (lsa->lsa_tgts[i] == lsa->lsa_stripe_off)
+ found = true;
+ }
+ if (!found) {
+ fprintf(stderr, "Invalid stripe offset '%lld', not in the target list",
+ lsa->lsa_stripe_off);
+ errno = EINVAL;
+ return -1;
}
} else if (lsa->lsa_stripe_off != LLAPI_LAYOUT_DEFAULT &&
lsa->lsa_stripe_off != -1) {
LFS_LAYOUT_FOREIGN_OPT,
LFS_MODE_OPT,
LFS_NEWERXY_OPT,
+ LFS_INHERIT_RR_OPT,
+ LFS_FIND_PERM,
};
/* functions */
/* find { .val = 'F', .name = "fid", .has_arg = no_argument }, */
/* find { .val = 'g', .name = "gid", .has_arg = no_argument }, */
/* find { .val = 'G', .name = "group", .has_arg = required_argument }*/
-/* find { .val = 'h', .name = "help", .has_arg = no_argument }, */
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'H', .name = "mdt-hash", .has_arg = required_argument},
{ .val = 'i', .name = "stripe-index", .has_arg = required_argument},
{ .val = 'i', .name = "stripe_index", .has_arg = required_argument},
/* --verbose is only valid in migrate mode */
{ .val = 'v', .name = "verbose", .has_arg = no_argument},
{ .val = 'x', .name = "xattr", .has_arg = required_argument },
+/* dirstripe { .val = 'X',.name = "max-inherit",.has_arg = required_argument }*/
{ .val = 'y', .name = "yaml", .has_arg = required_argument },
{ .val = 'z', .name = "ext-size", .has_arg = required_argument},
{ .val = 'z', .name = "extension-size", .has_arg = required_argument},
snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
progname = cmd;
while ((c = getopt_long(argc, argv,
- "bc:C:dDE:f:H:i:I:m:N::no:p:L:s:S:vx:y:z:",
+ "bc:C:dDE:f:hH:i:I:m:N::no:p:L:s:S:vx:y:z:",
long_opts, NULL)) >= 0) {
size_units = 1;
switch (c) {
case LFS_COMP_NO_VERIFY_OPT:
mirror_flags |= MF_NO_VERIFY;
break;
- case LFS_MIRROR_ID_OPT:
- mirror_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || mirror_id == 0) {
+ case LFS_MIRROR_ID_OPT: {
+ unsigned long int id;
+
+ errno = 0;
+ id = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' || id == 0 ||
+ id > UINT16_MAX) {
fprintf(stderr,
"%s %s: invalid mirror ID '%s'\n",
progname, argv[0], optarg);
goto usage_error;
}
+
+ mirror_id = (__u16)id;
break;
+ }
case LFS_LAYOUT_FLAGS_OPT: {
uint32_t neg_flags;
/* check for numeric flags (foreign and mirror cases) */
if (setstripe_mode && !mirror_mode && !last_mirror) {
+ errno = 0;
flags = strtoul(optarg, &end, 16);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ flags >= UINT32_MAX) {
fprintf(stderr,
- "%s %s: bad flags '%s'\n",
+ "%s %s: invalid hex flags '%s'\n",
progname, argv[0], optarg);
return CMD_HELP;
}
+ if (!foreign_mode) {
+ fprintf(stderr,
+ "%s %s: hex flags must be specified with --foreign option\n",
+ progname, argv[0]);
+ return CMD_HELP;
+ }
break;
}
optarg);
return CMD_HELP;
}
+ } else if (type >= UINT32_MAX) {
+ fprintf(stderr,
+ "%s %s: invalid foreign type '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
}
}
foreign_mode = true;
lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING;
/* fall through */
case 'c':
+ errno = 0;
lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0'||
+ lsa.lsa_stripe_count < -1 ||
+ lsa.lsa_stripe_count > LOV_MAX_STRIPE_COUNT) {
fprintf(stderr,
"%s %s: invalid stripe count '%s'\n",
progname, argv[0], optarg);
lsa.lsa_comp_end = LUSTRE_EOF;
} else {
result = llapi_parse_size(optarg,
- &lsa.lsa_comp_end,
- &size_units, 0);
- if (result) {
+ &lsa.lsa_comp_end,
+ &size_units, 0);
+ /* assume units of KB if too small */
+ if (lsa.lsa_comp_end < 4096)
+ lsa.lsa_comp_end *= 1024;
+ if (result ||
+ lsa.lsa_comp_end & (LOV_MIN_STRIPE_SIZE - 1)) {
fprintf(stderr,
"%s %s: invalid component end '%s'\n",
progname, argv[0], optarg);
}
break;
case 'i':
+ errno = 0;
lsa.lsa_stripe_off = strtol(optarg, &end, 0);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ lsa.lsa_stripe_off < -1 ||
+ lsa.lsa_stripe_off > LOV_V1_INSANE_STRIPE_COUNT) {
fprintf(stderr,
"%s %s: invalid stripe offset '%s'\n",
progname, argv[0], optarg);
lsa.lsa_nr_tgts, optarg, NULL);
if (lsa.lsa_nr_tgts < 0) {
fprintf(stderr,
- "%s %s: invalid MDT target(s) '%s'\n",
- progname, argv[0], optarg);
- return CMD_HELP;
+ "%s: invalid MDT target(s) '%s'\n",
+ progname, optarg);
+ goto usage_error;
}
lsa.lsa_tgts = tgts;
}
mirror_count = 1;
if (optarg) {
+ errno = 0;
mirror_count = strtoul(optarg, &end, 0);
- if (*end != '\0' || mirror_count == 0) {
+ if (errno != 0 || *end != '\0' ||
+ mirror_count == 0 ||
+ mirror_count > LUSTRE_MIRROR_COUNT_MAX) {
fprintf(stderr,
"error: %s: bad mirror count: %s\n",
progname, optarg);
case 'S':
result = llapi_parse_size(optarg, &lsa.lsa_stripe_size,
&size_units, 0);
- if (result) {
+ /* assume units of KB if too small to be valid */
+ if (lsa.lsa_stripe_size < 4096)
+ lsa.lsa_stripe_size *= 1024;
+ if (result ||
+ lsa.lsa_stripe_size & (LOV_MIN_STRIPE_SIZE - 1)) {
fprintf(stderr,
"%s %s: invalid stripe size '%s'\n",
progname, argv[0], optarg);
lsa.lsa_extension_comp = true;
break;
default:
- fprintf(stderr, "%s %s: unrecognized option '%s'\n",
- progname, argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ case 'h':
goto usage_error;
}
}
}
}
- if (comp_set && !comp_id) {
+ if (comp_set && !comp_id && !lsa.lsa_pool_name) {
fprintf(stderr,
"%s %s: --component-set doesn't have component-id set\n",
progname, argv[0]);
migrate_mdt_param.fp_lmv_md = lmu;
migrate_mdt_param.fp_migrate = 1;
} else if (!layout) {
+ if (lsa_args_stripe_count_check(&lsa))
+ goto usage_error;
+
/* initialize stripe parameters */
param = calloc(1, offsetof(typeof(*param),
lsp_osts[lsa.lsa_nr_tgts]));
}
param->lsp_pool = lsa.lsa_pool_name;
param->lsp_is_specific = false;
- if (lsa.lsa_nr_tgts > 0) {
- if (lsa.lsa_stripe_count > 0 &&
- lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
- lsa.lsa_stripe_count != LLAPI_LAYOUT_WIDE &&
- lsa.lsa_nr_tgts != lsa.lsa_stripe_count) {
- fprintf(stderr,
- "error: %s: stripe count %lld doesn't match the number of OSTs: %d\n",
- argv[0], lsa.lsa_stripe_count,
- lsa.lsa_nr_tgts);
- free(param);
- goto usage_error;
- }
+ if (lsa.lsa_nr_tgts > 0) {
param->lsp_is_specific = true;
param->lsp_stripe_count = lsa.lsa_nr_tgts;
memcpy(param->lsp_osts, tgts,
layout);
} else if (comp_set != 0) {
result = lfs_component_set(fname, comp_id,
+ lsa.lsa_pool_name,
lsa.lsa_comp_flags,
lsa.lsa_comp_neg_flags);
} else if (comp_del != 0) {
} else if (opc == SO_MIRROR_SPLIT || opc == SO_MIRROR_DELETE) {
if (!mirror_id && !comp_id && !lsa.lsa_pool_name) {
fprintf(stderr,
- "%s: no mirror specified to delete from '%s'\n",
+ "%s: no mirror id, component id, or pool name specified to delete from '%s'\n",
progname, fname);
goto usage_error;
}
comp_id = mirror_id;
else
mirror_flags |= MF_COMP_ID;
+ if (has_m_file && !strcmp(fname, mirror_list->m_file)) {
+ fprintf(stderr,
+ "%s: the file specified by -f cannot be same as the source file '%s'\n",
+ progname, fname);
+ goto usage_error;
+ }
result = mirror_split(fname, comp_id, lsa.lsa_pool_name,
mirror_flags,
has_m_file ? mirror_list->m_file :
return 0;
}
+static int parse_symbolic(const char *input, mode_t *outmode, const char **end)
+{
+ int loop;
+ int user, group, other;
+ int who, all;
+ char c, op;
+ mode_t perm;
+ mode_t usermask;
+ mode_t previous_flags;
+
+ user = group = other = 0;
+ all = 0;
+ loop = 1;
+ perm = 0;
+ previous_flags = 0;
+ *end = input;
+ usermask = 0;
+
+ while (loop) {
+ switch (*input) {
+ case 'u':
+ user = 1;
+ break;
+ case 'g':
+ group = 1;
+ break;
+ case 'o':
+ other = 1;
+ break;
+ case 'a':
+ user = group = other = 1;
+ all = 1;
+ break;
+ default:
+ loop = 0;
+ }
+
+ if (loop)
+ input++;
+ }
+
+ who = user || group || other;
+ if (!who) {
+ /* get the umask */
+ usermask = umask(0022);
+ umask(usermask);
+ usermask &= 07777;
+ }
+
+ if (*input == '-' || *input == '+' || *input == '=')
+ op = *input++;
+ else
+ /* operation is required */
+ return -1;
+
+ /* get the flags in *outmode */
+ switch (*input) {
+ case 'u':
+ previous_flags = (*outmode & 0700);
+ perm |= user ? previous_flags : 0;
+ perm |= group ? (previous_flags >> 3) : 0;
+ perm |= other ? (previous_flags >> 6) : 0;
+ input++;
+ goto write_perm;
+ case 'g':
+ previous_flags = (*outmode & 0070);
+ perm |= user ? (previous_flags << 3) : 0;
+ perm |= group ? previous_flags : 0;
+ perm |= other ? (previous_flags >> 3) : 0;
+ input++;
+ goto write_perm;
+ case 'o':
+ previous_flags = (*outmode & 0007);
+ perm |= user ? (previous_flags << 6) : 0;
+ perm |= group ? (previous_flags << 3) : 0;
+ perm |= other ? previous_flags : 0;
+ input++;
+ goto write_perm;
+ default:
+ break;
+ }
+
+ /* this part is optional,
+ * if empty perm = 0 and *outmode is not modified
+ */
+ loop = 1;
+ while (loop) {
+ c = *input;
+ switch (c) {
+ case 'r':
+ perm |= user ? 0400 : 0;
+ perm |= group ? 0040 : 0;
+ perm |= other ? 0004 : 0;
+ /* set read permission for uog except for umask's
+ * permissions
+ */
+ perm |= who ? 0 : (0444 & ~usermask);
+ break;
+ case 'w':
+ perm |= user ? 0200 : 0;
+ perm |= group ? 0020 : 0;
+ perm |= other ? 0002 : 0;
+ /* set write permission for uog except for umask'
+ * permissions
+ */
+ perm |= who ? 0 : (0222 & ~usermask);
+ break;
+ case 'x':
+ perm |= user ? 0100 : 0;
+ perm |= group ? 0010 : 0;
+ perm |= other ? 0001 : 0;
+ /* set execute permission for uog except for umask'
+ * permissions
+ */
+ perm |= who ? 0 : (0111 & ~usermask);
+ break;
+ case 'X':
+ /*
+ * Adds execute permission to 'u', 'g' and/or 'g' if
+ * specified and either 'u', 'g' or 'o' already has
+ * execute permissions.
+ */
+ if ((*outmode & 0111) != 0) {
+ perm |= user ? 0100 : 0;
+ perm |= group ? 0010 : 0;
+ perm |= other ? 0001 : 0;
+ perm |= !who ? 0111 : 0;
+ }
+ break;
+ case 's':
+ /* s is ignored if o is given, but it's not an error */
+ if (other && !group && !user)
+ break;
+ perm |= user ? S_ISUID : 0;
+ perm |= group ? S_ISGID : 0;
+ break;
+ case 't':
+ /* 't' should be used when 'a' is given
+ * or who is empty
+ */
+ perm |= (!who || all) ? S_ISVTX : 0;
+ /* using ugo with t is not an error */
+ break;
+ default:
+ loop = 0;
+ break;
+ }
+ if (loop)
+ input++;
+ }
+
+write_perm:
+ /* uog flags should be only one character long */
+ if (previous_flags && (*input != '\0' && *input != ','))
+ return -1;
+
+ switch (op) {
+ case '-':
+ /* remove the flags from outmode */
+ *outmode &= ~perm;
+ break;
+ case '+':
+ /* add the flags to outmode */
+ *outmode |= perm;
+ break;
+ case '=':
+ /* set the flags of outmode to perm */
+ if (perm != 0)
+ *outmode = perm;
+ break;
+ }
+
+ *end = input;
+ return 0;
+}
+
+static int str2mode_t(const char *input, mode_t *outmode)
+{
+ int ret;
+ const char *iter;
+
+ ret = 0;
+
+ if (*input >= '0' && *input <= '7') {
+ /* parse octal representation */
+ char *end;
+
+ iter = input;
+
+ /* look for invalid digits in octal representation */
+ while (isdigit(*iter))
+ if (*iter++ > '7')
+ return -1;
+
+ errno = 0;
+ *outmode = strtoul(input, &end, 8);
+
+ if (errno != 0 || *outmode > 07777) {
+ *outmode = 0;
+ ret = -1;
+ }
+
+ } else if (*input == '8' || *input == '9') {
+ /* error: invalid octal number */
+ ret = -1;
+ } else {
+ /* parse coma seperated list of symbolic representation */
+ int rc;
+ const char *end;
+
+ *outmode = 0;
+ rc = 0;
+ end = NULL;
+
+ do {
+ rc = parse_symbolic(input, outmode, &end);
+ if (rc)
+ return -1;
+
+ input = end+1;
+ } while (*end == ',');
+
+ if (*end != '\0')
+ ret = -1;
+ }
+ return ret;
+}
+
static int lfs_find(int argc, char **argv)
{
int c, rc;
.has_arg = required_argument },
{ .val = LFS_MIRROR_STATE_OPT,
.name = "mirror-state", .has_arg = required_argument },
- { .val = LFS_LAYOUT_FOREIGN_OPT,
- .name = "foreign", .has_arg = optional_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "newer", .has_arg = required_argument},
{ .val = LFS_NEWERXY_OPT,
.name = "foreign", .has_arg = optional_argument},
{ .val = 'g', .name = "gid", .has_arg = required_argument },
{ .val = 'G', .name = "group", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'H', .name = "mdt-hash", .has_arg = required_argument },
{ .val = 'i', .name = "stripe-index", .has_arg = required_argument },
{ .val = 'i', .name = "stripe_index", .has_arg = required_argument },
{ .val = 'S', .name = "stripe-size", .has_arg = required_argument },
{ .val = 'S', .name = "stripe_size", .has_arg = required_argument },
{ .val = 't', .name = "type", .has_arg = required_argument },
+ { .val = LFS_FIND_PERM,
+ .name = "perm", .has_arg = required_argument },
{ .val = 'T', .name = "mdt-count", .has_arg = required_argument },
{ .val = 'u', .name = "uid", .has_arg = required_argument },
{ .val = 'U', .name = "user", .has_arg = required_argument },
/* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
while ((c = getopt_long_only(argc, argv,
- "-0A:b:B:c:C:D:E:g:G:H:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:",
+ "-0A:b:B:c:C:D:E:g:G:hH:i:L:m:M:n:N:O:Ppqrs:S:t:T:u:U:vz:",
long_opts, &optidx)) >= 0) {
xtime = NULL;
xsign = NULL;
optarg++;
}
+ errno = 0;
param.fp_comp_count = strtoul(optarg, &endptr, 0);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' ||
+ param.fp_comp_count > UINT32_MAX) {
fprintf(stderr,
"error: bad component count '%s'\n",
optarg);
optarg++;
}
+ errno = 0;
param.fp_stripe_count = strtoul(optarg, &endptr, 0);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' ||
+ param.fp_stripe_count > LOV_MAX_STRIPE_COUNT) {
fprintf(stderr,
"error: bad stripe_count '%s'\n",
optarg);
param.fp_exclude_stripe_count = !!neg_opt;
break;
case 'D':
+ errno = 0;
param.fp_max_depth = strtol(optarg, 0, 0);
+ if (errno != 0 || param.fp_max_depth < 0) {
+ fprintf(stderr,
+ "error: bad maxdepth '%s'\n",
+ optarg);
+ ret = -1;
+ goto err;
+ }
break;
case 'E':
if (optarg[0] == '+') {
rc = llapi_parse_size(optarg,
¶m.fp_comp_end,
¶m.fp_comp_end_units, 0);
+ /* assume units of KB if too small */
+ if (param.fp_comp_end < 4096)
+ param.fp_comp_end *= 1024;
}
if (rc) {
fprintf(stderr,
optarg);
return CMD_HELP;
}
+ } else if (type >= UINT32_MAX) {
+ fprintf(stderr,
+ "%s %s: invalid foreign type '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
}
}
param.fp_foreign_type = type;
param.fp_check_gid = 1;
break;
case 'H':
- param.fp_hash_type = check_hashtype(optarg);
- if (param.fp_hash_type == 0) {
- fprintf(stderr, "error: bad hash_type '%s'\n",
- optarg);
+ rc = mdthash_input(optarg, ¶m.fp_hash_inflags,
+ ¶m.fp_hash_exflags,
+ ¶m.fp_hash_type);
+ if (rc) {
ret = -1;
goto err;
}
- param.fp_check_hash_type = 1;
+ if (param.fp_hash_inflags || param.fp_hash_exflags)
+ param.fp_check_hash_flag = 1;
param.fp_exclude_hash_type = !!neg_opt;
break;
case 'l':
optarg++;
}
+ errno = 0;
param.fp_mirror_count = strtoul(optarg, &endptr, 0);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' ||
+ param.fp_mirror_count > LUSTRE_MIRROR_COUNT_MAX) {
fprintf(stderr,
"error: bad mirror count '%s'\n",
optarg);
ret = llapi_parse_size(optarg, ¶m.fp_stripe_size,
¶m.fp_stripe_size_units, 0);
+ /* assume units of KB if too small to be valid */
+ if (param.fp_stripe_size < 4096)
+ param.fp_stripe_size *= 1024;
if (ret) {
fprintf(stderr, "error: bad stripe_size '%s'\n",
optarg);
param.fp_type = S_IFSOCK;
break;
default:
- fprintf(stderr, "error: %s: bad type '%s'\n",
- argv[0], optarg);
+ fprintf(stderr, "%s: bad type '%s'\n",
+ progname, optarg);
ret = CMD_HELP;
goto err;
- };
+ }
+ break;
+ case LFS_FIND_PERM:
+ param.fp_exclude_perm = !!neg_opt;
+ param.fp_perm_sign = LFS_FIND_PERM_EXACT;
+ if (*optarg == '/') {
+ param.fp_perm_sign = LFS_FIND_PERM_ANY;
+ optarg++;
+ } else if (*optarg == '-') {
+ param.fp_perm_sign = LFS_FIND_PERM_ALL;
+ optarg++;
+ }
+
+ if (str2mode_t(optarg, ¶m.fp_perm)) {
+ fprintf(stderr, "error: invalid mode '%s'\n",
+ optarg);
+ ret = -1;
+ goto err;
+ }
break;
case 'T':
if (optarg[0] == '+') {
optarg++;
}
+ errno = 0;
param.fp_mdt_count = strtoul(optarg, &endptr, 0);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' ||
+ param.fp_mdt_count >= UINT32_MAX) {
fprintf(stderr, "error: bad mdt_count '%s'\n",
optarg);
ret = -1;
param.fp_exclude_ext_size = !!neg_opt;
break;
default:
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ case 'h':
ret = CMD_HELP;
goto err;
- };
+ }
}
if (pathstart == -1) {
{ .val = 'F', .name = "fid", .has_arg = no_argument },
{ .val = 'g', .name = "generation", .has_arg = no_argument },
/* find { .val = 'G', .name = "group", .has_arg = required_argument }*/
+ { .val = 'h', .name = "help", .has_arg = no_argument },
/* dirstripe { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }*/
{ .val = 'i', .name = "stripe-index", .has_arg = no_argument },
{ .val = 'i', .name = "stripe_index", .has_arg = no_argument },
/* find { .val = 'u', .name = "uid", .has_arg = required_argument }*/
/* find { .val = 'U', .name = "user", .has_arg = required_argument }*/
{ .val = 'v', .name = "verbose", .has_arg = no_argument },
+/* dirstripe { .val = 'X',.name = "max-inherit",.has_arg = required_argument }*/
{ .val = 'y', .name = "yaml", .has_arg = no_argument },
{ .val = 'z', .name = "extension-size", .has_arg = no_argument },
{ .val = 'z', .name = "ext-size", .has_arg = no_argument },
param->fp_max_depth = 0;
}
break;
- case LFS_MIRROR_INDEX_OPT:
+ case LFS_MIRROR_INDEX_OPT: {
+ unsigned long int mirror_index;
+
if (optarg[0] == '+') {
param->fp_mirror_index_sign = -1;
optarg++;
optarg++;
}
- param->fp_mirror_index = strtoul(optarg, &end, 0);
- if (*end != '\0' || (param->fp_mirror_index == 0 &&
+ errno = 0;
+ mirror_index = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' ||
+ mirror_index > UINT16_MAX || (mirror_index == 0 &&
param->fp_mirror_index_sign == 0 && neg_opt == 0)) {
fprintf(stderr,
"%s %s: invalid mirror index '%s'\n",
progname, argv[0], optarg);
return CMD_HELP;
}
+
+ param->fp_mirror_index = (__u16)mirror_index;
+
if (param->fp_mirror_id != 0) {
fprintf(stderr,
"%s %s: can't specify both mirror index and mirror ID\n",
param->fp_check_mirror_index = 1;
param->fp_exclude_mirror_index = !!neg_opt;
break;
- case LFS_MIRROR_ID_OPT:
+ }
+ case LFS_MIRROR_ID_OPT: {
+ unsigned long int mirror_id;
+
if (optarg[0] == '+') {
param->fp_mirror_id_sign = -1;
optarg++;
optarg++;
}
- param->fp_mirror_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || (param->fp_mirror_id == 0 &&
+ errno = 0;
+ mirror_id = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' ||
+ mirror_id > UINT16_MAX || (mirror_id == 0 &&
param->fp_mirror_id_sign == 0 && neg_opt == 0)) {
fprintf(stderr,
"%s %s: invalid mirror ID '%s'\n",
progname, argv[0], optarg);
return CMD_HELP;
}
+
+ param->fp_mirror_id = (__u16)mirror_id;
+
if (param->fp_mirror_index != 0) {
fprintf(stderr,
"%s %s: can't specify both mirror index and mirror ID\n",
param->fp_check_mirror_id = 1;
param->fp_exclude_mirror_id = !!neg_opt;
break;
+ }
case 'd':
param->fp_max_depth = 0;
break;
rc = llapi_parse_size(tmp,
¶m->fp_comp_end,
¶m->fp_comp_end_units, 0);
+ /* assume units of KB if too small */
+ if (param->fp_comp_end < 4096)
+ param->fp_comp_end *= 1024;
}
if (rc != 0) {
fprintf(stderr,
}
break;
default:
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ case 'h':
return CMD_HELP;
}
}
{
struct find_param param = { 0 };
struct option long_opts[] = {
- { .val = 'c', .name = "mdt-count", .has_arg = no_argument },
- { .val = 'D', .name = "default", .has_arg = no_argument },
- { .val = 'H', .name = "mdt-hash", .has_arg = no_argument },
- { .val = 'i', .name = "mdt-index", .has_arg = no_argument },
- { .val = 'm', .name = "mdt-index", .has_arg = no_argument },
- { .val = 'O', .name = "obd", .has_arg = required_argument },
- { .val = 'r', .name = "recursive", .has_arg = no_argument },
- { .val = 'T', .name = "mdt-count", .has_arg = no_argument },
- { .val = 'v', .name = "verbose", .has_arg = no_argument },
- { .val = 'y', .name = "yaml", .has_arg = no_argument },
+ { .val = 'c', .name = "mdt-count", .has_arg = no_argument },
+ { .val = 'D', .name = "default", .has_arg = no_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'H', .name = "mdt-hash", .has_arg = no_argument },
+ { .val = 'i', .name = "mdt-index", .has_arg = no_argument },
+ { .val = 'm', .name = "mdt-index", .has_arg = no_argument },
+ { .val = 'O', .name = "obd", .has_arg = required_argument },
+ { .val = 'r', .name = "recursive", .has_arg = no_argument },
+ { .val = 'T', .name = "mdt-count", .has_arg = no_argument },
+ { .val = 'v', .name = "verbose", .has_arg = no_argument },
+ { .val = 'X', .name = "max-inherit", .has_arg = no_argument },
+ { .val = 'y', .name = "yaml", .has_arg = no_argument },
+ { .val = LFS_INHERIT_RR_OPT,
+ .name = "max-inherit-rr", .has_arg = no_argument },
{ .name = NULL } };
int c, rc;
param.fp_get_lmv = 1;
while ((c = getopt_long(argc, argv,
- "cDHimO:rtTvy", long_opts, NULL)) != -1) {
+ "cDhHimO:rtTvXy", long_opts, NULL)) != -1) {
switch (c) {
case 'c':
case 'T':
case 'D':
param.fp_get_default_lmv = 1;
break;
- case 'i':
- case 'm':
- param.fp_verbose |= VERBOSE_STRIPE_OFFSET;
- break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 't':
fprintf(stderr,
"warning: '-t' deprecated, use '--mdt-hash' or '-H' instead\n");
+ /* fallthrough */
#endif
case 'H':
param.fp_verbose |= VERBOSE_HASH_TYPE;
break;
+ case 'i': /* fallthrough */
+ case 'm':
+ param.fp_verbose |= VERBOSE_STRIPE_OFFSET;
+ break;
case 'O':
if (param.fp_obd_uuid) {
fprintf(stderr,
- "error: %s: only one obduuid allowed",
- argv[0]);
+ "%s: only one obduuid allowed",
+ progname);
return CMD_HELP;
}
param.fp_obd_uuid = (struct obd_uuid *)optarg;
case 'v':
param.fp_verbose |= VERBOSE_DETAIL;
break;
+ case 'X':
+ param.fp_verbose |= VERBOSE_INHERIT;
+ break;
+ case LFS_INHERIT_RR_OPT:
+ param.fp_verbose |= VERBOSE_INHERIT_RR;
+ break;
case 'y':
param.fp_yaml = 1;
break;
default:
- fprintf(stderr, "%s %s: unrecognized option '%s'\n",
- progname, argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
MNTDF_LAZY = 0x0004,
MNTDF_VERBOSE = 0x0008,
MNTDF_SHOW = 0x0010,
+ MNTDF_DECIMAL = 0x0020,
};
-#define COOK(value) \
+#define COOK(value, base) \
({ \
int radix = 0; \
- while (value > 1024) { \
- value /= 1024; \
+ while (value > base) { \
+ value /= base; \
radix++; \
} \
radix; \
{
long long avail, used, total;
int ratio = 0;
- char *suffix = "KMGTPEZY";
+ char *suffix = flags & MNTDF_DECIMAL ? "kMGTPEZY" : "KMGTPEZY";
/* Note if we have >2^64 bytes/fs these buffers will need to be grown */
char tbuf[3 * sizeof(__u64)];
char ubuf[3 * sizeof(__u64)];
ratio = obd_statfs_ratio(stat, flags & MNTDF_INODES);
if (flags & MNTDF_COOKED) {
- int i;
+ int base = flags & MNTDF_DECIMAL ? 1000 : 1024;
double cook_val;
+ int i;
cook_val = (double)total;
- i = COOK(cook_val);
+ i = COOK(cook_val, base);
if (i > 0)
snprintf(tbuf, sizeof(tbuf), HDF, cook_val,
suffix[i - 1]);
snprintf(tbuf, sizeof(tbuf), CDF, total);
cook_val = (double)used;
- i = COOK(cook_val);
+ i = COOK(cook_val, base);
if (i > 0)
snprintf(ubuf, sizeof(ubuf), HDF, cook_val,
suffix[i - 1]);
snprintf(ubuf, sizeof(ubuf), CDF, used);
cook_val = (double)avail;
- i = COOK(cook_val);
+ i = COOK(cook_val, base);
if (i > 0)
snprintf(abuf, sizeof(abuf), HDF, cook_val,
suffix[i - 1]);
return rc;
}
+enum {
+ LAYOUT_INHERIT_UNSET = -2,
+};
+
/* functions */
static int lfs_setdirstripe(int argc, char **argv)
{
mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO;
mode_t previous_mode = 0;
char *xattr = NULL;
- __u32 type = LU_FOREIGN_TYPE_DAOS, flags = 0;
+ __u32 type = LU_FOREIGN_TYPE_SYMLINK, flags = 0;
+ int max_inherit = LAYOUT_INHERIT_UNSET;
+ int max_inherit_rr = LAYOUT_INHERIT_UNSET;
struct option long_opts[] = {
{ .val = 'c', .name = "count", .has_arg = required_argument },
{ .val = 'c', .name = "mdt-count", .has_arg = required_argument },
.name = "flags", .has_arg = required_argument },
{ .val = LFS_LAYOUT_FOREIGN_OPT,
.name = "foreign", .has_arg = optional_argument},
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'H', .name = "mdt-hash", .has_arg = required_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 17, 53, 0)
{ .val = 'i', .name = "mdt-index", .has_arg = required_argument },
{ .val = 't', .name = "hash-type", .has_arg = required_argument },
#endif
{ .val = 'T', .name = "mdt-count", .has_arg = required_argument },
-/* setstripe { .val = 'y', .name = "yaml", .has_arg = no_argument }, */
{ .val = 'x', .name = "xattr", .has_arg = required_argument },
+ { .val = 'X', .name = "max-inherit", .has_arg = required_argument },
+ { .val = LFS_INHERIT_RR_OPT,
+ .name = "max-inherit-rr", .has_arg = required_argument},
+/* setstripe { .val = 'y', .name = "yaml", .has_arg = no_argument }, */
{ .name = NULL } };
int result = 0;
setstripe_args_init(&lsa);
- while ((c = getopt_long(argc, argv, "c:dDi:H:m:o:t:T:x:",
+ while ((c = getopt_long(argc, argv, "c:dDi:hH:m:o:t:T:x:X:",
long_opts, NULL)) >= 0) {
switch (c) {
case 0:
break;
case 'c':
case 'T':
+ errno = 0;
lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ lsa.lsa_stripe_count < -1 ||
+ lsa.lsa_stripe_count > LOV_MAX_STRIPE_COUNT) {
fprintf(stderr,
- "%s %s: invalid stripe count '%s'\n",
- progname, argv[0], optarg);
+ "%s: invalid stripe count '%s'\n",
+ progname, optarg);
return CMD_HELP;
}
break;
optarg);
return CMD_HELP;
}
+ } else if (type >= UINT32_MAX) {
+ fprintf(stderr,
+ "%s %s: invalid foreign type '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
}
}
foreign_mode = true;
break;
case LFS_LAYOUT_FLAGS_OPT:
+ errno = 0;
flags = strtoul(optarg, &end, 16);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ flags >= UINT32_MAX) {
fprintf(stderr,
- "%s %s: bad flags '%s'\n",
+ "%s %s: invalid hex flags '%s'\n",
progname, argv[0], optarg);
return CMD_HELP;
}
+ if (!foreign_mode) {
+ fprintf(stderr,
+ "%s %s: hex flags must be specified with --foreign option\n",
+ progname, argv[0]);
+ return CMD_HELP;
+ }
break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 't':
fprintf(stderr,
"warning: '--hash-type' and '-t' deprecated, use '--mdt-hash' or '-H' instead\n");
+ /* fallthrough */
#endif
case 'H':
lsa.lsa_pattern = check_hashtype(optarg);
case 'x':
xattr = optarg;
break;
+ case 'X':
+ if (!default_stripe) {
+ fprintf(stderr,
+ "%s %s: '--max-inherit' must be specified with '-D'\n",
+ progname, argv[0]);
+ return CMD_HELP;
+ }
+ errno = 0;
+ max_inherit = strtol(optarg, &end, 10);
+ if (errno != 0 || *end != '\0' || max_inherit < -2) {
+ fprintf(stderr,
+ "%s %s: invalid max-inherit '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
+ }
+ if (max_inherit == 0) {
+ max_inherit = LMV_INHERIT_NONE;
+ } else if (max_inherit == -1) {
+ max_inherit = LMV_INHERIT_UNLIMITED;
+ } else if (max_inherit > LMV_INHERIT_MAX) {
+ fprintf(stderr,
+ "%s %s: max-inherit %d exceeds maximum %u\n",
+ progname, argv[0], max_inherit,
+ LMV_INHERIT_MAX);
+ return CMD_HELP;
+ }
+ break;
+ case LFS_INHERIT_RR_OPT:
+ if (!default_stripe) {
+ fprintf(stderr,
+ "%s %s: '--max-inherit-rr' must be specified with '-D'\n",
+ progname, argv[0]);
+ return CMD_HELP;
+ }
+ errno = 0;
+ max_inherit_rr = strtol(optarg, &end, 10);
+ if (errno != 0 || *end != '\0' || max_inherit_rr < -2) {
+ fprintf(stderr,
+ "%s %s: invalid max-inherit-rr '%s'\n",
+ progname, argv[0], optarg);
+ return CMD_HELP;
+ }
+ if (max_inherit_rr == 0) {
+ max_inherit_rr = LMV_INHERIT_RR_NONE;
+ } else if (max_inherit_rr == -1) {
+ max_inherit_rr = LMV_INHERIT_RR_UNLIMITED;
+ } else if (max_inherit_rr > LMV_INHERIT_RR_MAX) {
+ fprintf(stderr,
+ "%s %s: max-inherit-rr %d exceeds maximum %u\n",
+ progname, argv[0], max_inherit_rr,
+ LMV_INHERIT_RR_MAX);
+ return CMD_HELP;
+ }
+ break;
default:
- fprintf(stderr, "%s %s: unrecognized option '%s'\n",
- progname, argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
if (!delete && lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT &&
lsa.lsa_stripe_count == LLAPI_LAYOUT_DEFAULT && !foreign_mode) {
- fprintf(stderr,
- "%s %s: stripe offset and count must be specified\n",
- progname, argv[0]);
- return CMD_HELP;
+ /* if no parameters set, create directory on least-used MDTs */
+ lsa.lsa_stripe_off = -1;
+ lsa.lsa_stripe_count = 1;
}
if (delete &&
previous_mode = umask(0);
}
+ if (max_inherit_rr != LAYOUT_INHERIT_UNSET &&
+ lsa.lsa_stripe_off != LLAPI_LAYOUT_DEFAULT &&
+ lsa.lsa_stripe_off != -1) {
+ fprintf(stderr,
+ "%s %s: max-inherit-rr is meaningless if stripe offset != -1\n",
+ progname, argv[0]);
+ return CMD_HELP;
+ }
+
/* foreign LMV/dir case */
if (foreign_mode) {
if (argc > optind + 1) {
param->lsp_stripe_pattern = LMV_HASH_TYPE_UNKNOWN;
param->lsp_pool = lsa.lsa_pool_name;
param->lsp_is_specific = false;
+ if (default_stripe) {
+ if (max_inherit == LAYOUT_INHERIT_UNSET)
+ max_inherit = LMV_INHERIT_DEFAULT;
+ if (max_inherit_rr == LAYOUT_INHERIT_UNSET)
+ max_inherit_rr = LMV_INHERIT_RR_DEFAULT;
+ param->lsp_max_inherit = max_inherit;
+ param->lsp_max_inherit_rr = max_inherit_rr;
+ }
+ if (strcmp(argv[0], "mkdir") == 0)
+ param->lsp_is_create = true;
if (lsa.lsa_nr_tgts > 1) {
if (lsa.lsa_stripe_count > 0 &&
lsa.lsa_stripe_count != LLAPI_LAYOUT_DEFAULT &&
return result;
}
-/* functions */
-static int lfs_rmentry(int argc, char **argv)
+/* 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) {
+ 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_unlink_foreign(int argc, char **argv)
{
- char *dname;
+ char *name;
int index;
int result = 0;
if (argc <= 1) {
- fprintf(stderr, "error: %s: missing dirname\n",
+ fprintf(stderr, "error: %s: missing pathname\n",
argv[0]);
return CMD_HELP;
}
index = 1;
- dname = argv[index];
- while (dname) {
- result = llapi_direntry_remove(dname);
+ name = argv[index];
+ while (name != NULL) {
+ result = llapi_unlink_foreign(name);
if (result) {
fprintf(stderr,
- "error: %s: remove dir entry '%s' failed\n",
- argv[0], dname);
+ "error: %s: unlink foreign entry '%s' failed\n",
+ argv[0], name);
break;
}
- dname = argv[++index];
+ name = argv[++index];
}
return result;
}
"warning: '-M' deprecated, use '--mdt-index' or '-m' instead\n");
#endif
case 'm':
+ errno = 0;
lmu.lum_stripe_offset = strtoul(optarg, &end, 0);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ lmu.lum_stripe_offset >= UINT32_MAX) {
fprintf(stderr, "%s mv: bad MDT index '%s'\n",
progname, optarg);
return CMD_HELP;
int c, rc = 0, index = 0;
char fsname[PATH_MAX] = "", *pool_name = NULL;
struct option long_opts[] = {
- { .val = 'h', .name = "human-readable",
- .has_arg = no_argument },
+ { .val = 'h', .name = "human-readable", .has_arg = no_argument },
+ { .val = 'H', .name = "si", .has_arg = no_argument },
{ .val = 'i', .name = "inodes", .has_arg = no_argument },
{ .val = 'l', .name = "lazy", .has_arg = no_argument },
{ .val = 'p', .name = "pool", .has_arg = required_argument },
{ .val = 'v', .name = "verbose", .has_arg = no_argument },
{ .name = NULL} };
- while ((c = getopt_long(argc, argv, "hilp:v", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "hHilp:v", long_opts, NULL)) != -1) {
switch (c) {
case 'h':
- flags |= MNTDF_COOKED;
+ flags = (flags & ~MNTDF_DECIMAL) | MNTDF_COOKED;
+ break;
+ case 'H':
+ flags |= MNTDF_COOKED | MNTDF_DECIMAL;
break;
case 'i':
flags |= MNTDF_INODES;
flags |= MNTDF_VERBOSE;
break;
default:
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
return CMD_HELP;
}
}
if (optind < argc && !realpath(argv[optind], path)) {
rc = -errno;
- fprintf(stderr, "error: invalid path '%s': %s\n",
- argv[optind], strerror(-rc));
+ fprintf(stderr, "%s: invalid path '%s': %s\n",
+ progname, argv[optind], strerror(-rc));
return rc;
}
case 'n':
opt_fsname = true;
break;
- case 'h':
default:
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
struct option long_opts[] = {
{ .val = 'b', .name = "block-grace", .has_arg = required_argument },
{ .val = 'g', .name = "group", .has_arg = no_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "inode-grace", .has_arg = required_argument },
{ .val = 'p', .name = "projid", .has_arg = no_argument },
{ .val = 't', .name = "times", .has_arg = no_argument },
qctl->qc_cmd = LUSTRE_Q_SETINFO;
qctl->qc_type = ALLQUOTA;
- while ((c = getopt_long(argc, argv, "b:gi:ptu",
+ while ((c = getopt_long(argc, argv, "b:ghi:ptu",
long_opts, NULL)) != -1) {
switch (c) {
case 'u':
quota_type:
if (qctl->qc_type != ALLQUOTA) {
fprintf(stderr,
- "error: -u/g/p can't be used more than once\n");
+ "%s: -u/g/p cannot be used more than once\n",
+ progname);
return CMD_HELP;
}
qctl->qc_type = qtype;
dqi->dqi_bgrace = str2sec(optarg);
if (dqi->dqi_bgrace >= NOTIFY_GRACE_TIME) {
fprintf(stderr,
- "error: bad block-grace: %s\n",
- optarg);
+ "%s: bad block-grace: %s\n",
+ progname, optarg);
return CMD_HELP;
}
}
dqi->dqi_igrace = str2sec(optarg);
if (dqi->dqi_igrace >= NOTIFY_GRACE_TIME) {
fprintf(stderr,
- "error: bad inode-grace: %s\n",
- optarg);
+ "%s: bad inode-grace: %s\n",
+ progname, optarg);
return CMD_HELP;
}
}
case LFS_POOL_OPT:
if (lfs_verify_poolarg(optarg))
return -1;
- fprintf(stdout,
- "Trying to set grace for pool %s\n", optarg);
strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
qctl->qc_cmd = LUSTRE_Q_SETINFOPOOL;
break;
/* getopt prints error message for us when opterr != 0 */
default:
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
if (qctl->qc_type == ALLQUOTA) {
- fprintf(stderr, "error: neither -u, -g nor -p specified\n");
+ fprintf(stderr, "%s: neither -u, -g nor -p specified\n",
+ progname);
return CMD_HELP;
}
if (optind != argc - 1) {
- fprintf(stderr, "error: unexpected parameters encountered\n");
+ fprintf(stderr, "%s: unexpected parameter '%s'\n",
+ progname, argv[optind + 1]);
return CMD_HELP;
}
{ .val = 'd', .name = "default", .has_arg = no_argument },
{ .val = 'g', .name = "group", .has_arg = required_argument },
{ .val = 'G', .name = "default-grp", .has_arg = no_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "inode-softlimit",
.has_arg = required_argument },
{ .val = 'I', .name = "inode-hardlimit",
* isn't reinitialized from command line
*/
- while ((c = getopt_long(argc, argv, "b:B:dg:Gi:I:p:Pu:U",
+ while ((c = getopt_long(argc, argv, "b:B:dg:Ghi:I:p:Pu:U",
long_opts, NULL)) != -1) {
switch (c) {
case 'U':
rc = -1;
goto out;
}
- fprintf(stdout,
- "Trying to set quota for pool %s\n", optarg);
strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
- qctl->qc_cmd = LUSTRE_Q_SETQUOTAPOOL;
+ qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_SETDEFAULT ?
+ LUSTRE_Q_SETDEFAULT_POOL :
+ LUSTRE_Q_SETQUOTAPOOL;
break;
default:
fprintf(stderr,
"%s setquota: unrecognized option '%s'\n",
progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
rc = CMD_HELP;
goto out;
}
dqb->dqb_itime = 0;
dqb->dqb_btime = 0;
dqb->dqb_valid |= QIF_LIMITS | QIF_TIMES;
+ /* do not set inode limits for Pool Quotas */
+ if (qctl->qc_cmd == LUSTRE_Q_SETDEFAULT_POOL)
+ dqb->dqb_valid ^= QIF_ILIMITS | QIF_ITIME;
} else if ((!(limit_mask & BHLIMIT) ^ !(limit_mask & BSLIMIT)) ||
(!(limit_mask & IHLIMIT) ^ !(limit_mask & ISLIMIT))) {
/* sigh, we can't just set blimits/ilimits */
}
}
-#define STRBUF_LEN 32
+#define STRBUF_LEN 24
static void print_quota(char *mnt, struct if_quotactl *qctl, int type,
int rc, bool h, bool show_default)
{
if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA ||
qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
- qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) {
+ qctl->qc_cmd == LUSTRE_Q_GETDEFAULT ||
+ qctl->qc_cmd == LUSTRE_Q_GETDEFAULT_POOL) {
int bover = 0, iover = 0;
struct obd_dqblk *dqb = &qctl->qc_dqblk;
- char numbuf[3][STRBUF_LEN];
+ char numbuf[3][STRBUF_LEN + 2]; /* 2 for brackets or wildcard */
char timebuf[40];
char strbuf[STRBUF_LEN];
if ((qctl->qc_cmd == LUSTRE_Q_GETQUOTA ||
qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ||
+ qctl->qc_cmd == LUSTRE_Q_GETDEFAULT_POOL ||
qctl->qc_cmd == LUSTRE_Q_GETDEFAULT) && !quiet)
print_quota_title(name, qctl, human_readable, show_default);
bool human_readable = false;
bool show_default = false;
int qtype;
+ bool show_pools = false;
struct option long_opts[] = {
- { .val = LFS_POOL_OPT, .name = "pool", .has_arg = required_argument },
+ { .val = LFS_POOL_OPT, .name = "pool", .has_arg = optional_argument },
{ .name = NULL } };
+ char **poollist = NULL;
+ char *buf = NULL;
+ int poolcount, i;
qctl = calloc(1, sizeof(*qctl) + LOV_MAXPOOLNAME + 1);
if (!qctl)
human_readable = true;
break;
case LFS_POOL_OPT:
- if (lfs_verify_poolarg(optarg)) {
- rc = -1;
- goto out;
+ if ((!optarg) && (argv[optind] != NULL) &&
+ (argv[optind][0] != '-') &&
+ (argv[optind][0] != '/')) {
+ optarg = argv[optind++];
+ if (lfs_verify_poolarg(optarg)) {
+ rc = -EINVAL;
+ goto out;
+ }
+ strncpy(qctl->qc_poolname, optarg,
+ LOV_MAXPOOLNAME);
+ if (qctl->qc_cmd == LUSTRE_Q_GETINFO)
+ qctl->qc_cmd = LUSTRE_Q_GETINFOPOOL;
+ else
+ qctl->qc_cmd = LUSTRE_Q_GETQUOTAPOOL;
+ break;
}
- strncpy(qctl->qc_poolname, optarg, LOV_MAXPOOLNAME);
- qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_GETINFO ?
- LUSTRE_Q_GETINFOPOOL :
- LUSTRE_Q_GETQUOTAPOOL;
+
+ /* optarg is NULL */
+ show_pools = true;
+ qctl->qc_cmd = LUSTRE_Q_GETQUOTAPOOL;
break;
default:
fprintf(stderr, "%s quota: unrecognized option '%s'\n",
}
} else {
qctl->qc_valid = QC_GENERAL;
- qctl->qc_cmd = LUSTRE_Q_GETDEFAULT;
+ qctl->qc_cmd = qctl->qc_cmd == LUSTRE_Q_GETQUOTAPOOL ?
+ LUSTRE_Q_GETDEFAULT_POOL :
+ LUSTRE_Q_GETDEFAULT;
qctl->qc_id = 0;
}
}
mnt = argv[optind];
+ if (show_pools) {
+ char *p;
+
+ i = 0;
+ rc = llapi_get_poolbuf(mnt, &buf, &poollist, &poolcount);
+ if (rc)
+ goto out;
+
+ for (i = 0; i < poolcount; i++) {
+ p = memchr(poollist[i], '.', MAXNAMLEN);
+ if (!p) {
+ fprintf(stderr, "bad string format %.*s\n",
+ MAXNAMLEN, poollist[i]);
+ rc = -EINVAL;
+ goto out;
+ }
+ p++;
+ printf("Quotas for pool: %s\n", p);
+ strncpy(qctl->qc_poolname, p, LOV_MAXPOOLNAME);
+ rc = get_print_quota(mnt, name, qctl, verbose, quiet,
+ human_readable, show_default);
+ if (rc)
+ break;
+ }
+ goto out;
+ }
+
rc = get_print_quota(mnt, name, qctl, verbose, quiet,
human_readable, show_default);
out:
+ free(buf);
free(qctl);
return rc;
}
static int lfs_flushctx(int argc, char **argv)
{
- int kdestroy = 0, c;
+ int kdestroy = 0, reap = 0, c;
char mntdir[PATH_MAX] = {'\0'};
int index = 0;
int rc = 0;
- while ((c = getopt(argc, argv, "k")) != -1) {
+ while ((c = getopt(argc, argv, "kr")) != -1) {
switch (c) {
case 'k':
kdestroy = 1;
break;
+ case 'r':
+ reap = 1;
+ break;
default:
fprintf(stderr,
"error: %s: option '-%c' unrecognized\n",
rc = -1;
}
}
+
+ if (reap) {
+ rc = system("keyctl reap > /dev/null");
+ if (rc != 0) {
+ rc = WEXITSTATUS(rc);
+ fprintf(stderr, "error reaping keyring: %d\n", rc);
+ }
+ }
+
return rc;
}
}
mdd = argv[optind++];
- if (argc > optind)
+ if (argc > optind) {
+ errno = 0;
startrec = strtoll(argv[optind++], NULL, 10);
- if (argc > optind)
+ if (errno != 0 || startrec < 0) {
+ fprintf(stderr,
+ "%s changelog: bad startrec\n",
+ progname);
+ return CMD_HELP;
+ }
+ }
+
+ if (argc > optind) {
+ errno = 0;
endrec = strtoll(argv[optind++], NULL, 10);
+ if (errno != 0 || endrec < 0) {
+ fprintf(stderr,
+ "%s changelog: bad endrec\n",
+ progname);
+ return CMD_HELP;
+ }
+ }
rc = llapi_changelog_start(&changelog_priv,
CHANGELOG_FLAG_BLOCK |
if (argc != 4)
return CMD_HELP;
+ errno = 0;
endrec = strtoll(argv[3], NULL, 10);
+ if (errno != 0 || endrec < 0) {
+ fprintf(stderr,
+ "%s: bad endrec '%s'\n",
+ argv[0], argv[3]);
+ return CMD_HELP;
+ }
rc = llapi_changelog_clear(argv[1], argv[2], endrec);
return rc;
}
+static void rstripc(char *str, int c)
+{
+ char *end = str + strlen(str);
+
+ for (; str < end && end[-1] == c; --end)
+ end[-1] = '\0';
+}
+
static int lfs_fid2path(int argc, char **argv)
{
struct option long_opts[] = {
{ .val = 'c', .name = "cur", .has_arg = no_argument },
+ { .val = 'c', .name = "current", .has_arg = no_argument },
+ { .val = 'c', .name = "print-link", .has_arg = no_argument },
+ { .val = 'f', .name = "print-fid", .has_arg = no_argument },
{ .val = 'l', .name = "link", .has_arg = required_argument },
- { .val = 'r', .name = "rec", .has_arg = required_argument },
{ .name = NULL } };
- char short_opts[] = "cl:r:";
- char mntdir[PATH_MAX];
- char *device, *fid, *path, *rootpath;
+ char short_opts[] = "cfl:pr:";
+ bool print_link = false;
+ bool print_fid = false;
+ bool print_mnt_dir;
+ char mnt_dir[PATH_MAX] = "";
+ int mnt_fd = -1;
+ char *path_or_fsname;
long long recno = -1;
int linkno = -1;
- int lnktmp;
- int printcur = 0;
- int rc = 0;
char *endptr = NULL;
+ int rc = 0;
+ int c;
+ int i;
- while ((rc = getopt_long(argc, argv, short_opts,
- long_opts, NULL)) != -1) {
- switch (rc) {
+ while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+ switch (c) {
case 'c':
- printcur++;
+ print_link = true;
+ break;
+ case 'f':
+ print_fid = true;
break;
case 'l':
+ errno = 0;
linkno = strtol(optarg, &endptr, 10);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' || linkno < 0) {
fprintf(stderr,
"%s fid2path: invalid linkno '%s'\n",
progname, optarg);
}
break;
case 'r':
+ /* recno is something to do with changelogs
+ * that was never implemented. We just pass it
+ * through for the MDT to ignore.
+ */
+ errno = 0;
recno = strtoll(optarg, &endptr, 10);
- if (*endptr != '\0') {
+ if (errno != 0 || *endptr != '\0' || recno < 0) {
fprintf(stderr,
"%s fid2path: invalid recno '%s'\n",
progname, optarg);
}
}
- if (argc < 3) {
+ if (argc - optind < 2) {
fprintf(stderr,
- "%s fid2path: <fsname|rootpath> and <fid>... must be specified\n",
+ "Usage: %s fid2path FSNAME|ROOT FID...\n",
progname);
return CMD_HELP;
}
- device = argv[optind++];
- path = calloc(1, PATH_MAX);
- if (!path) {
- rc = -errno;
+ path_or_fsname = argv[optind];
+
+ if (*path_or_fsname == '/') {
+ print_mnt_dir = true;
+ rc = llapi_search_mounts(path_or_fsname, 0, mnt_dir, NULL);
+ } else {
+ print_mnt_dir = false;
+ rc = llapi_search_rootpath(mnt_dir, path_or_fsname);
+ }
+
+ if (rc < 0) {
fprintf(stderr,
- "%s fid2path: cannot allocate memory for path: %s\n",
- progname, strerror(-rc));
- return rc;
+ "%s fid2path: cannot resolve mount point for '%s': %s\n",
+ progname, path_or_fsname, strerror(-rc));
+ goto out;
}
- rc = 0;
- /* in case that device is not the mountpoint */
- if (device[0] == '/') {
- rc = llapi_search_mounts(device, 0, mntdir, NULL);
- if (rc == 0) {
- rootpath = mntdir;
- } else {
+ mnt_fd = open(mnt_dir, O_RDONLY | O_DIRECTORY);
+ if (mnt_fd < 0) {
+ fprintf(stderr,
+ "%s fid2path: cannot open mount point for '%s': %s\n",
+ progname, path_or_fsname, strerror(-rc));
+ goto out;
+ }
+
+ /* Strip trailing slashes from mnt_dir. */
+ rstripc(mnt_dir + 1, '/');
+
+ for (i = optind + 1; i < argc; i++) {
+ const char *fid_str = argv[i];
+ struct lu_fid fid;
+ int rc2;
+
+ rc2 = llapi_fid_parse(fid_str, &fid, NULL);
+ if (rc2 < 0) {
fprintf(stderr,
- "%s fid2path: %s has no mountpoint: %s\n",
- progname, device, strerror(-rc));
- goto out;
+ "%s fid2path: invalid FID '%s'\n",
+ progname, fid_str);
+ if (rc == 0)
+ rc = rc2;
+
+ continue;
}
- }
- while (optind < argc) {
- fid = argv[optind++];
- lnktmp = (linkno >= 0) ? linkno : 0;
+ int linktmp = (linkno >= 0) ? linkno : 0;
while (1) {
- int oldtmp = lnktmp;
+ int oldtmp = linktmp;
long long rectmp = recno;
- int rc2;
+ char path_buf[PATH_MAX];
- rc2 = llapi_fid2path(device, fid, path, PATH_MAX,
- &rectmp, &lnktmp);
+ rc2 = llapi_fid2path_at(mnt_fd, &fid,
+ path_buf, sizeof(path_buf), &rectmp, &linktmp);
if (rc2 < 0) {
fprintf(stderr,
"%s fid2path: cannot find %s %s: %s\n",
- progname, device, fid,
- strerror(errno = -rc2));
+ progname, path_or_fsname, fid_str,
+ strerror(-rc2));
if (rc == 0)
rc = rc2;
break;
}
- if (printcur)
- fprintf(stdout, "%lld ", rectmp);
- if (device[0] == '/') {
- fprintf(stdout, "%s", rootpath);
- if (rootpath[strlen(rootpath) - 1] != '/')
- fprintf(stdout, "/");
- } else if (path[0] == '\0') {
- fprintf(stdout, "/");
- }
- fprintf(stdout, "%s\n", path);
+ if (print_fid)
+ printf("%s ", fid_str);
+
+ if (print_link)
+ printf("%d ", linktmp);
+
+ /* You may think this looks wrong or weird (and it is!)
+ * but we are actually trying to preserve the old quirky
+ * behaviors (enforced by our old quirky tests!) that
+ * make lfs so much fun to work on:
+ *
+ * lustre 0x200000007:0x1:0x0 => "/"
+ * /mnt/lustre 0x200000007:0x1:0x0 => "/mnt/lustre//"
+ *
+ * Note that llapi_fid2path() returns "" for the root
+ * FID. */
+
+ printf("%s%s%s\n",
+ print_mnt_dir ? mnt_dir : "",
+ (print_mnt_dir || *path_buf == '\0') ? "/" : "",
+ path_buf);
if (linkno >= 0)
/* specified linkno */
break;
- if (oldtmp == lnktmp)
+
+ if (oldtmp == linktmp)
/* no more links */
break;
}
}
out:
- free(path);
+ if (!(mnt_fd < 0))
+ close(mnt_fd);
+
return rc;
}
static int lfs_rmfid_and_show_errors(const char *device, struct fid_array *fa)
{
- int rc, rc2 = 0, k;
+ int rc, rc2, k;
rc = llapi_rmfid(device, fa);
- if (rc) {
- fprintf(stderr, "rmfid(): rc = %d\n", rc);
+ if (rc < 0) {
+ fprintf(stderr, "%s rmfid: cannot remove FIDs: %s\n",
+ progname, strerror(-rc));
return rc;
}
for (k = 0; k < fa->fa_nr; k++) {
- rc = (__s32)fa->fa_fids[k].f_ver;
- if (!IS_ERR_VALUE(rc))
- continue;
- if (!rc2 && rc)
- rc2 = rc;
- if (!rc)
+ rc2 = (__s32)fa->fa_fids[k].f_ver;
+ if (!IS_ERR_VALUE(rc2))
continue;
+
+ if (rc == 0)
+ rc = rc2;
+
fa->fa_fids[k].f_ver = 0;
- fprintf(stderr, "rmfid("DFID"): rc = %d\n",
- PFID(&fa->fa_fids[k]), rc);
+ fprintf(stderr, "%s rmfid: cannot remove "DFID": %s\n",
+ progname, PFID(&fa->fa_fids[k]), strerror(-rc2));
}
- return rc2;
+ return rc;
}
static int lfs_rmfid(int argc, char **argv)
static int lfs_data_version(int argc, char **argv)
{
- char *path;
+ int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
__u64 data_version;
+ char *path;
int fd;
int rc;
int c;
- int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */
if (argc < 2) {
- fprintf(stderr, "%s data_version: FILE must be specified\n",
+ fprintf(stderr, "%s: FILE must be specified\n",
progname);
return CMD_HELP;
}
- while ((c = getopt(argc, argv, "nrw")) != -1) {
+ while ((c = getopt(argc, argv, "hnrw")) != -1) {
switch (c) {
case 'n':
data_version_flags = 0;
fprintf(stderr,
"%s data_version: unrecognized option '%s'\n",
progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
{ .val = 'a', .name = "noarchive", .has_arg = no_argument },
{ .val = 'd', .name = "dirty", .has_arg = no_argument },
{ .val = 'e', .name = "exists", .has_arg = no_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'i', .name = "archive-id", .has_arg = required_argument },
{ .val = 'l', .name = "lost", .has_arg = no_argument },
{ .val = 'r', .name = "norelease", .has_arg = no_argument },
- { .val = 'i', .name = "archive-id", .has_arg = required_argument },
{ .name = NULL } };
- char short_opts[] = "lraAdei:";
__u64 mask = 0;
int c, rc;
char *path;
if (argc < 3)
return CMD_HELP;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "aAdehi:lr",
long_opts, NULL)) != -1) {
switch (c) {
case 'l':
mask |= HS_EXISTS;
break;
case 'i':
+ errno = 0;
archive_id = strtol(optarg, &end, 10);
- if (*end != '\0') {
- fprintf(stderr, "invalid archive_id: '%s'\n",
- end);
+ if (errno != 0 || *end != '\0' || archive_id < 0) {
+ fprintf(stderr,
+ "%s: invalid archive_id: '%s'\n",
+ progname, end);
return CMD_HELP;
}
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "error: %s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
struct option long_opts[] = {
{ .val = 'a', .name = "archive", .has_arg = required_argument },
{ .val = 'D', .name = "data", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'l', .name = "filelist", .has_arg = required_argument },
{ .val = 'm', .name = "mntpath", .has_arg = required_argument },
{ .name = NULL } };
dev_t last_dev = 0;
- char short_opts[] = "l:D:a:m:";
struct hsm_user_request *hur, *oldhur;
int c, i;
size_t len;
if (argc < 2)
return CMD_HELP;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "a:D:hl:m:",
long_opts, NULL)) != -1) {
switch (c) {
case 'l':
some_file = strdup(optarg);
}
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "error: %s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
for (mode = 0; mode < ARRAY_SIZE(lock_mode_names); mode++) {
if (lock_mode_names[mode] == NULL)
continue;
- if (strcmp(string, lock_mode_names[mode]) == 0)
+ if (strcasecmp(string, lock_mode_names[mode]) == 0)
return mode;
}
{ .val = 'a', .name = "advice", .has_arg = required_argument },
{ .val = 'b', .name = "background", .has_arg = no_argument },
{ .val = 'e', .name = "end", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'l', .name = "length", .has_arg = required_argument },
{ .val = 'm', .name = "mode", .has_arg = required_argument },
{ .val = 's', .name = "start", .has_arg = required_argument },
{ .val = 'u', .name = "unset", .has_arg = no_argument },
{ .name = NULL } };
- char short_opts[] = "a:be:l:m:s:u";
- int c;
- int rc = 0;
- const char *path;
- int fd;
- struct llapi_lu_ladvise advice;
- enum lu_ladvise_type advice_type = LU_LADVISE_INVALID;
- unsigned long long start = 0;
- unsigned long long end = LUSTRE_EOF;
- unsigned long long length = 0;
- unsigned long long size_units;
- unsigned long long flags = 0;
- int mode = 0;
+ struct llapi_lu_ladvise advice;
+ enum lu_ladvise_type advice_type = LU_LADVISE_INVALID;
+ unsigned long long start = 0;
+ unsigned long long end = LUSTRE_EOF;
+ unsigned long long length = 0;
+ unsigned long long size_units;
+ unsigned long long flags = 0;
+ int c, fd, rc = 0;
+ const char *path;
+ int mode = 0;
optind = 0;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "a:be:hl:m:s:u",
long_opts, NULL)) != -1) {
switch (c) {
case 'a':
if (advice_type == LU_LADVISE_INVALID) {
fprintf(stderr,
"%s: invalid advice type '%s'\n",
- argv[0], optarg);
+ progname, optarg);
fprintf(stderr, "Valid types:");
for (advice_type = 0;
return CMD_HELP;
}
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
{
struct option long_opts[] = {
{ .val = 'c', .name = "clear", .has_arg = no_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'o', .name = "off", .has_arg = no_argument },
{ .val = 'O', .name = "on", .has_arg = no_argument },
{ .name = NULL } };
return CMD_HELP;
optind = 0;
- while ((c = getopt_long(argc, argv, "coO", long_opts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "choO", long_opts, NULL)) != -1) {
switch (c) {
case 'c':
flags |= LU_HEAT_FLAG_CLEAR;
case 'O':
flags &= ~LU_HEAT_FLAG_OFF;
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static inline int lfs_mirror_resync(int argc, char **argv)
{
+ struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'o', .name = "only", .has_arg = required_argument },
+ { .name = NULL } };
struct ll_ioc_lease *ioc = NULL;
__u16 mirror_ids[128] = { 0 };
int ids_nr = 0;
int c;
int rc = 0;
- struct option long_opts[] = {
- { .val = 'o', .name = "only", .has_arg = required_argument },
- { .name = NULL } };
-
- while ((c = getopt_long(argc, argv, "o:", long_opts, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "ho:", long_opts, NULL)) >= 0) {
switch (c) {
case 'o':
rc = parse_mirror_ids(mirror_ids,
ids_nr = rc;
break;
default:
- fprintf(stderr, "%s: options '%s' unrecognized.\n",
- argv[0], argv[optind - 1]);
- rc = -EINVAL;
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
+ rc = CMD_HELP;
goto error;
}
}
const size_t buflen = 4 << 20;
off_t pos;
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'N', .name = "mirror-id", .has_arg = required_argument },
{ .val = 'o', .name = "outfile", .has_arg = required_argument },
{ .name = NULL } };
- while ((c = getopt_long(argc, argv, "N:o:", long_opts, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hN:o:", long_opts, NULL)) >= 0) {
char *end;
switch (c) {
- case 'N':
- mirror_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || mirror_id == 0) {
+ case 'N': {
+ unsigned long int id;
+
+ errno = 0;
+ id = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' || id == 0 ||
+ id > UINT16_MAX) {
fprintf(stderr,
"%s %s: invalid mirror ID '%s'\n",
progname, argv[0], optarg);
return rc;
}
+
+ mirror_id = (__u16)id;
break;
+ }
case 'o':
outfile = optarg;
break;
default:
- fprintf(stderr, "%s: option '%s' unrecognized.\n",
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- return -EINVAL;
+ /* fallthrough */
+ case 'h':
+ return CMD_HELP;
}
}
off_t pos;
size_t page_size = sysconf(_SC_PAGESIZE);
struct ll_ioc_lease_id ioc;
-
struct option long_opts[] = {
- { .val = 'N', .name = "mirror-id", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "inputfile", .has_arg = required_argument },
+ { .val = 'N', .name = "mirror-id", .has_arg = required_argument },
{ .name = NULL } };
- while ((c = getopt_long(argc, argv, "N:i:", long_opts, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hi:N:", long_opts, NULL)) >= 0) {
char *end;
switch (c) {
- case 'N':
- mirror_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || mirror_id == 0) {
+ case 'N': {
+ unsigned long int id;
+
+ errno = 0;
+ id = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' || id == 0 ||
+ id > UINT16_MAX) {
fprintf(stderr,
"%s %s: invalid mirror ID '%s'\n",
progname, argv[0], optarg);
return rc;
}
+
+ mirror_id = (__u16)id;
break;
+ }
case 'i':
inputfile = optarg;
break;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- return -EINVAL;
+ /* fallthrough */
+ case 'h':
+ return CMD_HELP;
}
}
ssize_t copied;
struct ll_ioc_lease *ioc = NULL;
struct ll_ioc_lease_id *resync_ioc;
-
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "read-mirror", .has_arg = required_argument },
{ .val = 'o', .name = "write-mirror", .has_arg = required_argument },
{ .name = NULL } };
+ char cmd[PATH_MAX];
- while ((c = getopt_long(argc, argv, "i:o:", long_opts, NULL)) >= 0) {
+ snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
+ progname = cmd;
+ while ((c = getopt_long(argc, argv, "hi:o:", long_opts, NULL)) >= 0) {
char *end;
switch (c) {
- case 'i':
- read_mirror_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || read_mirror_id == 0) {
+ case 'i': {
+ unsigned long int id;
+
+ errno = 0;
+ id = strtoul(optarg, &end, 0);
+ if (errno != 0 || *end != '\0' || id == 0 ||
+ id > UINT16_MAX) {
fprintf(stderr,
- "%s %s: invalid read mirror ID '%s'\n",
- progname, argv[0], optarg);
+ "%s: invalid read mirror ID '%s'\n",
+ progname, optarg);
return rc;
}
+
+ read_mirror_id = (__u16)id;
break;
+ }
case 'o':
if (!strcmp(optarg, "-1")) {
/* specify all other mirrors */
}
break;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- return -EINVAL;
+ /* fallthrough */
+ case 'h':
+ return CMD_HELP;
}
}
char cmd[PATH_MAX];
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'o', .name = "only", .has_arg = required_argument },
{ .val = 'v', .name = "verbose", .has_arg = no_argument },
{ .name = NULL } };
snprintf(cmd, sizeof(cmd), "%s %s", progname, argv[0]);
progname = cmd;
- while ((c = getopt_long(argc, argv, "o:v", long_opts, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "ho:v", long_opts, NULL)) >= 0) {
switch (c) {
case 'o':
rc = parse_mirror_ids(mirror_ids,
verbose++;
break;
default:
- fprintf(stderr, "%s: option '%s' unrecognized.\n",
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
progname, argv[optind - 1]);
- rc = -EINVAL;
+ /* fallthrough */
+ case 'h':
+ rc = CMD_HELP;
goto error;
}
}
enum lfs_som_type type = LFS_SOM_ATTR_ALL;
int rc = 0, c;
- while ((c = getopt(argc, argv, "sbf")) != -1) {
+ while ((c = getopt(argc, argv, "bfhs")) != -1) {
switch (c) {
- case 's':
- type = LFS_SOM_SIZE;
- break;
case 'b':
type = LFS_SOM_BLOCKS;
break;
case 'f':
type = LFS_SOM_FLAGS;
break;
+ case 's':
+ type = LFS_SOM_SIZE;
+ break;
default:
- fprintf(stderr, "%s: invalid option '%c'\n",
- progname, optopt);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static int lfs_pcc_attach(int argc, char **argv)
{
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "id", .has_arg = required_argument },
{ .name = NULL } };
int c;
enum lu_pcc_type type = LU_PCC_READWRITE;
optind = 0;
- while ((c = getopt_long(argc, argv, "i:",
+ while ((c = getopt_long(argc, argv, "hi:",
long_opts, NULL)) != -1) {
switch (c) {
case 'i':
+ errno = 0;
archive_id = strtoul(optarg, &end, 0);
- if (*end != '\0' || archive_id == 0) {
+ if (errno != 0 || *end != '\0' ||
+ archive_id == 0 || archive_id > UINT32_MAX) {
fprintf(stderr,
"error: %s: bad archive ID '%s'\n",
- argv[0], optarg);
+ progname, optarg);
return CMD_HELP;
}
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static int lfs_pcc_attach_fid(int argc, char **argv)
{
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'i', .name = "id", .has_arg = required_argument },
{ .val = 'm', .name = "mnt", .has_arg = required_argument },
{ .name = NULL } };
- char short_opts[] = "i:m:";
- int c;
- int rc = 0;
- __u32 archive_id = 0;
- char *end;
- const char *mntpath = NULL;
- const char *fidstr;
- enum lu_pcc_type type = LU_PCC_READWRITE;
+ int c;
+ int rc = 0;
+ __u32 archive_id = 0;
+ char *end;
+ const char *mntpath = NULL;
+ const char *fidstr;
+ enum lu_pcc_type type = LU_PCC_READWRITE;
optind = 0;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "hi:m:",
long_opts, NULL)) != -1) {
switch (c) {
case 'i':
+ errno = 0;
archive_id = strtoul(optarg, &end, 0);
- if (*end != '\0') {
+ if (errno != 0 || *end != '\0' ||
+ archive_id > UINT32_MAX) {
fprintf(stderr,
"error: %s: bad archive ID '%s'\n",
argv[0], optarg);
case 'm':
mntpath = optarg;
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static int lfs_pcc_detach(int argc, char **argv)
{
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'k', .name = "keep", .has_arg = no_argument },
{ .name = NULL } };
- char short_opts[] = "k";
- int c;
- int rc = 0;
- const char *path;
- char fullpath[PATH_MAX];
- __u32 detach_opt = PCC_DETACH_OPT_UNCACHE;
+ int c;
+ int rc = 0;
+ const char *path;
+ char fullpath[PATH_MAX];
+ __u32 detach_opt = PCC_DETACH_OPT_UNCACHE;
optind = 0;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "hk",
long_opts, NULL)) != -1) {
switch (c) {
case 'k':
detach_opt = PCC_DETACH_OPT_NONE;
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static int lfs_pcc_detach_fid(int argc, char **argv)
{
struct option long_opts[] = {
+ { .val = 'h', .name = "help", .has_arg = no_argument },
{ .val = 'k', .name = "keep", .has_arg = no_argument },
{ .name = NULL } };
- char short_opts[] = "k";
- int c;
- int rc = 0;
- const char *fid;
- const char *mntpath;
- __u32 detach_opt = PCC_DETACH_OPT_UNCACHE;
+ int c;
+ int rc = 0;
+ const char *fid;
+ const char *mntpath;
+ __u32 detach_opt = PCC_DETACH_OPT_UNCACHE;
optind = 0;
- while ((c = getopt_long(argc, argv, short_opts,
+ while ((c = getopt_long(argc, argv, "hk",
long_opts, NULL)) != -1) {
switch (c) {
case 'k':
detach_opt = PCC_DETACH_OPT_NONE;
break;
- case '?':
- return CMD_HELP;
default:
- fprintf(stderr, "%s: option '%s' unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s: unrecognized option '%s'\n",
+ progname, argv[optind - 1]);
+ /* fallthrough */
+ case 'h':
return CMD_HELP;
}
}
static int lfs_pcc_state(int argc, char **argv)
{
- int rc = 0;
- const char *path;
- char fullpath[PATH_MAX];
- struct lu_pcc_state state;
+ int rc = 0;
+ const char *path;
+ char fullpath[PATH_MAX];
+ struct lu_pcc_state state;
optind = 1;
if (argc <= 1) {
fprintf(stderr, "%s: must specify one or more file names\n",
- argv[0]);
+ progname);
return CMD_HELP;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff