#include <dirent.h>
#include <time.h>
#include <ctype.h>
-#ifdef HAVE_SYS_QUOTA_H
-# include <sys/quota.h>
-#endif
#include <libcfs/util/string.h>
#include <libcfs/util/ioctl.h>
#include <libcfs/util/parser.h>
#include <lustre/lustreapi.h>
-#include <lustre_ver.h>
-#include <lustre_param.h>
+#include <linux/lustre/lustre_ver.h>
+#include <linux/lustre/lustre_param.h>
#ifndef ARRAY_SIZE
# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
" [--stripe-index|-i <start_ost_idx>]\n" \
" [--stripe-size|-S <stripe_size>]\n" \
" [--pool|-p <pool_name>]\n" \
- " [--ost|-o <ost_indices>]\n"
+ " [--ost|-o <ost_indices>]\n" \
+ " [--component-end|-E <comp_end>]\n"
#define SSM_HELP_COMMON \
"\tstripe_size: Number of bytes on each OST (0 filesystem default)\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."
+ "\t If --pool is set with --ost, then the OSTs\n" \
+ "\t must be the members of the pool." \
+ "\tcomp_end: Extent end of the component\n" \
+ "\t Can be specified with k, m or g (in KB, MB and GB\n" \
+ "\t respectively, -1 for EOF), it must be aligned with\n"\
+ "\t the stripe_size\n"
#define SETSTRIPE_USAGE \
SSM_CMD_COMMON("setstripe") \
" <directory|filename>\n" \
- SSM_HELP_COMMON
+ SSM_HELP_COMMON \
#define MIGRATE_USAGE \
SSM_CMD_COMMON("migrate ") \
#define SETDIRSTRIPE_USAGE \
" [--mdt-count|-c stripe_count>\n" \
" [--mdt-index|-i mdt_index]\n" \
- " [--mdt-hash|-t mdt_hash]\n" \
+ " [--mdt-hash|-H mdt_hash]\n" \
" [--default|-D] [--mode|-m mode] <dir>\n" \
"\tstripe_count: stripe count of the striped directory\n" \
"\tmdt_index: MDT index of first stripe\n" \
{"setstripe", lfs_setstripe, 0,
"Create a new file with a specific striping pattern or\n"
"set the default striping pattern on an existing directory or\n"
- "delete the default striping pattern from an existing directory\n"
- "usage: setstripe -d <directory> (to delete default striping)\n"\
+ "delete the default striping pattern from an existing directory or\n"
+ "add layout component(s) to an existing composite file or\n"
+ "delete specified component(s) from an existing composite file\n\n"
+ "To delete default striping from an existing directory:\n"
+ "usage: setstripe -d <directory>\n"
+ " or\n"
+ "To delete component(s) from an existing composite file:\n"
+ "usage: setstripe --component-del [--component-id|-I <comp_id>]\n"
+ " [--component-flags|-F <comp_flags>]\n"
+ " <filename>\n"
+ "\tcomp_id: Unique component ID\n"
+ "\tcomp_flags: 'init' indicating all instantiated components\n"
+ "\t '^init' indicating all uninstantiated components\n"
+ "\t-I and -F can't be specified at the same time\n"
" or\n"
+ "To add component(s) to an existing composite file:\n"
+ SSM_CMD_COMMON("setstripe --component-add")
+ " or\n"
+ "To create a file with specified striping/composite layout:\n"
SETSTRIPE_USAGE},
{"getstripe", lfs_getstripe, 0,
"To list the striping info for a given file or files in a\n"
"usage: getstripe [--ost|-O <uuid>] [--quiet|-q] [--verbose|-v]\n"
" [--stripe-count|-c] [--stripe-index|-i]\n"
" [--pool|-p] [--stripe-size|-S] [--directory|-d]\n"
- " [--mdt|-m] [--recursive|-r] [--raw|-R]\n"
+ " [--mdt|-m] [--recursive|-r] [--raw|-R] [--yaml|-y]\n"
" [--layout|-L] [--fid|-F] [--generation|-g]\n"
+ " [--component-id[=comp_id]|-I[comp_id]]\n"
+ " [--component-flags[=comp_flags]]\n"
+ " [--component-count]\n"
+ " [--component-start[=[+-]comp_start]]\n"
+ " [--component-end[=[+-]comp_end]|-E[[+-]comp_end]]\n"
" <directory|filename> ..."},
{"setdirstripe", lfs_setdirstripe, 0,
"To create a striped directory on a specified MDT. This can only\n"
"or recursively for all directories in a directory tree.\n"
"usage: getdirstripe [--obd|-O <uuid>] [--mdt-count|-c]\n"
" [--mdt-index|-i] [--mdt-hash|-t]\n"
- " [--recursive|-r] [--default|-D] <dir> ..."},
+ " [--recursive|-r] [--yaml|-y]\n"
+ " [--default|-D] <dir> ..."},
{"mkdir", lfs_setdirstripe, 0,
"To create a striped directory on a specified MDT. This can only\n"
"be done on MDT0 with the right of administrator.\n"
" [[!] --stripe-size|-S [+-]N[kMGT]] [[!] --type|-t <filetype>]\n"
" [[!] --gid|-g|--group|-G <gid>|<gname>]\n"
" [[!] --uid|-u|--user|-U <uid>|<uname>] [[!] --pool <pool>]\n"
+ " [[!] --projid <projid>]\n"
" [[!] --layout|-L released,raid0]\n"
+ " [[!] --component-count [+-]<comp_cnt>]\n"
+ " [[!] --component-start [+-]N[kMGTPE]]\n"
+ " [[!] --component-end|-E [+-]N[kMGTPE]]\n"
+ " [[!] --component-flags <comp_flags>]\n"
+ " [[!] --mdt-count|-T [+-]<stripes>]\n"
+ " [[!] --mdt-hash|-H <hashtype>\n"
"\t !: used before an option indicates 'NOT' requested attribute\n"
- "\t -: used before a value indicates 'AT MOST' requested value\n"
- "\t +: used before a value indicates 'AT LEAST' requested value\n"},
+ "\t -: used before a value indicates less than requested value\n"
+ "\t +: used before a value indicates more than requested value\n"
+ "\tmdt-hash: 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"},
{"check", lfs_check, 0,
"Display the status of MDS or OSTs (as specified in the command)\n"
"or all the servers (MDS and OSTs).\n"
"Usage: getname [-h]|[path ...] "},
#ifdef HAVE_SYS_QUOTA_H
{"setquota", lfs_setquota, 0, "Set filesystem quotas.\n"
- "usage: setquota <-u|-g> <uname>|<uid>|<gname>|<gid>\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> <uname>|<uid>|<gname>|<gid>\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>\n"
+ " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n"
" [--block-grace <block-grace>]\n"
" [--inode-grace <inode-grace>] <filesystem>\n"
" -b can be used instead of --block-softlimit/--block-grace\n"
{"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> <uname>|<uid>|<gname>|<gid>] <filesystem>\n"
- " quota [-o <obd_uuid>|-i <mdt_idx>|-I <ost_idx>] -t <-u|-g> <filesystem>"},
+ " [<-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>"},
#endif
{"flushctx", lfs_flushctx, 0, "Flush security context for current user.\n"
"usage: flushctx [-k] [mountpoint...]"},
{"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]\n"
+ " [--background|-b] [--unset|-u]\n\n"
" {[--end|-e END[kMGT]] | [--length|-l LENGTH[kMGT]]}\n"
- " <file> ..."},
+ " {[--mode|-m [READ,WRITE]}\n"
+ " <file> ...\n"},
{"help", Parser_help, 0, "help"},
{"exit", Parser_quit, 0, "quit"},
{"quit", Parser_quit, 0, "quit"},
#define MIGRATION_NONBLOCK 1
+static int check_hashtype(const char *hashtype)
+{
+ int i;
+
+ for (i = LMV_HASH_TYPE_ALL_CHARS; i < LMV_HASH_TYPE_MAX; i++)
+ if (strcmp(hashtype, mdt_hash_name[i]) == 0)
+ return i;
+
+ return 0;
+}
+
/**
* Internal helper for migrate_copy_data(). Check lease and report error if
* need be.
return 0;
}
+static int lfs_component_set(char *fname, int comp_id, __u32 flags)
+{
+ return -ENOTSUP;
+}
+
+static int lfs_component_del(char *fname, __u32 comp_id, __u32 flags)
+{
+ int rc = 0;
+
+ if (flags != 0 && comp_id != 0)
+ return -EINVAL;
+
+ /* LCME_FL_INIT is the only supported flag in PFL */
+ if (flags != 0) {
+ if (flags & ~LCME_KNOWN_FLAGS) {
+ fprintf(stderr, "Invalid component flags %#x\n", flags);
+ return -EINVAL;
+ }
+ } else if (comp_id > LCME_ID_MAX) {
+ fprintf(stderr, "Invalid component id %u\n", comp_id);
+ return -EINVAL;
+ }
+
+ rc = llapi_layout_file_comp_del(fname, comp_id, flags);
+ if (rc)
+ fprintf(stderr, "Delete component %#x from %s failed. %s\n",
+ comp_id, fname, strerror(errno));
+ return rc;
+}
+
+static int lfs_component_add(char *fname, struct llapi_layout *layout)
+{
+ int rc;
+
+ if (layout == NULL)
+ return -EINVAL;
+
+ rc = llapi_layout_file_comp_add(fname, layout);
+ if (rc)
+ fprintf(stderr, "Add layout component(s) to %s failed. %s\n",
+ fname, strerror(errno));
+ return rc;
+}
+
+static int lfs_component_create(char *fname, int open_flags, mode_t open_mode,
+ struct llapi_layout *layout)
+{
+ struct stat st;
+ int fd;
+
+ if (layout == NULL)
+ return -EINVAL;
+
+ fd = lstat(fname, &st);
+ if (fd == 0 && S_ISDIR(st.st_mode))
+ open_flags = O_DIRECTORY | O_RDONLY;
+
+ fd = llapi_layout_file_open(fname, open_flags, open_mode, layout);
+ if (fd < 0)
+ fprintf(stderr, "%s %s failed. %s\n",
+ S_ISDIR(st.st_mode) ?
+ "Set default composite layout to " :
+ "Create composite file",
+ fname, strerror(errno));
+ return fd;
+}
+
static int lfs_migrate(char *name, __u64 migration_flags,
- struct llapi_stripe_param *param)
+ struct llapi_stripe_param *param,
+ struct llapi_layout *layout)
{
int fd = -1;
int fdv = -1;
int rc;
struct lov_user_md *lum = NULL;
int lum_size;
- int buf_size;
+ int buf_size = 1024 * 1024 * 4;
bool have_lease_rdlck = false;
struct stat st;
struct stat stv;
* (eg: no stripe)
* in case of a real error, a later call will fail with better
* error management */
- if (rc < 0)
- buf_size = 1024 * 1024;
- else
- buf_size = lum->lmm_stripe_size;
+ if (rc == 0) {
+ if ((lum->lmm_magic == LOV_USER_MAGIC_V1 ||
+ lum->lmm_magic == LOV_USER_MAGIC_V3) &&
+ lum->lmm_stripe_size != 0)
+ buf_size = lum->lmm_stripe_size;
+ }
/* open file, direct io */
/* even if the file is only read, WR mode is nedeed to allow
}
do {
+ int open_flags = O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW;
+ mode_t open_mode = S_IRUSR | S_IWUSR;
+
random_value = random();
rc = snprintf(volatile_file, sizeof(volatile_file),
"%s/%s:%.4X:%.4X", parent, LUSTRE_VOLATILE_HDR,
}
/* create, open a volatile file, use caching (ie no directio) */
- fdv = llapi_file_open_param(volatile_file,
- O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW,
- S_IRUSR | S_IWUSR, param);
+ if (param != NULL)
+ fdv = llapi_file_open_param(volatile_file, open_flags,
+ open_mode, param);
+ else if (layout != NULL)
+ fdv = lfs_component_create(volatile_file, open_flags,
+ open_mode, layout);
+ else
+ fdv = -EINVAL;
} while (fdv == -EEXIST);
if (fdv < 0) {
return rc < 0 ? rc : nr;
}
+struct lfs_setstripe_args {
+ unsigned long long lsa_comp_end;
+ unsigned long long lsa_stripe_size;
+ int lsa_stripe_count;
+ int lsa_stripe_off;
+ __u32 lsa_comp_flags;
+ int lsa_nr_osts;
+ __u32 *lsa_osts;
+ char *lsa_pool_name;
+};
+
+static inline void setstripe_args_init(struct lfs_setstripe_args *lsa)
+{
+ memset(lsa, 0, sizeof(*lsa));
+ lsa->lsa_stripe_off = -1;
+}
+
+static inline bool setstripe_args_specified(struct lfs_setstripe_args *lsa)
+{
+ return (lsa->lsa_stripe_size != 0 || lsa->lsa_stripe_count != 0 ||
+ lsa->lsa_stripe_off != -1 || lsa->lsa_pool_name != NULL ||
+ lsa->lsa_comp_end != 0);
+}
+
+static int comp_args_to_layout(struct llapi_layout **composite,
+ struct lfs_setstripe_args *lsa)
+{
+ struct llapi_layout *layout = *composite;
+ uint64_t prev_end = 0;
+ int i = 0, rc;
+
+ if (layout == NULL) {
+ layout = llapi_layout_alloc();
+ if (layout == NULL) {
+ fprintf(stderr, "Alloc llapi_layout failed. %s\n",
+ strerror(errno));
+ return -ENOMEM;
+ }
+ *composite = layout;
+ } else {
+ uint64_t start;
+
+ /* Get current component extent, current component
+ * must be the tail component. */
+ rc = llapi_layout_comp_extent_get(layout, &start, &prev_end);
+ if (rc) {
+ fprintf(stderr, "Get comp extent failed. %s\n",
+ strerror(errno));
+ return rc;
+ }
+
+ rc = llapi_layout_comp_add(layout);
+ if (rc) {
+ fprintf(stderr, "Add component failed. %s\n",
+ strerror(errno));
+ return rc;
+ }
+ }
+
+ rc = llapi_layout_comp_extent_set(layout, prev_end, lsa->lsa_comp_end);
+ if (rc) {
+ fprintf(stderr, "Set extent [%lu, %llu) failed. %s\n",
+ prev_end, lsa->lsa_comp_end, strerror(errno));
+ return rc;
+ }
+
+ if (lsa->lsa_stripe_size != 0) {
+ rc = llapi_layout_stripe_size_set(layout,
+ lsa->lsa_stripe_size);
+ if (rc) {
+ fprintf(stderr, "Set stripe size %llu failed. %s\n",
+ lsa->lsa_stripe_size, strerror(errno));
+ return rc;
+ }
+ }
+
+ if (lsa->lsa_stripe_count != 0) {
+ rc = llapi_layout_stripe_count_set(layout,
+ lsa->lsa_stripe_count == -1 ?
+ LLAPI_LAYOUT_WIDE :
+ lsa->lsa_stripe_count);
+ if (rc) {
+ fprintf(stderr, "Set stripe count %d failed. %s\n",
+ lsa->lsa_stripe_count, strerror(errno));
+ return rc;
+ }
+ }
+
+ if (lsa->lsa_pool_name != NULL) {
+ rc = llapi_layout_pool_name_set(layout, lsa->lsa_pool_name);
+ if (rc) {
+ fprintf(stderr, "Set pool name: %s failed. %s\n",
+ lsa->lsa_pool_name, strerror(errno));
+ return rc;
+ }
+ }
+
+ if (lsa->lsa_nr_osts > 0) {
+ if (lsa->lsa_stripe_count > 0 &&
+ lsa->lsa_nr_osts != lsa->lsa_stripe_count) {
+ fprintf(stderr, "stripe_count(%d) != nr_osts(%d)\n",
+ lsa->lsa_stripe_count, lsa->lsa_nr_osts);
+ return -EINVAL;
+ }
+ for (i = 0; i < lsa->lsa_nr_osts; i++) {
+ rc = llapi_layout_ost_index_set(layout, i,
+ lsa->lsa_osts[i]);
+ if (rc)
+ break;
+ }
+ } else if (lsa->lsa_stripe_off != -1) {
+ rc = llapi_layout_ost_index_set(layout, 0, lsa->lsa_stripe_off);
+ }
+ if (rc) {
+ fprintf(stderr, "Set ost index %d failed. %s\n",
+ i, strerror(errno));
+ return rc;
+ }
+
+ return 0;
+}
+
+/* In 'lfs setstripe --component-add' mode, we need to fetch the extent
+ * end of the last component in the existing file, and adjust the
+ * first extent start of the components to be added accordingly. */
+static int adjust_first_extent(char *fname, struct llapi_layout *layout)
+{
+ struct llapi_layout *head;
+ uint64_t start, end, stripe_size, prev_end = 0;
+ int rc;
+
+ if (layout == NULL)
+ return -EINVAL;
+
+ errno = 0;
+ head = llapi_layout_get_by_path(fname, 0);
+ if (head == NULL) {
+ fprintf(stderr, "Read layout from %s failed. %s\n",
+ fname, strerror(errno));
+ return -EINVAL;
+ } else if (errno == ENODATA) {
+ /* file without LOVEA, this component-add will be turned
+ * into a component-create. */
+ llapi_layout_free(head);
+ return -ENODATA;
+ } else if (!llapi_layout_is_composite(head)) {
+ fprintf(stderr, "'%s' isn't a composite file.\n",
+ fname);
+ llapi_layout_free(head);
+ return -EINVAL;
+ }
+
+ rc = llapi_layout_comp_extent_get(head, &start, &prev_end);
+ if (rc) {
+ fprintf(stderr, "Get prev extent failed. %s\n",
+ strerror(errno));
+ llapi_layout_free(head);
+ return rc;
+ }
+
+ llapi_layout_free(head);
+
+ /* Make sure we use the first component of the layout to be added. */
+ rc = llapi_layout_comp_use(layout, LLAPI_LAYOUT_COMP_USE_FIRST);
+ if (rc < 0) {
+ fprintf(stderr, "Move component cursor failed. %s\n",
+ strerror(errno));
+ return rc;
+ }
+
+ rc = llapi_layout_comp_extent_get(layout, &start, &end);
+ if (rc) {
+ fprintf(stderr, "Get extent failed. %s\n", strerror(errno));
+ return rc;
+ }
+
+ if (start > prev_end || end <= prev_end) {
+ fprintf(stderr, "First extent to be set [%lu, %lu) isn't "
+ "adjacent with the existing file extent end: %lu\n",
+ start, end, prev_end);
+ return -EINVAL;
+ }
+
+ rc = llapi_layout_stripe_size_get(layout, &stripe_size);
+ if (rc) {
+ fprintf(stderr, "Get stripe size failed. %s\n",
+ strerror(errno));
+ return rc;
+ }
+
+ if (stripe_size != LLAPI_LAYOUT_DEFAULT &&
+ (prev_end & (stripe_size - 1))) {
+ fprintf(stderr, "Stripe size %lu not aligned with %lu\n",
+ stripe_size, prev_end);
+ return -EINVAL;
+ }
+
+ rc = llapi_layout_comp_extent_set(layout, prev_end, end);
+ if (rc) {
+ fprintf(stderr, "Set component extent [%lu, %lu) failed. %s\n",
+ prev_end, end, strerror(errno));
+ return rc;
+ }
+
+ return 0;
+}
+
+static inline bool comp_flags_is_neg(__u32 flags)
+{
+ return flags & LCME_FL_NEG;
+}
+
+static inline void comp_flags_set_neg(__u32 *flags)
+{
+ *flags |= LCME_FL_NEG;
+}
+
+static inline void comp_flags_clear_neg(__u32 *flags)
+{
+ *flags &= ~LCME_FL_NEG;
+}
+
+static int comp_str2flags(__u32 *flags, char *string)
+{
+ char *name;
+ __u32 neg_flags = 0;
+
+ if (string == NULL)
+ return -EINVAL;
+
+ *flags = 0;
+ for (name = strtok(string, ","); name; name = strtok(NULL, ",")) {
+ bool found = false;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(comp_flags_table); i++) {
+ __u32 comp_flag = comp_flags_table[i].cfn_flag;
+ const char *comp_name = comp_flags_table[i].cfn_name;
+
+ if (strcmp(name, comp_name) == 0) {
+ *flags |= comp_flag;
+ found = true;
+ } else if (strncmp(name, "^", 1) == 0 &&
+ strcmp(name + 1, comp_name) == 0) {
+ neg_flags |= comp_flag;
+ found = true;
+ }
+ }
+ if (!found) {
+ llapi_printf(LLAPI_MSG_ERROR, "Component flag "
+ "'%s' is not supported.\n", name);
+ return -EINVAL;
+ }
+ }
+
+ if (*flags == 0 && neg_flags == 0)
+ return -EINVAL;
+ /* don't support mixed flags for now */
+ if (*flags && neg_flags)
+ return -EINVAL;
+
+ if (neg_flags) {
+ *flags = neg_flags;
+ comp_flags_set_neg(flags);
+ }
+
+ return 0;
+}
+
+static inline bool arg_is_eof(char *arg)
+{
+ return !strncmp(arg, "-1", strlen("-1")) ||
+ !strncmp(arg, "EOF", strlen("EOF")) ||
+ !strncmp(arg, "eof", strlen("eof"));
+}
+
+enum {
+ LFS_POOL_OPT = 3,
+ LFS_COMP_COUNT_OPT,
+ LFS_COMP_START_OPT,
+ LFS_COMP_FLAGS_OPT,
+ LFS_COMP_DEL_OPT,
+ LFS_COMP_SET_OPT,
+ LFS_COMP_ADD_OPT,
+ LFS_PROJID_OPT,
+};
+
/* functions */
static int lfs_setstripe(int argc, char **argv)
{
+ struct lfs_setstripe_args lsa;
struct llapi_stripe_param *param = NULL;
struct find_param migrate_mdt_param = {
.fp_max_depth = -1,
char *fname;
int result;
int result2 = 0;
- unsigned long long st_size;
- int st_offset, st_count;
char *end;
int c;
int delete = 0;
- char *stripe_size_arg = NULL;
- char *stripe_off_arg = NULL;
- char *stripe_count_arg = NULL;
- char *pool_name_arg = NULL;
char *mdt_idx_arg = NULL;
unsigned long long size_units = 1;
bool migrate_mode = false;
bool migration_block = false;
__u64 migration_flags = 0;
__u32 osts[LOV_MAX_STRIPE_COUNT] = { 0 };
- int nr_osts = 0;
+ int comp_del = 0, comp_set = 0;
+ int comp_add = 0;
+ __u32 comp_id = 0;
+ struct llapi_layout *layout = NULL;
- struct option long_opts[] = {
+ struct option long_opts[] = {
/* --block is only valid in migrate mode */
- {"block", no_argument, 0, 'b'},
+ { .val = 'b', .name = "block", .has_arg = no_argument},
+ { .val = LFS_COMP_ADD_OPT,
+ .name = "comp-add", .has_arg = no_argument},
+ { .val = LFS_COMP_ADD_OPT,
+ .name = "component-add",
+ .has_arg = no_argument},
+ { .val = LFS_COMP_DEL_OPT,
+ .name = "comp-del", .has_arg = no_argument},
+ { .val = LFS_COMP_DEL_OPT,
+ .name = "component-del",
+ .has_arg = no_argument},
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "comp-flags", .has_arg = required_argument},
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "component-flags",
+ .has_arg = required_argument},
+ { .val = LFS_COMP_SET_OPT,
+ .name = "comp-set", .has_arg = no_argument},
+ { .val = LFS_COMP_SET_OPT,
+ .name = "component-set",
+ .has_arg = no_argument},
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "stripe-count", but was explicitly
- * made "stripe-count" for consistency with other options,
- * and to separate it from "mdt-count" when DNE arrives. */
- {"count", required_argument, 0, 'c'},
+ /* This formerly implied "stripe-count", but was explicitly
+ * made "stripe-count" for consistency with other options,
+ * and to separate it from "mdt-count" when DNE arrives. */
+ { .val = 'c', .name = "count", .has_arg = required_argument },
#endif
- {"stripe-count", required_argument, 0, 'c'},
- {"stripe_count", required_argument, 0, 'c'},
- {"delete", no_argument, 0, 'd'},
+ { .val = 'c', .name = "stripe-count", .has_arg = required_argument},
+ { .val = 'c', .name = "stripe_count", .has_arg = required_argument},
+ { .val = 'd', .name = "delete", .has_arg = no_argument},
+ { .val = 'E', .name = "comp-end", .has_arg = required_argument},
+ { .val = 'E', .name = "component-end",
+ .has_arg = required_argument},
+ /* dirstripe {"mdt-hash", required_argument, 0, 'H'}, */
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "stripe-index", but was explicitly
- * made "stripe-index" for consistency with other options,
- * and to separate it from "mdt-index" when DNE arrives. */
- {"index", required_argument, 0, 'i'},
+ /* This formerly implied "stripe-index", but was explicitly
+ * made "stripe-index" for consistency with other options,
+ * and to separate it from "mdt-index" when DNE arrives. */
+ { .val = 'i', .name = "index", .has_arg = required_argument },
#endif
- {"stripe-index", required_argument, 0, 'i'},
- {"stripe_index", required_argument, 0, 'i'},
- {"mdt", required_argument, 0, 'm'},
- {"mdt-index", required_argument, 0, 'm'},
- {"mdt_index", required_argument, 0, 'm'},
- /* --non-block is only valid in migrate mode */
- {"non-block", no_argument, 0, 'n'},
- {"ost", required_argument, 0, 'o'},
+ { .val = 'i', .name = "stripe-index", .has_arg = required_argument},
+ { .val = 'i', .name = "stripe_index", .has_arg = required_argument},
+ { .val = 'I', .name = "comp-id", .has_arg = required_argument},
+ { .val = 'I', .name = "component-id", .has_arg = required_argument},
+ { .val = 'm', .name = "mdt", .has_arg = required_argument},
+ { .val = 'm', .name = "mdt-index", .has_arg = required_argument},
+ { .val = 'm', .name = "mdt_index", .has_arg = required_argument},
+ /* --non-block is only valid in migrate mode */
+ { .val = 'n', .name = "non-block", .has_arg = no_argument},
+ { .val = 'o', .name = "ost", .has_arg = required_argument},
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"ost-list", required_argument, 0, 'o'},
- {"ost_list", required_argument, 0, 'o'},
+ { .val = 'o', .name = "ost-list", .has_arg = required_argument },
+ { .val = 'o', .name = "ost_list", .has_arg = required_argument },
#endif
- {"pool", required_argument, 0, 'p'},
+ { .val = 'p', .name = "pool", .has_arg = required_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "--stripe-size", but was confusing
- * with "lfs find --size|-s", which means "file size", so use
- * the consistent "--stripe-size|-S" for all commands. */
- {"size", required_argument, 0, 's'},
+ /* This formerly implied "--stripe-size", but was confusing
+ * with "lfs find --size|-s", which means "file size", so use
+ * the consistent "--stripe-size|-S" for all commands. */
+ { .val = 's', .name = "size", .has_arg = required_argument },
#endif
- {"stripe-size", required_argument, 0, 'S'},
- {"stripe_size", required_argument, 0, 'S'},
- /* --verbose is only valid in migrate mode */
- {"verbose", no_argument, 0, 'v'},
- {0, 0, 0, 0}
- };
-
- st_size = 0;
- st_offset = -1;
- st_count = 0;
+ { .val = 'S', .name = "stripe-size", .has_arg = required_argument },
+ { .val = 'S', .name = "stripe_size", .has_arg = required_argument },
+ /* dirstripe {"mdt-count", required_argument, 0, 'T'}, */
+ /* --verbose is only valid in migrate mode */
+ { .val = 'v', .name = "verbose", .has_arg = no_argument },
+ { .val = LFS_COMP_ADD_OPT,
+ .name = "component-add",
+ .has_arg = no_argument },
+ { .val = LFS_COMP_DEL_OPT,
+ .name = "component-del",
+ .has_arg = no_argument },
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "component-flags",
+ .has_arg = required_argument },
+ { .val = LFS_COMP_SET_OPT,
+ .name = "component-set",
+ .has_arg = no_argument },
+ { .name = NULL } };
+
+ setstripe_args_init(&lsa);
if (strcmp(argv[0], "migrate") == 0)
migrate_mode = true;
- while ((c = getopt_long(argc, argv, "bc:di:m:no:p:s:S:v",
+ while ((c = getopt_long(argc, argv, "bc:dE:i:I:m:no:p:s:S:v",
long_opts, NULL)) >= 0) {
switch (c) {
case 0:
/* Long options. */
break;
+ case LFS_COMP_ADD_OPT:
+ comp_add = 1;
+ break;
+ case LFS_COMP_DEL_OPT:
+ comp_del = 1;
+ break;
+ case LFS_COMP_FLAGS_OPT:
+ result = comp_str2flags(&lsa.lsa_comp_flags, optarg);
+ if (result != 0) {
+ fprintf(stderr, "error: %s: bad comp flags "
+ "'%s'\n", argv[0], optarg);
+ goto error;
+ }
+ break;
+ case LFS_COMP_SET_OPT:
+ comp_set = 1;
+ break;
case 'b':
if (!migrate_mode) {
fprintf(stderr, "--block is valid only for"
" migrate mode\n");
- return CMD_HELP;
+ goto error;
}
migration_block = true;
break;
fprintf(stderr, "warning: '--count' deprecated"
", use '--stripe-count' instead\n");
#endif
- stripe_count_arg = optarg;
+ lsa.lsa_stripe_count = strtoul(optarg, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe count "
+ "'%s'\n", argv[0], optarg);
+ goto error;
+ }
break;
case 'd':
/* delete the default striping pattern */
delete = 1;
break;
- case 'o':
- nr_osts = parse_targets(osts,
- sizeof(osts) / sizeof(__u32),
- nr_osts, optarg);
- if (nr_osts < 0) {
- fprintf(stderr,
- "error: %s: bad OST indices '%s'\n",
- argv[0], optarg);
- return CMD_HELP;
+ case 'E':
+ if (lsa.lsa_comp_end != 0) {
+ result = comp_args_to_layout(&layout, &lsa);
+ if (result)
+ goto error;
+
+ setstripe_args_init(&lsa);
}
- if (st_offset == -1) /* first in the command line */
- st_offset = osts[0];
+ if (arg_is_eof(optarg)) {
+ lsa.lsa_comp_end = LUSTRE_EOF;
+ } else {
+ result = llapi_parse_size(optarg,
+ &lsa.lsa_comp_end,
+ &size_units, 0);
+ if (result) {
+ fprintf(stderr, "error: %s: "
+ "bad component end '%s'\n",
+ argv[0], optarg);
+ goto error;
+ }
+ }
break;
case 'i':
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
if (strcmp(argv[optind - 1], "--index") == 0)
fprintf(stderr, "warning: '--index' deprecated"
", use '--stripe-index' instead\n");
-#endif
- stripe_off_arg = optarg;
+ lsa.lsa_stripe_off = strtol(optarg, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "error: %s: bad stripe offset "
+ "'%s'\n", argv[0], optarg);
+ goto error;
+ }
+ break;
+ case 'I':
+ comp_id = strtoul(optarg, &end, 0);
+ if (*end != '\0' || comp_id == 0 ||
+ comp_id > LCME_ID_MAX) {
+ fprintf(stderr, "error: %s: bad comp ID "
+ "'%s'\n", argv[0], optarg);
+ goto error;
+ }
break;
case 'm':
if (!migrate_mode) {
fprintf(stderr, "--mdt-index is valid only for"
" migrate mode\n");
- return CMD_HELP;
+ goto error;
}
mdt_idx_arg = optarg;
break;
if (!migrate_mode) {
fprintf(stderr, "--non-block is valid only for"
" migrate mode\n");
- return CMD_HELP;
+ goto error;
}
migration_flags |= MIGRATION_NONBLOCK;
break;
+ case 'o':
+ lsa.lsa_nr_osts = parse_targets(osts,
+ sizeof(osts) / sizeof(__u32),
+ lsa.lsa_nr_osts, optarg);
+ if (lsa.lsa_nr_osts < 0) {
+ fprintf(stderr,
+ "error: %s: bad OST indices '%s'\n",
+ argv[0], optarg);
+ goto error;
+ }
+
+ lsa.lsa_osts = osts;
+ if (lsa.lsa_stripe_off == -1)
+ lsa.lsa_stripe_off = osts[0];
+ break;
+ case 'p':
+ if (optarg == NULL)
+ goto error;
+ lsa.lsa_pool_name = optarg;
+ break;
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
case 's':
#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
#endif
#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */
case 'S':
- stripe_size_arg = optarg;
- break;
- case 'p':
- pool_name_arg = optarg;
+ result = llapi_parse_size(optarg, &lsa.lsa_stripe_size,
+ &size_units, 0);
+ if (result) {
+ fprintf(stderr, "error: %s: bad stripe size "
+ "'%s'\n", argv[0], optarg);
+ goto error;
+ }
break;
case 'v':
if (!migrate_mode) {
fprintf(stderr, "--verbose is valid only for"
" migrate mode\n");
- return CMD_HELP;
+ goto error;
}
migrate_mdt_param.fp_verbose = VERBOSE_DETAIL;
break;
default:
- return CMD_HELP;
+ goto error;
}
}
fname = argv[optind];
- if (delete &&
- (stripe_size_arg != NULL || stripe_off_arg != NULL ||
- stripe_count_arg != NULL || pool_name_arg != NULL)) {
- fprintf(stderr, "error: %s: cannot specify -d with "
- "-s, -c, -o, or -p options\n",
- argv[0]);
- return CMD_HELP;
+ if (lsa.lsa_comp_end != 0) {
+ result = comp_args_to_layout(&layout, &lsa);
+ if (result)
+ goto error;
}
if (optind == argc) {
fprintf(stderr, "error: %s: missing filename|dirname\n",
argv[0]);
- return CMD_HELP;
+ goto error;
}
- if (mdt_idx_arg != NULL && optind > 3) {
- fprintf(stderr, "error: %s: cannot specify -m with other "
- "options\n", argv[0]);
- return CMD_HELP;
+ /* Only LCME_FL_INIT flags is used in PFL, and it shouldn't be
+ * altered by user space tool, so we don't need to support the
+ * --component-set for this moment. */
+ if (comp_set != 0) {
+ fprintf(stderr, "error: %s: --component-set isn't supported.\n",
+ argv[0]);
+ goto error;
}
- if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) {
- fprintf(stderr,
- "error: %s: cannot specify --non-block and --block\n",
+ if ((delete + comp_set + comp_del + comp_add) > 1) {
+ fprintf(stderr, "error: %s: can't specify --component-set, "
+ "--component-del, --component-add or -d together\n",
argv[0]);
- return CMD_HELP;
+ goto error;
}
- if (pool_name_arg != NULL) {
- char *ptr;
- int rc;
+ if (delete && (setstripe_args_specified(&lsa) || comp_id != 0 ||
+ lsa.lsa_comp_flags != 0 || layout != NULL)) {
+ fprintf(stderr, "error: %s: can't specify -d with "
+ "-s, -c, -o, -p, -I, -F or -E options\n",
+ argv[0]);
+ goto error;
+ }
- ptr = strchr(pool_name_arg, '.');
- if (ptr == NULL) {
- ptr = pool_name_arg;
- } else {
- if ((ptr - pool_name_arg) == 0) {
- fprintf(stderr, "error: %s: fsname is empty "
- "in pool name '%s'\n",
- argv[0], pool_name_arg);
- return CMD_HELP;
- }
+ if ((comp_set || comp_del) &&
+ (setstripe_args_specified(&lsa) || layout != NULL)) {
+ fprintf(stderr, "error: %s: can't specify --component-del or "
+ "--component-set with -s, -c, -o, -p or -E options.\n",
+ argv[0]);
+ goto error;
+ }
- ++ptr;
- }
+ if (comp_del && comp_id != 0 && lsa.lsa_comp_flags != 0) {
+ fprintf(stderr, "error: %s: can't specify both -I and -F for "
+ "--component-del option.\n", argv[0]);
+ goto error;
+ }
- rc = lustre_is_poolname_valid(ptr, 1, LOV_MAXPOOLNAME);
- if (rc == -1) {
- fprintf(stderr, "error: %s: poolname '%s' is "
- "empty\n",
- argv[0], pool_name_arg);
- return CMD_HELP;
- } else if (rc == -2) {
- fprintf(stderr, "error: %s: pool name '%s' is too long "
- "(max is %d characters)\n",
- argv[0], pool_name_arg, LOV_MAXPOOLNAME);
- return CMD_HELP;
- } else if (rc > 0) {
- fprintf(stderr, "error: %s: char '%c' not allowed in "
- "pool name '%s'\n",
- argv[0], rc, pool_name_arg);
- return CMD_HELP;
+ if (comp_add || comp_del) {
+ struct stat st;
+
+ result = lstat(fname, &st);
+ if (result == 0 && S_ISDIR(st.st_mode)) {
+ fprintf(stderr, "error: %s: can't use --component-add "
+ "or --component-del for directory.\n",
+ argv[0]);
+ goto error;
}
}
- /* get the stripe size */
- if (stripe_size_arg != NULL) {
- result = llapi_parse_size(stripe_size_arg, &st_size,
- &size_units, 0);
- if (result) {
- fprintf(stderr, "error: %s: bad stripe size '%s'\n",
- argv[0], stripe_size_arg);
- return CMD_HELP;
+ if (comp_add) {
+ if (layout == NULL) {
+ fprintf(stderr, "error: %s: -E option must be present"
+ "in --component-add mode.\n", argv[0]);
+ goto error;
}
+ result = adjust_first_extent(fname, layout);
+ if (result == -ENODATA)
+ comp_add = 0;
+ else if (result != 0)
+ goto error;
+ }
+
+ if (mdt_idx_arg != NULL && optind > 3) {
+ fprintf(stderr, "error: %s: cannot specify -m with other "
+ "options\n", argv[0]);
+ goto error;
+ }
+
+ if ((migration_flags & MIGRATION_NONBLOCK) && migration_block) {
+ fprintf(stderr,
+ "error: %s: cannot specify --non-block and --block\n",
+ argv[0]);
+ goto error;
+ }
+
+ if (!comp_del && !comp_set && comp_id != 0) {
+ fprintf(stderr, "error: %s: -I can only be used with "
+ "--component-del.\n", argv[0]);
+ goto error;
}
- /* get the stripe offset */
- if (stripe_off_arg != NULL) {
- st_offset = strtol(stripe_off_arg, &end, 0);
- if (*end != '\0') {
- fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
- argv[0], stripe_off_arg);
- return CMD_HELP;
- }
- }
- /* get the stripe count */
- if (stripe_count_arg != NULL) {
- st_count = strtoul(stripe_count_arg, &end, 0);
- if (*end != '\0') {
- fprintf(stderr, "error: %s: bad stripe count '%s'\n",
- argv[0], stripe_count_arg);
- return CMD_HELP;
- }
- }
if (mdt_idx_arg != NULL) {
/* initialize migrate mdt parameters */
if (*end != '\0') {
fprintf(stderr, "error: %s: bad MDT index '%s'\n",
argv[0], mdt_idx_arg);
- return CMD_HELP;
+ goto error;
}
migrate_mdt_param.fp_migrate = 1;
- } else {
+ } else if (layout == NULL) {
/* initialize stripe parameters */
- param = calloc(1, offsetof(typeof(*param), lsp_osts[nr_osts]));
+ param = calloc(1, offsetof(typeof(*param),
+ lsp_osts[lsa.lsa_nr_osts]));
if (param == NULL) {
- fprintf(stderr, "error: %s: run out of memory\n",
- argv[0]);
- return CMD_HELP;
+ fprintf(stderr, "error: %s: %s\n", argv[0],
+ strerror(ENOMEM));
+ goto error;
}
- param->lsp_stripe_size = st_size;
- param->lsp_stripe_offset = st_offset;
- param->lsp_stripe_count = st_count;
+ param->lsp_stripe_size = lsa.lsa_stripe_size;
+ param->lsp_stripe_offset = lsa.lsa_stripe_off;
+ param->lsp_stripe_count = lsa.lsa_stripe_count;
param->lsp_stripe_pattern = 0;
- param->lsp_pool = pool_name_arg;
+ param->lsp_pool = lsa.lsa_pool_name;
param->lsp_is_specific = false;
- if (nr_osts > 0) {
- if (st_count > 0 && nr_osts != st_count) {
+ if (lsa.lsa_nr_osts > 0) {
+ if (lsa.lsa_stripe_count > 0 &&
+ lsa.lsa_nr_osts != lsa.lsa_stripe_count) {
fprintf(stderr, "error: %s: stripe count '%d' "
"doesn't match the number of OSTs: %d\n"
- , argv[0], st_count, nr_osts);
+ , argv[0], lsa.lsa_stripe_count,
+ lsa.lsa_nr_osts);
free(param);
- return CMD_HELP;
+ goto error;
}
param->lsp_is_specific = true;
- param->lsp_stripe_count = nr_osts;
- memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts);
+ param->lsp_stripe_count = lsa.lsa_nr_osts;
+ memcpy(param->lsp_osts, osts,
+ sizeof(*osts) * lsa.lsa_nr_osts);
}
}
for (fname = argv[optind]; fname != NULL; fname = argv[++optind]) {
- if (!migrate_mode) {
+ char *op;
+ if (mdt_idx_arg != NULL) {
+ result = llapi_migrate_mdt(fname, &migrate_mdt_param);
+ op = "migrate mdt objects of";
+ } else if (migrate_mode) {
+ result = lfs_migrate(fname, migration_flags, param,
+ layout);
+ op = "migrate ost objects of";
+ } else if (comp_set != 0) {
+ result = lfs_component_set(fname, comp_id,
+ lsa.lsa_comp_flags);
+ op = "modify component flags of";
+ } else if (comp_del != 0) {
+ result = lfs_component_del(fname, comp_id,
+ lsa.lsa_comp_flags);
+ op = "delete component of";
+ } else if (comp_add != 0) {
+ result = lfs_component_add(fname, layout);
+ op = "add component to";
+ } else if (layout != NULL) {
+ result = lfs_component_create(fname, O_CREAT | O_WRONLY,
+ 0644, layout);
+ if (result >= 0) {
+ close(result);
+ result = 0;
+ }
+ op = "create composite";
+ } else {
result = llapi_file_open_param(fname,
O_CREAT | O_WRONLY,
0644, param);
close(result);
result = 0;
}
- } else if (mdt_idx_arg != NULL) {
- result = llapi_migrate_mdt(fname, &migrate_mdt_param);
- } else {
- result = lfs_migrate(fname, migration_flags, param);
+ op = "create striped";
}
if (result) {
/* Save the first error encountered. */
if (result2 == 0)
result2 = result;
fprintf(stderr, "error: %s: %s file '%s' failed: %s\n",
- argv[0], migrate_mode ? "migrate" : "create",
- fname,
- pool_name_arg != NULL && result == EINVAL ?
+ argv[0], op, fname,
+ lsa.lsa_pool_name != NULL && result == EINVAL ?
"OST not in pool?" : strerror(errno));
continue;
}
}
free(param);
+ llapi_layout_free(layout);
return result2;
+error:
+ llapi_layout_free(layout);
+ return CMD_HELP;
}
static int lfs_poollist(int argc, char **argv)
*set = *time - t * 24 * 60 * 60;
return res;
}
-
-#define USER 0
-#define GROUP 1
-
-static int name2id(unsigned int *id, char *name, int type)
+static int name2uid(unsigned int *id, const char *name)
{
- if (type == USER) {
- struct passwd *entry;
+ struct passwd *passwd;
- if (!(entry = getpwnam(name))) {
- if (!errno)
- errno = ENOENT;
- return -1;
- }
+ passwd = getpwnam(name);
+ if (passwd == NULL)
+ return -ENOENT;
+ *id = passwd->pw_uid;
- *id = entry->pw_uid;
- } else {
- struct group *entry;
+ return 0;
+}
- if (!(entry = getgrnam(name))) {
- if (!errno)
- errno = ENOENT;
- return -1;
- }
+static int name2gid(unsigned int *id, const char *name)
+{
+ struct group *group;
- *id = entry->gr_gid;
- }
+ group = getgrnam(name);
+ if (group == NULL)
+ return -ENOENT;
+ *id = group->gr_gid;
- return 0;
+ return 0;
}
-static int id2name(char **name, unsigned int id, int type)
+static inline int name2projid(unsigned int *id, const char *name)
{
- if (type == USER) {
- struct passwd *entry;
+ return -ENOTSUP;
+}
- if (!(entry = getpwuid(id))) {
- if (!errno)
- errno = ENOENT;
- return -1;
- }
+static int uid2name(char **name, unsigned int id)
+{
+ struct passwd *passwd;
- *name = entry->pw_name;
- } else {
- struct group *entry;
+ passwd = getpwuid(id);
+ if (passwd == NULL)
+ return -ENOENT;
+ *name = passwd->pw_name;
- if (!(entry = getgrgid(id))) {
- if (!errno)
- errno = ENOENT;
- return -1;
- }
+ return 0;
+}
- *name = entry->gr_name;
- }
+static inline int gid2name(char **name, unsigned int id)
+{
+ struct group *group;
- return 0;
+ group = getgrgid(id);
+ if (group == NULL)
+ return -ENOENT;
+ *name = group->gr_name;
+
+ return 0;
}
static int name2layout(__u32 *layout, char *name)
return 0;
}
-#define FIND_POOL_OPT 3
static int lfs_find(int argc, char **argv)
{
int c, rc;
int ret = 0;
- time_t t;
+ time_t t;
struct find_param param = {
.fp_max_depth = -1,
.fp_quiet = 1,
};
struct option long_opts[] = {
- {"atime", required_argument, 0, 'A'},
- {"stripe-count", required_argument, 0, 'c'},
- {"stripe_count", required_argument, 0, 'c'},
- {"ctime", required_argument, 0, 'C'},
- {"maxdepth", required_argument, 0, 'D'},
- {"gid", required_argument, 0, 'g'},
- {"group", required_argument, 0, 'G'},
- {"stripe-index", required_argument, 0, 'i'},
- {"stripe_index", required_argument, 0, 'i'},
- {"layout", required_argument, 0, 'L'},
- {"mdt", required_argument, 0, 'm'},
- {"mdt-index", required_argument, 0, 'm'},
- {"mdt_index", required_argument, 0, 'm'},
- {"mtime", required_argument, 0, 'M'},
- {"name", required_argument, 0, 'n'},
+ { .val = 'A', .name = "atime", .has_arg = required_argument },
+ { .val = LFS_COMP_COUNT_OPT,
+ .name = "comp-count", .has_arg = required_argument },
+ { .val = LFS_COMP_COUNT_OPT,
+ .name = "component-count",
+ .has_arg = required_argument },
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "comp-flags", .has_arg = required_argument },
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "component-flags",
+ .has_arg = required_argument },
+ { .val = LFS_COMP_START_OPT,
+ .name = "comp-start", .has_arg = required_argument },
+ { .val = LFS_COMP_START_OPT,
+ .name = "component-start",
+ .has_arg = required_argument },
+ { .val = 'c', .name = "stripe-count", .has_arg = required_argument },
+ { .val = 'c', .name = "stripe_count", .has_arg = required_argument },
+ { .val = 'C', .name = "ctime", .has_arg = required_argument },
+ { .val = 'D', .name = "maxdepth", .has_arg = required_argument },
+ { .val = 'E', .name = "comp-end", .has_arg = required_argument },
+ { .val = 'E', .name = "component-end",
+ .has_arg = required_argument },
+ { .val = 'g', .name = "gid", .has_arg = required_argument },
+ { .val = 'G', .name = "group", .has_arg = required_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 },
+ /*{"component-id", required_argument, 0, 'I'},*/
+ { .val = 'L', .name = "layout", .has_arg = required_argument },
+ { .val = 'm', .name = "mdt", .has_arg = required_argument },
+ { .val = 'm', .name = "mdt-index", .has_arg = required_argument },
+ { .val = 'm', .name = "mdt_index", .has_arg = required_argument },
+ { .val = 'M', .name = "mtime", .has_arg = required_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
/* reserve {"or", no_argument, , 0, 'o'}, to match find(1) */
- {"obd", required_argument, 0, 'O'},
- {"ost", required_argument, 0, 'O'},
- /* no short option for pool, p/P already used */
- {"pool", required_argument, 0, FIND_POOL_OPT},
- {"print0", no_argument, 0, 'p'},
- {"print", no_argument, 0, 'P'},
- {"size", required_argument, 0, 's'},
- {"stripe-size", required_argument, 0, 'S'},
- {"stripe_size", required_argument, 0, 'S'},
- {"type", required_argument, 0, 't'},
- {"uid", required_argument, 0, 'u'},
- {"user", required_argument, 0, 'U'},
- {0, 0, 0, 0}
- };
+ { .val = 'O', .name = "obd", .has_arg = required_argument },
+ { .val = 'O', .name = "ost", .has_arg = required_argument },
+ /* no short option for pool, p/P already used */
+ { .val = LFS_POOL_OPT,
+ .name = "pool", .has_arg = required_argument },
+ { .val = 'p', .name = "print0", .has_arg = no_argument },
+ { .val = 'P', .name = "print", .has_arg = no_argument },
+ { .val = LFS_PROJID_OPT,
+ .name = "projid", .has_arg = required_argument },
+ { .val = 's', .name = "size", .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 = 'T', .name = "mdt-count", .has_arg = required_argument },
+ { .val = 'u', .name = "uid", .has_arg = required_argument },
+ { .val = 'U', .name = "user", .has_arg = required_argument },
+ { .name = NULL } };
int pathstart = -1;
int pathend = -1;
int neg_opt = 0;
/* when getopt_long_only() hits '!' it returns 1, puts "!" in optarg */
while ((c = getopt_long_only(argc, argv,
- "-A:c:C:D:g:G:i:L:m:M:n:O:Ppqrs:S:t:u:U:v",
- long_opts, NULL)) >= 0) {
+ "-A:c:C:D:E:g:G:H:i:L:m:M:n:O:Ppqrs:S:t:T:u:U:v",
+ long_opts, NULL)) >= 0) {
xtime = NULL;
xsign = NULL;
if (neg_opt)
if (rc)
*xsign = rc;
break;
+ case LFS_COMP_COUNT_OPT:
+ if (optarg[0] == '+') {
+ param.fp_comp_count_sign = -1;
+ optarg++;
+ } else if (optarg[0] == '-') {
+ param.fp_comp_count_sign = 1;
+ optarg++;
+ }
+
+ param.fp_comp_count = strtoul(optarg, &endptr, 0);
+ if (*endptr != '\0') {
+ fprintf(stderr, "error: bad component count "
+ "'%s'\n", optarg);
+ goto err;
+ }
+ param.fp_check_comp_count = 1;
+ param.fp_exclude_comp_count = !!neg_opt;
+ break;
+ case LFS_COMP_FLAGS_OPT:
+ rc = comp_str2flags(¶m.fp_comp_flags, optarg);
+ if (rc || comp_flags_is_neg(param.fp_comp_flags)) {
+ fprintf(stderr, "error: bad component flags "
+ "'%s'\n", optarg);
+ goto err;
+ }
+ param.fp_check_comp_flags = 1;
+ param.fp_exclude_comp_flags = !!neg_opt;
+ break;
+ case LFS_COMP_START_OPT:
+ if (optarg[0] == '+') {
+ param.fp_comp_start_sign = -1;
+ optarg++;
+ } else if (optarg[0] == '-') {
+ param.fp_comp_start_sign = 1;
+ optarg++;
+ }
+
+ rc = llapi_parse_size(optarg, ¶m.fp_comp_start,
+ ¶m.fp_comp_start_units, 0);
+ if (rc) {
+ fprintf(stderr, "error: bad component start "
+ "'%s'\n", optarg);
+ goto err;
+ }
+ param.fp_check_comp_start = 1;
+ param.fp_exclude_comp_start = !!neg_opt;
+ break;
case 'c':
if (optarg[0] == '+') {
param.fp_stripe_count_sign = -1;
case 'D':
param.fp_max_depth = strtol(optarg, 0, 0);
break;
+ case 'E':
+ if (optarg[0] == '+') {
+ param.fp_comp_end_sign = -1;
+ optarg++;
+ } else if (optarg[0] == '-') {
+ param.fp_comp_end_sign = 1;
+ optarg++;
+ }
+
+ if (arg_is_eof(optarg)) {
+ param.fp_comp_end = LUSTRE_EOF;
+ param.fp_comp_end_units = 1;
+ rc = 0;
+ } else {
+ rc = llapi_parse_size(optarg,
+ ¶m.fp_comp_end,
+ ¶m.fp_comp_end_units, 0);
+ }
+ if (rc) {
+ fprintf(stderr, "error: bad component end "
+ "'%s'\n", optarg);
+ goto err;
+ }
+ param.fp_check_comp_end = 1;
+ param.fp_exclude_comp_end = !!neg_opt;
+ break;
case 'g':
case 'G':
- rc = name2id(¶m.fp_gid, optarg, GROUP);
+ rc = name2gid(¶m.fp_gid, optarg);
if (rc) {
param.fp_gid = strtoul(optarg, &endptr, 10);
if (*endptr != '\0') {
param.fp_exclude_gid = !!neg_opt;
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);
+ ret = -1;
+ goto err;
+ }
+ param.fp_check_hash_type = 1;
+ param.fp_exclude_hash_type = !!neg_opt;
+ break;
case 'L':
ret = name2layout(¶m.fp_layout, optarg);
if (ret)
param.fp_exclude_layout = !!neg_opt;
param.fp_check_layout = 1;
break;
- case 'u':
- case 'U':
- rc = name2id(¶m.fp_uid, optarg, USER);
+ case 'u':
+ case 'U':
+ rc = name2uid(¶m.fp_uid, optarg);
if (rc) {
param.fp_uid = strtoul(optarg, &endptr, 10);
- if (*endptr != '\0') {
- fprintf(stderr, "User/UID: %s cannot "
+ if (*endptr != '\0') {
+ fprintf(stderr, "User/UID: %s cannot "
"be found.\n", optarg);
ret = -1;
goto err;
param.fp_exclude_uid = !!neg_opt;
param.fp_check_uid = 1;
break;
- case FIND_POOL_OPT:
+ case LFS_POOL_OPT:
if (strlen(optarg) > LOV_MAXPOOLNAME) {
fprintf(stderr,
"Pool name %s is too long"
strncpy(puuid->uuid, token,
sizeof(puuid->uuid));
- }
+ }
err_free:
- if (buf)
- free(buf);
- break;
- }
- case 'p':
+ if (buf)
+ free(buf);
+ break;
+ }
+ case 'p':
param.fp_zero_end = 1;
- break;
- case 'P':
- break;
+ break;
+ case 'P':
+ break;
+ case LFS_PROJID_OPT:
+ rc = name2projid(¶m.fp_projid, optarg);
+ if (rc) {
+ param.fp_projid = strtoul(optarg, &endptr, 10);
+ if (*endptr != '\0') {
+ fprintf(stderr,
+ "Invalid project ID: %s",
+ optarg);
+ ret = -1;
+ goto err;
+ }
+ }
+ param.fp_exclude_projid = !!neg_opt;
+ param.fp_check_projid = 1;
+ break;
case 's':
if (optarg[0] == '+') {
param.fp_size_sign = -1;
goto err;
};
break;
+ case 'T':
+ if (optarg[0] == '+') {
+ param.fp_mdt_count_sign = -1;
+ optarg++;
+ } else if (optarg[0] == '-') {
+ param.fp_mdt_count_sign = 1;
+ optarg++;
+ }
+
+ param.fp_mdt_count = strtoul(optarg, &endptr, 0);
+ if (*endptr != '\0') {
+ fprintf(stderr, "error: bad mdt_count '%s'\n",
+ optarg);
+ ret = -1;
+ goto err;
+ }
+ param.fp_check_mdt_count = 1;
+ param.fp_exclude_mdt_count = !!neg_opt;
+ break;
default:
ret = CMD_HELP;
goto err;
struct find_param *param)
{
struct option long_opts[] = {
+ { .val = LFS_COMP_COUNT_OPT,
+ .name = "comp-count", .has_arg = no_argument },
+ { .val = LFS_COMP_COUNT_OPT,
+ .name = "component-count", .has_arg = no_argument },
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "comp-flags", .has_arg = optional_argument },
+ { .val = LFS_COMP_FLAGS_OPT,
+ .name = "component-flags", .has_arg = optional_argument },
+ { .val = LFS_COMP_START_OPT,
+ .name = "comp-start", .has_arg = optional_argument },
+ { .val = LFS_COMP_START_OPT,
+ .name = "component-start", .has_arg = optional_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "stripe-count", but was explicitly
- * made "stripe-count" for consistency with other options,
- * and to separate it from "mdt-count" when DNE arrives. */
- {"count", no_argument, 0, 'c'},
+ /* This formerly implied "stripe-count", but was explicitly
+ * made "stripe-count" for consistency with other options,
+ * and to separate it from "mdt-count" when DNE arrives. */
+ { .val = 'c', .name = "count", .has_arg = no_argument },
#endif
- {"stripe-count", no_argument, 0, 'c'},
- {"stripe_count", no_argument, 0, 'c'},
- {"directory", no_argument, 0, 'd'},
- {"default", no_argument, 0, 'D'},
- {"fid", no_argument, 0, 'F'},
- {"generation", no_argument, 0, 'g'},
+ { .val = 'c', .name = "stripe-count", .has_arg = no_argument },
+ { .val = 'c', .name = "stripe_count", .has_arg = no_argument },
+ { .val = 'd', .name = "directory", .has_arg = no_argument },
+ { .val = 'D', .name = "default", .has_arg = no_argument },
+ { .val = 'E', .name = "comp-end", .has_arg = optional_argument },
+ { .val = 'E', .name = "component-end",
+ .has_arg = optional_argument },
+ { .val = 'F', .name = "fid", .has_arg = no_argument },
+ { .val = 'g', .name = "generation", .has_arg = no_argument },
+ /* dirstripe { .val = 'H', .name = "mdt-hash",
+ * .has_arg = required_argument }, */
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "stripe-index", but was explicitly
- * made "stripe-index" for consistency with other options,
- * and to separate it from "mdt-index" when DNE arrives. */
- {"index", no_argument, 0, 'i'},
+ /* This formerly implied "stripe-index", but was explicitly
+ * made "stripe-index" for consistency with other options,
+ * and to separate it from "mdt-index" when DNE arrives. */
+ { .val = 'i', .name = "index", .has_arg = no_argument },
#endif
- {"stripe-index", no_argument, 0, 'i'},
- {"stripe_index", no_argument, 0, 'i'},
- {"layout", no_argument, 0, 'L'},
- {"mdt", no_argument, 0, 'm'},
- {"mdt-index", no_argument, 0, 'm'},
- {"mdt_index", no_argument, 0, 'm'},
+ { .val = 'i', .name = "stripe-index", .has_arg = no_argument },
+ { .val = 'i', .name = "stripe_index", .has_arg = no_argument },
+ { .val = 'I', .name = "comp-id", .has_arg = optional_argument },
+ { .val = 'I', .name = "component-id", .has_arg = optional_argument },
+ { .val = 'L', .name = "layout", .has_arg = no_argument },
+ { .val = 'm', .name = "mdt", .has_arg = no_argument },
+ { .val = 'm', .name = "mdt-index", .has_arg = no_argument },
+ { .val = 'm', .name = "mdt_index", .has_arg = no_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"mdt-index", no_argument, 0, 'M'},
- {"mdt_index", no_argument, 0, 'M'},
+ { .val = 'M', .name = "mdt-index", .has_arg = no_argument },
+ { .val = 'M', .name = "mdt_index", .has_arg = no_argument },
#endif
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "stripe-index", but was confusing
- * with "file offset" (which will eventually be needed for
- * with different layouts by offset), so deprecate it. */
- {"offset", no_argument, 0, 'o'},
+ /* This formerly implied "stripe-index", but was confusing
+ * with "file offset" (which will eventually be needed for
+ * with different layouts by offset), so deprecate it. */
+ { .val = 'o', .name = "offset", .has_arg = no_argument },
#endif
- {"obd", required_argument, 0, 'O'},
- {"ost", required_argument, 0, 'O'},
- {"pool", no_argument, 0, 'p'},
- {"quiet", no_argument, 0, 'q'},
- {"recursive", no_argument, 0, 'r'},
- {"raw", no_argument, 0, 'R'},
+ { .val = 'O', .name = "obd", .has_arg = required_argument },
+ { .val = 'O', .name = "ost", .has_arg = required_argument },
+ { .val = 'p', .name = "pool", .has_arg = no_argument },
+ { .val = 'q', .name = "quiet", .has_arg = no_argument },
+ { .val = 'r', .name = "recursive", .has_arg = no_argument },
+ { .val = 'R', .name = "raw", .has_arg = no_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- /* This formerly implied "--stripe-size", but was confusing
- * with "lfs find --size|-s", which means "file size", so use
- * the consistent "--stripe-size|-S" for all commands. */
- {"size", no_argument, 0, 's'},
+ /* This formerly implied "--stripe-size", but was confusing
+ * with "lfs find --size|-s", which means "file size", so use
+ * the consistent "--stripe-size|-S" for all commands. */
+ { .val = 's', .name = "size", .has_arg = no_argument },
#endif
- {"stripe-size", no_argument, 0, 'S'},
- {"stripe_size", no_argument, 0, 'S'},
- {"verbose", no_argument, 0, 'v'},
- {0, 0, 0, 0}
- };
+ { .val = 'S', .name = "stripe-size", .has_arg = no_argument },
+ { .val = 'S', .name = "stripe_size", .has_arg = no_argument },
+ /* dirstripe { .val = 'T', .name = "mdt-count",
+ * .has_arg = required_argument }, */
+ { .val = 'v', .name = "verbose", .has_arg = no_argument },
+ { .val = 'y', .name = "yaml", .has_arg = no_argument },
+ { .name = NULL } };
int c, rc;
+ char *end, *tmp;
- while ((c = getopt_long(argc, argv, "cdDFghiLmMoO:pqrRsSv",
+ while ((c = getopt_long(argc, argv, "cdDE::FghiI::LmMoO:pqrRsSvy",
long_opts, NULL)) != -1) {
switch (c) {
- case 'O':
- if (param->fp_obd_uuid) {
- fprintf(stderr,
- "error: %s: only one obduuid allowed",
- argv[0]);
- return CMD_HELP;
+ case 'c':
+ if (strcmp(argv[optind - 1], "--count") == 0)
+ fprintf(stderr, "warning: '--count' deprecated,"
+ " use '--stripe-count' instead\n");
+ if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+ param->fp_verbose |= VERBOSE_COUNT;
+ param->fp_max_depth = 0;
}
- param->fp_obd_uuid = (struct obd_uuid *)optarg;
- break;
- case 'q':
- param->fp_quiet++;
break;
- case 'd':
+ case LFS_COMP_COUNT_OPT:
+ param->fp_verbose |= VERBOSE_COMP_COUNT;
param->fp_max_depth = 0;
break;
- case 'D':
- param->fp_get_default_lmv = 1;
+ case LFS_COMP_FLAGS_OPT:
+ if (optarg != NULL) {
+ __u32 *flags = ¶m->fp_comp_flags;
+ rc = comp_str2flags(flags, optarg);
+ if (rc != 0) {
+ fprintf(stderr, "error: %s bad "
+ "component flags '%s'.\n",
+ argv[0], optarg);
+ return CMD_HELP;
+ } else {
+ param->fp_check_comp_flags = 1;
+ param->fp_exclude_comp_flags =
+ comp_flags_is_neg(*flags);
+ comp_flags_clear_neg(flags);
+ }
+ } else {
+ param->fp_verbose |= VERBOSE_COMP_FLAGS;
+ param->fp_max_depth = 0;
+ }
break;
- case 'F':
- if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_DFID;
+ case LFS_COMP_START_OPT:
+ if (optarg != NULL) {
+ tmp = optarg;
+ if (tmp[0] == '+') {
+ param->fp_comp_start_sign = -1;
+ tmp++;
+ } else if (tmp[0] == '-') {
+ param->fp_comp_start_sign = 1;
+ tmp++;
+ }
+ rc = llapi_parse_size(tmp,
+ ¶m->fp_comp_start,
+ ¶m->fp_comp_start_units, 0);
+ if (rc != 0) {
+ fprintf(stderr, "error: %s bad "
+ "component start '%s'.\n",
+ argv[0], tmp);
+ return CMD_HELP;
+ } else {
+ param->fp_check_comp_start = 1;
+ }
+ } else {
+ param->fp_verbose |= VERBOSE_COMP_START;
param->fp_max_depth = 0;
}
break;
- case 'r':
- param->fp_recursive = 1;
+ case 'd':
+ param->fp_max_depth = 0;
break;
- case 'v':
- param->fp_verbose = VERBOSE_DEFAULT | VERBOSE_DETAIL;
+ case 'D':
+ param->fp_get_default_lmv = 1;
+ break;
+ case 'E':
+ if (optarg != NULL) {
+ tmp = optarg;
+ if (tmp[0] == '+') {
+ param->fp_comp_end_sign = -1;
+ tmp++;
+ } else if (tmp[0] == '-') {
+ param->fp_comp_end_sign = 1;
+ tmp++;
+ }
+
+ if (arg_is_eof(tmp)) {
+ param->fp_comp_end = LUSTRE_EOF;
+ param->fp_comp_end_units = 1;
+ rc = 0;
+ } else {
+ rc = llapi_parse_size(tmp,
+ ¶m->fp_comp_end,
+ ¶m->fp_comp_end_units, 0);
+ }
+ if (rc != 0) {
+ fprintf(stderr, "error: %s bad "
+ "component end '%s'.\n",
+ argv[0], tmp);
+ return CMD_HELP;
+ }
+ param->fp_check_comp_end = 1;
+ } else {
+ param->fp_verbose |= VERBOSE_COMP_END;
+ param->fp_max_depth = 0;
+ }
break;
- case 'c':
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
- if (strcmp(argv[optind - 1], "--count") == 0)
- fprintf(stderr, "warning: '--count' deprecated,"
- " use '--stripe-count' instead\n");
-#endif
+ case 'F':
if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_COUNT;
+ param->fp_verbose |= VERBOSE_DFID;
param->fp_max_depth = 0;
}
break;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
- case 's':
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0)
- fprintf(stderr, "warning: '--size|-s' deprecated, "
- "use '--stripe-size|-S' instead\n");
-#endif
-#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */
- case 'S':
+ case 'g':
if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_SIZE;
+ param->fp_verbose |= VERBOSE_GENERATION;
param->fp_max_depth = 0;
}
break;
param->fp_max_depth = 0;
}
break;
- case 'p':
- if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_POOL;
- param->fp_max_depth = 0;
- }
- break;
- case 'g':
- if (!(param->fp_verbose & VERBOSE_DETAIL)) {
- param->fp_verbose |= VERBOSE_GENERATION;
+ case 'I':
+ if (optarg != NULL) {
+ param->fp_comp_id = strtoul(optarg, &end, 0);
+ if (*end != '\0' || param->fp_comp_id == 0 ||
+ param->fp_comp_id > LCME_ID_MAX) {
+ fprintf(stderr, "error: %s bad "
+ "component id '%s'\n",
+ argv[0], optarg);
+ return CMD_HELP;
+ } else {
+ param->fp_check_comp_id = 1;
+ }
+ } else {
param->fp_max_depth = 0;
+ param->fp_verbose |= VERBOSE_COMP_ID;
}
break;
case 'L':
param->fp_max_depth = 0;
param->fp_verbose |= VERBOSE_MDTINDEX;
break;
+ case 'O':
+ if (param->fp_obd_uuid) {
+ fprintf(stderr,
+ "error: %s: only one obduuid allowed",
+ argv[0]);
+ return CMD_HELP;
+ }
+ param->fp_obd_uuid = (struct obd_uuid *)optarg;
+ break;
+ case 'p':
+ if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+ param->fp_verbose |= VERBOSE_POOL;
+ param->fp_max_depth = 0;
+ }
+ break;
+ case 'q':
+ param->fp_quiet++;
+ break;
+ case 'r':
+ param->fp_recursive = 1;
+ break;
case 'R':
param->fp_raw = 1;
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0)
+ case 's':
+ fprintf(stderr, "warning: '--size|-s' deprecated, "
+ "use '--stripe-size|-S' instead\n");
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 59, 0) */
+ case 'S':
+ if (!(param->fp_verbose & VERBOSE_DETAIL)) {
+ param->fp_verbose |= VERBOSE_SIZE;
+ param->fp_max_depth = 0;
+ }
+ break;
+ case 'v':
+ param->fp_verbose = VERBOSE_DEFAULT | VERBOSE_DETAIL;
+ break;
+ case 'y':
+ param->fp_yaml = 1;
+ break;
default:
return CMD_HELP;
}
if (param->fp_recursive)
param->fp_max_depth = -1;
+ else if (param->fp_verbose & VERBOSE_DETAIL)
+ param->fp_max_depth = 1;
if (!param->fp_verbose)
param->fp_verbose = VERBOSE_DEFAULT;
{
struct find_param param = { 0 };
struct option long_opts[] = {
- {"mdt-count", no_argument, 0, 'c'},
- {"mdt-index", no_argument, 0, 'i'},
- {"recursive", no_argument, 0, 'r'},
- {"mdt-hash", no_argument, 0, 't'},
- {"default", no_argument, 0, 'D'},
- {"obd", required_argument, 0, 'O'},
- {0, 0, 0, 0}
- };
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+ { .val = 'c', .name = "mdt-count", .has_arg = no_argument },
+#endif
+ { .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 = 'O', .name = "obd", .has_arg = required_argument },
+ { .val = 'r', .name = "recursive", .has_arg = no_argument },
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
+ { .val = 't', .name = "mdt-hash", .has_arg = no_argument },
+#endif
+ { .val = 'T', .name = "mdt-count", .has_arg = no_argument },
+ { .val = 'y', .name = "yaml", .has_arg = no_argument },
+ { .name = NULL } };
int c, rc;
param.fp_get_lmv = 1;
- while ((c = getopt_long(argc, argv, "cirtDO:", long_opts, NULL)) != -1)
+ while ((c = getopt_long(argc, argv,
+ "cDHiO:rtTy", long_opts, NULL)) != -1)
{
switch (c) {
case 'O':
}
param.fp_obd_uuid = (struct obd_uuid *)optarg;
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 'c':
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 10, 50, 0)
+ fprintf(stderr, "warning: '-c' deprecated"
+ ", use '-T' instead\n");
+#endif
+#endif
+ case 'T':
param.fp_verbose |= VERBOSE_COUNT;
break;
case 'i':
param.fp_verbose |= VERBOSE_OFFSET;
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 't':
+#endif
+ case 'H':
param.fp_verbose |= VERBOSE_HASH_TYPE;
break;
case 'D':
case 'r':
param.fp_recursive = 1;
break;
+ case 'y':
+ param.fp_yaml = 1;
+ break;
default:
return CMD_HELP;
}
struct option long_opts[] = {
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"count", required_argument, 0, 'c'},
+ { .val = 'c', .name = "count", .has_arg = required_argument },
#endif
- {"mdt-count", required_argument, 0, 'c'},
- {"delete", no_argument, 0, 'd'},
+ { .val = 'c', .name = "mdt-count", .has_arg = required_argument },
+ { .val = 'd', .name = "delete", .has_arg = no_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"index", required_argument, 0, 'i'},
+ { .val = 'i', .name = "index", .has_arg = required_argument },
#endif
- {"mdt-index", required_argument, 0, 'i'},
- {"mode", required_argument, 0, 'm'},
+ { .val = 'i', .name = "mdt-index", .has_arg = required_argument },
+ { .val = 'm', .name = "mode", .has_arg = required_argument },
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"hash-type", required_argument, 0, 't'},
+ { .val = 't', .name = "hash-type", .has_arg = required_argument },
+ { .val = 't', .name = "mdt-hash", .has_arg = required_argument },
#endif
- {"mdt-hash", required_argument, 0, 't'},
+ {"mdt-hash", required_argument, 0, 'H'},
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- {"default_stripe", no_argument, 0, 'D'},
+ { .val = 'D', .name = "default_stripe",
+ .has_arg = no_argument },
#endif
- {"default", no_argument, 0, 'D'},
- {0, 0, 0, 0}
- };
+ { .val = 'D', .name = "default", .has_arg = no_argument },
+ { .name = NULL } };
- while ((c = getopt_long(argc, argv, "c:dDi:m:t:", long_opts,
+ while ((c = getopt_long(argc, argv, "c:dDi:H:m:t:", long_opts,
NULL)) >= 0) {
switch (c) {
case 0:
case 'c':
#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0)
if (strcmp(argv[optind - 1], "--count") == 0)
- fprintf(stderr, "warning: '--count' deprecated"
- ", use '--mdt-count' instead\n");
+ fprintf(stderr,
+ "%s %s: warning: '--count' deprecated, use '--mdt-count' instead\n",
+ progname, argv[0]);
#endif
stripe_count_opt = optarg;
break;
case 'i':
#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0)
if (strcmp(argv[optind - 1], "--index") == 0)
- fprintf(stderr, "warning: '--index' deprecated"
- ", use '--mdt-index' instead\n");
+ fprintf(stderr,
+ "%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
+ progname, argv[0]);
#endif
stripe_offset_opt = optarg;
break;
case 'm':
mode_opt = optarg;
break;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
case 't':
+#endif
+ case 'H':
#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 11, 53, 0)
if (strcmp(argv[optind - 1], "--hash-type") == 0)
- fprintf(stderr, "warning: '--hash-type' "
- "deprecated, use '--mdt-hash' "
- "instead\n");
+ fprintf(stderr,
+ "%s %s: warning: '--hash-type' deprecated, use '--mdt-hash' instead\n",
+ progname, argv[0]);
#endif
stripe_hash_opt = optarg;
break;
default:
- fprintf(stderr, "error: %s: option '%s' "
- "unrecognized\n",
- argv[0], argv[optind - 1]);
+ fprintf(stderr, "%s %s: unrecognized option '%s'\n",
+ progname, argv[0], argv[optind - 1]);
return CMD_HELP;
}
}
if (optind == argc) {
- fprintf(stderr, "error: %s: missing dirname\n",
- argv[0]);
+ fprintf(stderr, "%s %s: DIR must be specified\n",
+ progname, argv[0]);
return CMD_HELP;
}
if (!delete && stripe_offset_opt == NULL && stripe_count_opt == NULL) {
- fprintf(stderr, "error: %s: missing stripe offset and count.\n",
- argv[0]);
+ fprintf(stderr,
+ "%s %s: stripe offset and count must be specified\n",
+ progname, argv[0]);
return CMD_HELP;
}
/* get the stripe offset */
stripe_offset = strtoul(stripe_offset_opt, &end, 0);
if (*end != '\0') {
- fprintf(stderr, "error: %s: bad stripe offset '%s'\n",
- argv[0], stripe_offset_opt);
+ fprintf(stderr,
+ "%s %s: bad stripe offset '%s'\n",
+ progname, argv[0], stripe_offset_opt);
return CMD_HELP;
}
}
if (delete) {
if (stripe_offset_opt != NULL || stripe_count_opt != NULL) {
- fprintf(stderr, "error: %s: cannot specify -d with -s,"
- " or -i options.\n", argv[0]);
+ fprintf(stderr,
+ "%s %s: cannot specify -d with -c or -i options\n",
+ progname, argv[0]);
return CMD_HELP;
} else {
stripe_count = 0;
if (mode_opt != NULL) {
mode = strtoul(mode_opt, &end, 8);
if (*end != '\0') {
- fprintf(stderr, "error: %s: bad mode '%s'\n",
- argv[0], mode_opt);
+ fprintf(stderr,
+ "%s %s: bad MODE '%s'\n",
+ progname, argv[0], mode_opt);
return CMD_HELP;
}
previous_mode = umask(0);
if (stripe_hash_opt == NULL) {
hash_type = LMV_HASH_TYPE_FNV_1A_64;
} else {
- int i;
-
- for (i = LMV_HASH_TYPE_ALL_CHARS; i < LMV_HASH_TYPE_MAX; i++)
- if (strcmp(stripe_hash_opt, mdt_hash_name[i]) == 0)
- break;
-
- if (i == LMV_HASH_TYPE_MAX) {
- fprintf(stderr,
- "error: %s: bad stripe hash type '%s'\n",
- argv[0], stripe_hash_opt);
+ hash_type = check_hashtype(stripe_hash_opt);
+ if (hash_type == 0) {
+ fprintf(stderr, "%s %s: bad stripe hash type '%s'\n",
+ progname, argv[0], stripe_hash_opt);
return CMD_HELP;
}
-
- hash_type = i;
}
/* get the stripe count */
if (stripe_count_opt != NULL) {
stripe_count = strtoul(stripe_count_opt, &end, 0);
if (*end != '\0') {
- fprintf(stderr, "error: %s: bad stripe count '%s'\n",
- argv[0], stripe_count_opt);
+ fprintf(stderr,
+ "%s %s: bad stripe count '%s'\n",
+ progname, argv[0], stripe_count_opt);
return CMD_HELP;
}
}
}
if (result) {
- fprintf(stderr, "error: %s: create stripe dir '%s' "
- "failed\n", argv[0], dname);
+ fprintf(stderr,
+ "%s setdirstripe: cannot create stripe dir '%s': %s\n",
+ progname, dname, strerror(-result));
break;
}
dname = argv[++optind];
int c;
int rc = 0;
struct option long_opts[] = {
- {"mdt-index", required_argument, 0, 'M'},
- {"verbose", no_argument, 0, 'v'},
- {0, 0, 0, 0}
- };
+ { .val = 'M', .name = "mdt-index", .has_arg = required_argument },
+ { .val = 'v', .name = "verbose", .has_arg = no_argument },
+ { .name = NULL } };
while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) {
switch (c) {
snprintf(abuf, sizeof(tbuf), CDF, avail);
}
- sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
- printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
- uuid, tbuf, ubuf, abuf, rbuf, mntdir);
- if (type)
- printf("[%s:%d]\n", type, index);
- else
- printf("\n");
-
- break;
- case -ENODATA:
- printf(UUF": inactive device\n", uuid);
- break;
- default:
- printf(UUF": %s\n", uuid, strerror(-rc));
- break;
- }
+ sprintf(rbuf, RDF, (int)(ratio * 100 + 0.5));
+ printf(UUF" "CSF" "CSF" "CSF" "RSF" %-s",
+ uuid, tbuf, ubuf, abuf, rbuf, mntdir);
+ if (type)
+ printf("[%s:%d]", type, index);
+
+ if (stat->os_state) {
+ /*
+ * Each character represents the matching
+ * OS_STATE_* bit.
+ */
+ const char state_names[] = "DRSI";
+ __u32 state;
+ __u32 i;
+
+ printf(" ");
+ for (i = 0, state = stat->os_state;
+ state && i < sizeof(state_names); i++) {
+ if (!(state & (1 << i)))
+ continue;
+ printf("%c", state_names[i]);
+ state ^= 1 << i;
+ }
+ }
- return 0;
+ printf("\n");
+ break;
+ case -ENODATA:
+ printf(UUF": inactive device\n", uuid);
+ break;
+ default:
+ printf(UUF": %s\n", uuid, strerror(-rc));
+ break;
+ }
+
+ return 0;
}
struct ll_stat_type {
struct obd_statfs stat_buf, sum = { .os_bsize = 1 };
struct obd_uuid uuid_buf;
char *poolname = NULL;
- struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" },
- { LL_STATFS_LOV, "OST" },
- { 0, NULL } };
+ struct ll_stat_type types[] = {
+ { .st_op = LL_STATFS_LMV, .st_name = "MDT" },
+ { .st_op = LL_STATFS_LOV, .st_name = "OST" },
+ { .st_name = NULL } };
struct ll_stat_type *tp;
__u64 ost_ffree = 0;
__u32 index;
int c, rc = 0, index = 0;
char fsname[PATH_MAX] = "", *pool_name = NULL;
struct option long_opts[] = {
- {"human-readable", 0, 0, 'h'},
- {"inodes", 0, 0, 'i'},
- {"lazy", 0, 0, 'l'},
- {"pool", required_argument, 0, 'p'},
- {"verbose", 0, 0, 'v'},
- {0, 0, 0, 0}
- };
+ { .val = 'h', .name = "human-readable",
+ .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) {
switch (c) {
struct obd_dqblk *dqb = &qctl.qc_dqblk;
struct obd_dqinfo *dqi = &qctl.qc_dqinfo;
struct option long_opts[] = {
- {"block-grace", required_argument, 0, 'b'},
- {"group", no_argument, 0, 'g'},
- {"inode-grace", required_argument, 0, 'i'},
- {"times", no_argument, 0, 't'},
- {"user", no_argument, 0, 'u'},
- {0, 0, 0, 0}
- };
-
- memset(&qctl, 0, sizeof(qctl));
- qctl.qc_cmd = LUSTRE_Q_SETINFO;
- qctl.qc_type = UGQUOTA;
-
- while ((c = getopt_long(argc, argv, "b:gi:tu", long_opts, NULL)) != -1) {
- switch (c) {
- case 'u':
- case 'g':
- if (qctl.qc_type != UGQUOTA) {
- fprintf(stderr, "error: -u and -g can't be used "
+ { .val = 'b', .name = "block-grace", .has_arg = required_argument },
+ { .val = 'g', .name = "group", .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 },
+ { .val = 'u', .name = "user", .has_arg = no_argument },
+ { .name = NULL } };
+ int qtype;
+
+ memset(&qctl, 0, sizeof(qctl));
+ qctl.qc_cmd = LUSTRE_Q_SETINFO;
+ qctl.qc_type = ALLQUOTA;
+
+ while ((c = getopt_long(argc, argv, "b:gi:ptu",
+ long_opts, NULL)) != -1) {
+ switch (c) {
+ case 'u':
+ qtype = USRQUOTA;
+ goto quota_type;
+ case 'g':
+ qtype = GRPQUOTA;
+ goto quota_type;
+ case 'p':
+ qtype = PRJQUOTA;
+quota_type:
+ if (qctl.qc_type != ALLQUOTA) {
+ fprintf(stderr, "error: -u/g/p can't be used "
"more than once\n");
- return CMD_HELP;
- }
- qctl.qc_type = (c == 'u') ? USRQUOTA : GRPQUOTA;
- break;
+ return CMD_HELP;
+ }
+ qctl.qc_type = qtype;
+ break;
case 'b':
if ((dqi->dqi_bgrace = str2sec(optarg)) == ULONG_MAX) {
fprintf(stderr, "error: bad block-grace: %s\n",
}
}
- if (qctl.qc_type == UGQUOTA) {
- fprintf(stderr, "error: neither -u nor -g specified\n");
+ if (qctl.qc_type == ALLQUOTA) {
+ fprintf(stderr, "error: neither -u, -g nor -p specified\n");
return CMD_HELP;
}
char *mnt, *obd_type = (char *)qctl.obd_type;
struct obd_dqblk *dqb = &qctl.qc_dqblk;
struct option long_opts[] = {
- {"block-softlimit", required_argument, 0, 'b'},
- {"block-hardlimit", required_argument, 0, 'B'},
- {"group", required_argument, 0, 'g'},
- {"inode-softlimit", required_argument, 0, 'i'},
- {"inode-hardlimit", required_argument, 0, 'I'},
- {"user", required_argument, 0, 'u'},
- {0, 0, 0, 0}
- };
+ { .val = 'b', .name = "block-softlimit",
+ .has_arg = required_argument },
+ { .val = 'B', .name = "block-hardlimit",
+ .has_arg = required_argument },
+ { .val = 'g', .name = "group", .has_arg = required_argument },
+ { .val = 'i', .name = "inode-softlimit",
+ .has_arg = required_argument },
+ { .val = 'I', .name = "inode-hardlimit",
+ .has_arg = required_argument },
+ { .val = 'p', .name = "projid", .has_arg = required_argument },
+ { .val = 'u', .name = "user", .has_arg = required_argument },
+ { .name = NULL } };
unsigned limit_mask = 0;
char *endptr;
+ int qtype;
- if (has_times_option(argc, argv))
- return lfs_setquota_times(argc, argv);
+ if (has_times_option(argc, argv))
+ return lfs_setquota_times(argc, argv);
- memset(&qctl, 0, sizeof(qctl));
- qctl.qc_cmd = LUSTRE_Q_SETQUOTA;
- qctl.qc_type = UGQUOTA; /* UGQUOTA makes no sense for setquota,
- * so it can be used as a marker that qc_type
- * isn't reinitialized from command line */
+ memset(&qctl, 0, sizeof(qctl));
+ qctl.qc_cmd = LUSTRE_Q_SETQUOTA;
+ qctl.qc_type = ALLQUOTA; /* ALLQUOTA makes no sense for setquota,
+ * so it can be used as a marker that qc_type
+ * isn't reinitialized from command line */
- while ((c = getopt_long(argc, argv, "b:B:g:i:I:u:", long_opts, NULL)) != -1) {
- switch (c) {
- case 'u':
+ while ((c = getopt_long(argc, argv, "b:B:g:i:I:p:u:",
+ long_opts, NULL)) != -1) {
+ switch (c) {
+ case 'u':
+ qtype = USRQUOTA;
+ rc = name2uid(&qctl.qc_id, optarg);
+ goto quota_type;
case 'g':
- if (qctl.qc_type != UGQUOTA) {
- fprintf(stderr, "error: -u and -g can't be used"
- " more than once\n");
- return CMD_HELP;
- }
- qctl.qc_type = (c == 'u') ? USRQUOTA : GRPQUOTA;
- rc = name2id(&qctl.qc_id, optarg,
- (qctl.qc_type == USRQUOTA) ? USER : GROUP);
- if (rc) {
- qctl.qc_id = strtoul(optarg, &endptr, 10);
- if (*endptr != '\0') {
- fprintf(stderr, "error: can't find id "
- "for name %s\n", optarg);
- return CMD_HELP;
- }
+ qtype = GRPQUOTA;
+ rc = name2gid(&qctl.qc_id, optarg);
+ goto quota_type;
+ case 'p':
+ qtype = PRJQUOTA;
+ rc = name2projid(&qctl.qc_id, optarg);
+quota_type:
+ if (qctl.qc_type != ALLQUOTA) {
+ fprintf(stderr, "error: -u and -g can't be used"
+ " more than once\n");
+ return CMD_HELP;
}
- break;
+ qctl.qc_type = qtype;
+ if (rc) {
+ qctl.qc_id = strtoul(optarg, &endptr, 10);
+ if (*endptr != '\0') {
+ fprintf(stderr, "error: can't find id "
+ "for name %s\n", optarg);
+ return CMD_HELP;
+ }
+ }
+ break;
case 'b':
- ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
- dqb->dqb_bsoftlimit >>= 10;
- limit_mask |= BSLIMIT;
+ ARG2ULL(dqb->dqb_bsoftlimit, optarg, 1024);
+ dqb->dqb_bsoftlimit >>= 10;
+ limit_mask |= BSLIMIT;
if (dqb->dqb_bsoftlimit &&
dqb->dqb_bsoftlimit <= 1024) /* <= 1M? */
fprintf(stderr, "warning: block softlimit is "
"Lustre manual for details.\n");
break;
default: /* getopt prints error message for us when opterr != 0 */
- return CMD_HELP;
- }
- }
+ return CMD_HELP;
+ }
+ }
- if (qctl.qc_type == UGQUOTA) {
- fprintf(stderr, "error: neither -u nor -g was specified\n");
- return CMD_HELP;
- }
+ if (qctl.qc_type == ALLQUOTA) {
+ fprintf(stderr, "error: neither -u, -g nor -p was specified\n");
+ return CMD_HELP;
+ }
if (limit_mask == 0) {
fprintf(stderr, "error: at least one limit must be specified\n");
return 0;
}
-static inline char *type2name(int check_type)
-{
- if (check_type == USRQUOTA)
- return "user";
- else if (check_type == GRPQUOTA)
- return "group";
- else
- return "unknown";
-}
-
/* Converts seconds value into format string
* result is returned in buf
* Notes:
bool human_readable)
{
printf("Disk quotas for %s %s (%cid %u):\n",
- type2name(qctl->qc_type), name,
- *type2name(qctl->qc_type), qctl->qc_id);
+ qtype_name(qctl->qc_type), name,
+ *qtype_name(qctl->qc_type), qctl->qc_id);
printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n",
"Filesystem", human_readable ? "used" : "kbytes",
"quota", "limit", "grace",
qctl->qc_valid = is_mdt ? QC_MDTIDX : QC_OSTIDX;
rc = llapi_quotactl(mnt, qctl);
if (rc) {
- /* It is remote client case. */
- if (-rc == EOPNOTSUPP) {
+ /* It is remote client case. */
+ if (rc == -EOPNOTSUPP) {
rc = 0;
goto out;
}
int c;
char *mnt, *name = NULL;
struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA,
- .qc_type = UGQUOTA };
+ .qc_type = ALLQUOTA };
char *obd_type = (char *)qctl.obd_type;
char *obd_uuid = (char *)qctl.obd_uuid.uuid;
- int rc, rc1 = 0, rc2 = 0, rc3 = 0,
+ int rc = 0, rc1 = 0, rc2 = 0, rc3 = 0,
verbose = 0, pass = 0, quiet = 0, inacc;
char *endptr;
__u32 valid = QC_GENERAL, idx = 0;
__u64 total_ialloc = 0, total_balloc = 0;
bool human_readable = false;
+ int qtype;
- while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) {
- switch (c) {
- case 'u':
- if (qctl.qc_type != UGQUOTA) {
- fprintf(stderr, "error: use either -u or -g\n");
- return CMD_HELP;
- }
- qctl.qc_type = USRQUOTA;
- break;
- case 'g':
- if (qctl.qc_type != UGQUOTA) {
- fprintf(stderr, "error: use either -u or -g\n");
- return CMD_HELP;
- }
- qctl.qc_type = GRPQUOTA;
- break;
+ while ((c = getopt(argc, argv, "gi:I:o:pqtuvh")) != -1) {
+ switch (c) {
+ case 'u':
+ qtype = USRQUOTA;
+ goto quota_type;
+ case 'g':
+ qtype = GRPQUOTA;
+ goto quota_type;
+ case 'p':
+ qtype = PRJQUOTA;
+quota_type:
+ if (qctl.qc_type != ALLQUOTA) {
+ fprintf(stderr, "error: use either -u or -g\n");
+ return CMD_HELP;
+ }
+ qctl.qc_type = qtype;
+ break;
case 't':
qctl.qc_cmd = LUSTRE_Q_GETINFO;
break;
}
/* current uid/gid info for "lfs quota /path/to/lustre/mount" */
- if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == UGQUOTA &&
- optind == argc - 1) {
-ug_output:
- memset(&qctl, 0, sizeof(qctl)); /* spoiled by print_*_quota */
- qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
- qctl.qc_valid = valid;
- qctl.qc_idx = idx;
- if (pass++ == 0) {
- qctl.qc_type = USRQUOTA;
- qctl.qc_id = geteuid();
- } else {
- qctl.qc_type = GRPQUOTA;
- qctl.qc_id = getegid();
- }
- rc = id2name(&name, qctl.qc_id,
- (qctl.qc_type == USRQUOTA) ? USER : GROUP);
- if (rc)
- name = "<unknown>";
- /* lfs quota -u username /path/to/lustre/mount */
- } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
- /* options should be followed by u/g-name and mntpoint */
- if (optind + 2 != argc || qctl.qc_type == UGQUOTA) {
- fprintf(stderr, "error: missing quota argument(s)\n");
- return CMD_HELP;
- }
-
- name = argv[optind++];
- rc = name2id(&qctl.qc_id, name,
- (qctl.qc_type == USRQUOTA) ? USER : GROUP);
- if (rc) {
- qctl.qc_id = strtoul(name, &endptr, 10);
- if (*endptr != '\0') {
- fprintf(stderr, "error: can't find id for name "
- "%s\n", name);
- return CMD_HELP;
- }
- }
- } else if (optind + 1 != argc || qctl.qc_type == UGQUOTA) {
- fprintf(stderr, "error: missing quota info argument(s)\n");
- return CMD_HELP;
- }
+ if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && qctl.qc_type == ALLQUOTA &&
+ optind == argc - 1) {
+all_output:
+ memset(&qctl, 0, sizeof(qctl)); /* spoiled by print_*_quota */
+ qctl.qc_cmd = LUSTRE_Q_GETQUOTA;
+ qctl.qc_valid = valid;
+ qctl.qc_idx = idx;
+ qctl.qc_type = pass;
+ switch (qctl.qc_type) {
+ case USRQUOTA:
+ qctl.qc_id = geteuid();
+ rc = uid2name(&name, qctl.qc_id);
+ break;
+ case GRPQUOTA:
+ qctl.qc_id = getegid();
+ rc = gid2name(&name, qctl.qc_id);
+ break;
+ default:
+ rc = -ENOTSUP;
+ break;
+ }
+ if (rc)
+ name = "<unknown>";
+ pass++;
+ /* lfs quota -u username /path/to/lustre/mount */
+ } else if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) {
+ /* options should be followed by u/g-name and mntpoint */
+ if (optind + 2 != argc || qctl.qc_type == ALLQUOTA) {
+ fprintf(stderr, "error: missing quota argument(s)\n");
+ return CMD_HELP;
+ }
- mnt = argv[optind];
+ name = argv[optind++];
+ switch (qctl.qc_type) {
+ case USRQUOTA:
+ rc = name2uid(&qctl.qc_id, name);
+ break;
+ case GRPQUOTA:
+ rc = name2gid(&qctl.qc_id, name);
+ break;
+ case PRJQUOTA:
+ rc = name2projid(&qctl.qc_id, name);
+ break;
+ default:
+ rc = -ENOTSUP;
+ break;
+ }
+ if (rc) {
+ qctl.qc_id = strtoul(name, &endptr, 10);
+ if (*endptr != '\0') {
+ fprintf(stderr, "error: can't find id for name: %s\n",
+ name);
+ return CMD_HELP;
+ }
+ }
+ } else if (optind + 1 != argc || qctl.qc_type == ALLQUOTA) {
+ fprintf(stderr, "error: missing quota info argument(s)\n");
+ return CMD_HELP;
+ }
- rc1 = llapi_quotactl(mnt, &qctl);
+ mnt = argv[optind];
+ rc1 = llapi_quotactl(mnt, &qctl);
if (rc1 < 0) {
switch (rc1) {
case -ESRCH:
fprintf(stderr, "%s quotas are not enabled.\n",
- qctl.qc_type == USRQUOTA ? "user" : "group");
+ qtype_name(qctl.qc_type));
goto out;
case -EPERM:
fprintf(stderr, "Permission denied.\n");
strbuf);
}
- if (rc1 || rc2 || rc3 || inacc)
- printf("Some errors happened when getting quota info. "
- "Some devices may be not working or deactivated. "
- "The data in \"[]\" is inaccurate.\n");
+ if (rc1 || rc2 || rc3 || inacc)
+ printf("Some errors happened when getting quota info. "
+ "Some devices may be not working or deactivated. "
+ "The data in \"[]\" is inaccurate.\n");
out:
- if (pass == 1)
- goto ug_output;
+ if (pass > 0 && pass < LL_MAXQUOTAS)
+ goto all_output;
- return rc1;
+ return rc1;
}
#endif /* HAVE_SYS_QUOTA_H! */
static int lfs_changelog(int argc, char **argv)
{
- void *changelog_priv;
+ void *changelog_priv;
struct changelog_rec *rec;
- long long startrec = 0, endrec = 0;
- char *mdd;
- struct option long_opts[] = {
- {"follow", no_argument, 0, 'f'},
- {0, 0, 0, 0}
- };
- char short_opts[] = "f";
- int rc, follow = 0;
-
- while ((rc = getopt_long(argc, argv, short_opts,
- long_opts, NULL)) != -1) {
+ long long startrec = 0, endrec = 0;
+ char *mdd;
+ struct option long_opts[] = {
+ { .val = 'f', .name = "follow", .has_arg = no_argument },
+ { .name = NULL } };
+ char short_opts[] = "f";
+ int rc, follow = 0;
+
+ while ((rc = getopt_long(argc, argv, short_opts,
+ long_opts, NULL)) != -1) {
switch (rc) {
case 'f':
follow++;
return rc;
}
- while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) {
- time_t secs;
- struct tm ts;
+ while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) {
+ time_t secs;
+ struct tm ts;
- if (endrec && rec->cr_index > endrec) {
- llapi_changelog_free(&rec);
- break;
- }
- if (rec->cr_index < startrec) {
- llapi_changelog_free(&rec);
- continue;
- }
+ if (endrec && rec->cr_index > endrec) {
+ llapi_changelog_free(&rec);
+ break;
+ }
+ if (rec->cr_index < startrec) {
+ llapi_changelog_free(&rec);
+ continue;
+ }
secs = rec->cr_time >> 30;
gmtime_r(&secs, &ts);
- printf("%ju %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d "
- "0x%x t="DFID, (uintmax_t) rec->cr_index, rec->cr_type,
+ printf("%ju %02d%-5s %02d:%02d:%02d.%09d %04d.%02d.%02d "
+ "0x%x t="DFID, (uintmax_t)rec->cr_index, rec->cr_type,
changelog_type2str(rec->cr_type),
ts.tm_hour, ts.tm_min, ts.tm_sec,
- (int)(rec->cr_time & ((1<<30) - 1)),
+ (int)(rec->cr_time & ((1 << 30) - 1)),
ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday,
rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid));
static int lfs_fid2path(int argc, char **argv)
{
- struct option long_opts[] = {
- {"cur", no_argument, 0, 'c'},
- {"link", required_argument, 0, 'l'},
- {"rec", required_argument, 0, 'r'},
- {0, 0, 0, 0}
- };
- char short_opts[] = "cl:r:";
- char *device, *fid, *path;
- long long recno = -1;
- int linkno = -1;
- int lnktmp;
- int printcur = 0;
+ struct option long_opts[] = {
+ { .val = 'c', .name = "cur", .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 *device, *fid, *path;
+ long long recno = -1;
+ int linkno = -1;
+ int lnktmp;
+ int printcur = 0;
int rc = 0;
- while ((rc = getopt_long(argc, argv, short_opts,
- long_opts, NULL)) != -1) {
+ while ((rc = getopt_long(argc, argv, short_opts,
+ long_opts, NULL)) != -1) {
switch (rc) {
case 'c':
printcur++;
static int lfs_path2fid(int argc, char **argv)
{
- struct option long_opts[] = {
- {"parents", no_argument, 0, 'p'},
- {0, 0, 0, 0}
- };
+ struct option long_opts[] = {
+ { .val = 'p', .name = "parents", .has_arg = no_argument },
+ { .name = NULL } };
char **path;
const char short_opts[] = "p";
const char *sep = "";
static int lfs_hsm_change_flags(int argc, char **argv, int mode)
{
struct option long_opts[] = {
- {"lost", 0, 0, 'l'},
- {"norelease", 0, 0, 'r'},
- {"noarchive", 0, 0, 'a'},
- {"archived", 0, 0, 'A'},
- {"dirty", 0, 0, 'd'},
- {"exists", 0, 0, 'e'},
- {0, 0, 0, 0}
- };
+ { .val = 'A', .name = "archived", .has_arg = no_argument },
+ { .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 = 'l', .name = "lost", .has_arg = no_argument },
+ { .val = 'r', .name = "norelease", .has_arg = no_argument },
+ { .name = NULL } };
char short_opts[] = "lraAde";
__u64 mask = 0;
int c, rc;
static int lfs_hsm_request(int argc, char **argv, int action)
{
- struct option long_opts[] = {
- {"filelist", 1, 0, 'l'},
- {"data", 1, 0, 'D'},
- {"archive", 1, 0, 'a'},
- {"mntpath", 1, 0, 'm'},
- {0, 0, 0, 0}
- };
+ struct option long_opts[] = {
+ { .val = 'a', .name = "archive", .has_arg = required_argument },
+ { .val = 'D', .name = "data", .has_arg = required_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;
static const char *const ladvise_names[] = LU_LADVISE_NAMES;
+static const char *const lock_mode_names[] = LOCK_MODE_NAMES;
+
+static const char *const lockahead_results[] = {
+ [LLA_RESULT_SENT] = "Lock request sent",
+ [LLA_RESULT_DIFFERENT] = "Different matching lock found",
+ [LLA_RESULT_SAME] = "Matching lock on identical extent found",
+};
+
+int lfs_get_mode(const char *string)
+{
+ enum lock_mode_user mode;
+
+ 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)
+ return mode;
+ }
+
+ return -EINVAL;
+}
+
static enum lu_ladvise_type lfs_get_ladvice(const char *string)
{
enum lu_ladvise_type advice;
static int lfs_ladvise(int argc, char **argv)
{
- struct option long_opts[] = {
- {"advice", required_argument, 0, 'a'},
- {"background", no_argument, 0, 'b'},
- {"end", required_argument, 0, 'e'},
- {"start", required_argument, 0, 's'},
- {"length", required_argument, 0, 'l'},
- {0, 0, 0, 0}
- };
- char short_opts[] = "a:be:l:s:";
+ struct option long_opts[] = {
+ { .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 = '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;
unsigned long long length = 0;
unsigned long long size_units;
unsigned long long flags = 0;
+ int mode = 0;
optind = 0;
while ((c = getopt_long(argc, argv, short_opts,
case 'b':
flags |= LF_ASYNC;
break;
+ case 'u':
+ flags |= LF_UNSET;
+ break;
case 'e':
size_units = 1;
rc = llapi_parse_size(optarg, &end,
return CMD_HELP;
}
break;
+ case 'm':
+ mode = lfs_get_mode(optarg);
+ if (mode < 0) {
+ fprintf(stderr, "%s: bad mode '%s', valid "
+ "modes are READ or WRITE\n",
+ argv[0], optarg);
+ return CMD_HELP;
+ }
+ break;
case '?':
return CMD_HELP;
default:
return CMD_HELP;
}
+ if (advice_type == LU_LADVISE_LOCKNOEXPAND) {
+ fprintf(stderr, "%s: Lock no expand advice is a per file "
+ "descriptor advice, so when called from lfs, "
+ "it does nothing.\n", argv[0]);
+ return CMD_HELP;
+ }
+
if (argc <= optind) {
fprintf(stderr, "%s: please give one or more file names\n",
argv[0]);
return CMD_HELP;
}
+ if (advice_type != LU_LADVISE_LOCKAHEAD && mode != 0) {
+ fprintf(stderr, "%s: mode is only valid with lockahead\n",
+ argv[0]);
+ return CMD_HELP;
+ }
+
+ if (advice_type == LU_LADVISE_LOCKAHEAD && mode == 0) {
+ fprintf(stderr, "%s: mode is required with lockahead\n",
+ argv[0]);
+ return CMD_HELP;
+ }
+
while (optind < argc) {
int rc2;
advice.lla_value2 = 0;
advice.lla_value3 = 0;
advice.lla_value4 = 0;
+ if (advice_type == LU_LADVISE_LOCKAHEAD) {
+ advice.lla_lockahead_mode = mode;
+ advice.lla_peradvice_flags = flags;
+ }
+
rc2 = llapi_ladvise(fd, flags, 1, &advice);
close(fd);
if (rc2 < 0) {
"'%s': %s\n", argv[0],
ladvise_names[advice_type],
path, strerror(errno));
+
+ goto next;
}
+
next:
if (rc == 0 && rc2 < 0)
rc = rc2;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff