X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flfs.c;h=47860f7ac9a1ebfe87bff72e2f80108bd2376afa;hp=0cfe790697860ae1dbdb4642c14dd2f581632076;hb=a1307d41a3a6682f60c91df4b581f21fb2980265;hpb=3439adf093ef8d36ae7f95687c92ad1d436329c8 diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 0cfe790..47860f7 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -51,8 +51,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -63,18 +65,10 @@ # include #endif -/* For dirname() */ -#include - -#include - -#include -#include - +#include #include -#include -#include -#include "obdctl.h" +#include +#include /* all functions */ static int lfs_setstripe(int argc, char **argv); @@ -119,6 +113,7 @@ static int lfs_hsm_release(int argc, char **argv); static int lfs_hsm_remove(int argc, char **argv); static int lfs_hsm_cancel(int argc, char **argv); static int lfs_swap_layouts(int argc, char **argv); +static int lfs_mv(int argc, char **argv); #define SETSTRIPE_USAGE(_cmd, _tgt) \ "usage: "_cmd" [--stripe-count|-c ]\n"\ @@ -126,13 +121,21 @@ static int lfs_swap_layouts(int argc, char **argv); " [--stripe-size|-S ]\n"\ " [--pool|-p ]\n"\ " [--block|-b] "_tgt"\n"\ + " [--ost-list|-o ]\n"\ "\tstripe_size: Number of bytes on each OST (0 filesystem default)\n"\ "\t Can be specified with k, m or g (in KB, MB and GB\n"\ "\t respectively)\n"\ "\tstart_ost_idx: OST index of first stripe (-1 default)\n"\ "\tstripe_count: Number of OSTs to stripe over (0 default, -1 all)\n"\ "\tpool_name: Name of OST pool to use (default none)\n"\ - "\tblock: Block file access during data migration" + "\tblock: Block file access during data migration\n"\ + "\tost_indices: List of OST indices, can be repeated multiple times\n"\ + "\t Indices be specified in a format of:\n"\ + "\t -o ,-,\n"\ + "\t Or:\n"\ + "\t -o -o - -o \n"\ + "\t If --pool is set with --ost-list, then the OSTs\n"\ + "\t must be the members of the pool." /* all avaialable commands */ command_t cmdlist[] = { @@ -153,20 +156,37 @@ command_t cmdlist[] = { " [--layout|-L]\n" " ..."}, {"setdirstripe", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT.\n" - "usage: setdirstripe <--index|-i mdt_index> \n" - "\tmdt_index: MDT index of first stripe\n"}, + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" + "usage: setdirstripe <--count|-c stripe_count>\n" + " [--index|-i mdt_index] [--hash-type|-t hash_type]\n" + " [--default_stripe|-D ] [--mode|-m mode] \n" + "\tstripe_count: stripe count of the striped directory\n" + "\tmdt_index: MDT index of first stripe\n" + "\thash_type: hash type of the striped directory. Hash types:\n" + " fnv_1a_64 FNV-1a hash algorithm (default)\n" + " all_char sum of characters % MDT_COUNT (not recommended)\n" + "\tdefault_stripe: set default dirstripe of the directory\n" + "\tmode: the mode of the directory\n"}, {"getdirstripe", lfs_getdirstripe, 0, "To list the striping info for a given directory\n" "or recursively for all directories in a directory tree.\n" "usage: getdirstripe [--obd|-O ] [--quiet|-q] [--verbose|-v]\n" " [--count|-c ] [--index|-i ] [--raw|-R]\n" - " [--recursive | -r] ..."}, + " [--recursive | -r] [ --default_stripe | -D ] "}, {"mkdir", lfs_setdirstripe, 0, - "To create a remote directory on a specified MDT. And this can only\n" - "be done on MDT0 by administrator.\n" - "usage: mkdir <--index|-i mdt_index> \n" - "\tmdt_index: MDT index of the remote directory.\n"}, + "To create a striped directory on a specified MDT. This can only\n" + "be done on MDT0 with the right of administrator.\n" + "usage: mkdir <--count|-c stripe_count>\n" + " [--index|-i mdt_index] [--hash-type|-t hash_type]\n" + " [--default_stripe|-D ] [--mode|-m mode] \n" + "\tstripe_count: stripe count of the striped directory\n" + "\tmdt_index: MDT index of first stripe\n" + "\thash_type: hash type of the striped directory. Hash types:\n" + " fnv_1a_64 FNV-1a hash algorithm (default)\n" + " all_char sum of characters % MDT_COUNT (not recommended)\n" + "\tdefault_stripe: set default dirstripe of the directory\n" + "\tmode: the mode of the directory\n"}, {"rm_entry", lfs_rmentry, 0, "To remove the name entry of the remote directory. Note: This\n" "command will only delete the name entry, i.e. the remote directory\n" @@ -246,7 +266,8 @@ command_t cmdlist[] = { " while many targets still have 1MB or 1K inodes of spare\n" " quota space."}, {"quota", lfs_quota, 0, "Display disk usage and limits.\n" - "usage: quota [-q] [-v] [-o |-i |-I ]\n" + "usage: quota [-q] [-v] [-h] [-o |-i |-I " + "]\n" " [<-u|-g> |||] \n" " quota [-o |-i |-I ] -t <-u|-g> "}, #endif @@ -285,9 +306,9 @@ command_t cmdlist[] = { "usage: fid2path [--link ] ..." /* [ --rec ] */ }, {"path2fid", lfs_path2fid, 0, "Display the fid(s) for a given path(s).\n" - "usage: path2fid ..."}, + "usage: path2fid [--parents] ..."}, {"data_version", lfs_data_version, 0, "Display file data version for " - "a given path.\n" "usage: data_version [-n] "}, + "a given path.\n" "usage: data_version -[n|r|w] "}, {"hsm_state", lfs_hsm_state, 0, "Display the HSM information (states, " "undergoing actions) for given files.\n usage: hsm_state ..."}, {"hsm_set", lfs_hsm_set, 0, "Set HSM user flag on specified files.\n" @@ -317,39 +338,64 @@ command_t cmdlist[] = { "usage: hsm_cancel [--filelist FILELIST] [--data DATA] ..."}, {"swap_layouts", lfs_swap_layouts, 0, "Swap layouts between 2 files.\n" "usage: swap_layouts "}, - {"migrate", lfs_setstripe, 0, "migrate file from one layout to " + {"migrate", lfs_setstripe, 0, "migrate file from one OST layout to " "another (may be not safe with concurent writes).\n" SETSTRIPE_USAGE("migrate ", "")}, - {"help", Parser_help, 0, "help"}, - {"exit", Parser_quit, 0, "quit"}, - {"quit", Parser_quit, 0, "quit"}, - { 0, 0, 0, NULL } + {"mv", lfs_mv, 0, + "To move directories between MDTs.\n" + "usage: mv [--mdt-index|-M] " + "[--verbose|-v]\n"}, + {"help", Parser_help, 0, "help"}, + {"exit", Parser_quit, 0, "quit"}, + {"quit", Parser_quit, 0, "quit"}, + {"--version", Parser_version, 0, + "output build version of the utility and exit"}, + { 0, 0, 0, NULL } }; -static int isnumber(const char *str) +/* Generate a random id for the grouplock */ +static int random_group_id(int *gid) { - const char *ptr; + int fd; + int rc; + size_t sz = sizeof(*gid); + + fd = open("/dev/urandom", O_RDONLY); + if (fd < 0) { + rc = -errno; + fprintf(stderr, "cannot open /dev/urandom: %s\n", + strerror(-rc)); + goto out; + } - if (str[0] != '-' && !isdigit(str[0])) - return 0; +retry: + rc = read(fd, gid, sz); + if (rc < sz) { + rc = -errno; + fprintf(stderr, "cannot read %zu bytes from /dev/urandom: %s\n", + sz, strerror(-rc)); + goto out; + } - for (ptr = str + 1; *ptr != '\0'; ptr++) { - if (!isdigit(*ptr)) - return 0; - } + /* gids must be non-zero */ + if (*gid == 0) + goto retry; + +out: + if (fd >= 0) + close(fd); - return 1; + return rc; } #define MIGRATION_BLOCKS 1 -static int lfs_migrate(char *name, unsigned long long stripe_size, - int stripe_offset, int stripe_count, - int stripe_pattern, char *pool_name, - __u64 migration_flags) +static int lfs_migrate(char *name, __u64 migration_flags, + struct llapi_stripe_param *param) { int fd, fdv; - char volatile_file[PATH_MAX]; + char volatile_file[PATH_MAX + + LUSTRE_VOLATILE_HDR_LEN + 4]; char parent[PATH_MAX]; char *ptr; int rc; @@ -360,8 +406,9 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, void *buf = NULL; int rsize, wsize; __u64 rpos, wpos, bufoff; - int gid = 0, sz; + int gid; int have_gl = 0; + struct stat st, stv; /* find the right size for the IO and allocate the buffer */ lumsz = lov_user_md_size(LOV_MAX_STRIPE_COUNT, LOV_USER_MAGIC_V3); @@ -387,27 +434,20 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, } if (migration_flags & MIGRATION_BLOCKS) { - /* generate a random id for the grouplock */ - fd = open("/dev/urandom", O_RDONLY); - if (fd == -1) { - rc = -errno; - fprintf(stderr, "cannot open /dev/urandom (%s)\n", - strerror(-rc)); - goto free; - } - sz = sizeof(gid); - rc = read(fd, &gid, sz); - close(fd); - if (rc < sz) { - rc = -errno; - fprintf(stderr, "cannot read %d bytes from" - " /dev/urandom (%s)\n", sz, strerror(-rc)); + rc = random_group_id(&gid); + if (rc < 0) { + fprintf(stderr, "%s: cannot get random group ID: %s\n", + name, strerror(-rc)); goto free; } } /* search for file directory pathname */ - strcpy(parent, name); + if (strlen(name) > sizeof(parent)-1) { + rc = -E2BIG; + goto free; + } + strncpy(parent, name, sizeof(parent)); ptr = strrchr(parent, '/'); if (ptr == NULL) { if (getcwd(parent, sizeof(parent)) == NULL) { @@ -420,14 +460,18 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, else *ptr = '\0'; } - sprintf(volatile_file, "%s/%s::", parent, LUSTRE_VOLATILE_HDR); + rc = snprintf(volatile_file, sizeof(volatile_file), "%s/%s::", parent, + LUSTRE_VOLATILE_HDR); + if (rc >= sizeof(volatile_file)) { + rc = -E2BIG; + goto free; + } /* create, open a volatile file, use caching (ie no directio) */ /* exclusive create is not needed because volatile files cannot * conflict on name by construction */ - fdv = llapi_file_open_pool(volatile_file, O_CREAT | O_WRONLY, - 0644, stripe_size, stripe_offset, - stripe_count, stripe_pattern, pool_name); + fdv = llapi_file_open_param(volatile_file, O_CREAT | O_WRONLY, 0644, + param); if (fdv < 0) { rc = fdv; fprintf(stderr, "cannot create volatile file in %s (%s)\n", @@ -446,8 +490,36 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, goto free; } + /* Not-owner (root?) special case. + * Need to set owner/group of volatile file like original. + * This will allow to pass related check during layout_swap. + */ + rc = fstat(fd, &st); + if (rc != 0) { + rc = -errno; + fprintf(stderr, "cannot stat %s (%s)\n", name, + strerror(errno)); + goto error; + } + rc = fstat(fdv, &stv); + if (rc != 0) { + rc = -errno; + fprintf(stderr, "cannot stat %s (%s)\n", volatile_file, + strerror(errno)); + goto error; + } + if (st.st_uid != stv.st_uid || st.st_gid != stv.st_gid) { + rc = fchown(fdv, st.st_uid, st.st_gid); + if (rc != 0) { + rc = -errno; + fprintf(stderr, "cannot chown %s (%s)\n", name, + strerror(errno)); + goto error; + } + } + /* get file data version */ - rc = llapi_get_data_version(fd, &dv1, 0); + rc = llapi_get_data_version(fd, &dv1, LL_DV_RD_FLUSH); if (rc != 0) { fprintf(stderr, "cannot get dataversion on %s (%s)\n", name, strerror(-rc)); @@ -460,8 +532,8 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, * be implemented (see LU-2919) */ /* group lock is taken after data version read because it * blocks data version call */ - if (ioctl(fd, LL_IOC_GROUP_LOCK, gid) == -1) { - rc = -errno; + rc = llapi_group_lock(fd, gid); + if (rc < 0) { fprintf(stderr, "cannot get group lock on %s (%s)\n", name, strerror(-rc)); goto error; @@ -508,11 +580,10 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, if (migration_flags & MIGRATION_BLOCKS) { /* give back group lock */ - if (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1) { - rc = -errno; + rc = llapi_group_unlock(fd, gid); + if (rc < 0) fprintf(stderr, "cannot put group lock on %s (%s)\n", name, strerror(-rc)); - } have_gl = 0; } @@ -527,23 +598,24 @@ static int lfs_migrate(char *name, unsigned long long stripe_size, SWAP_LAYOUTS_KEEP_MTIME | SWAP_LAYOUTS_KEEP_ATIME); if (rc == -EAGAIN) { - fprintf(stderr, "file dataversion for %s has changed" - " during copy, migration is aborted\n", - name); + fprintf(stderr, "%s: dataversion changed during copy, " + "migration aborted\n", name); goto error; } if (rc != 0) - fprintf(stderr, "cannot swap layouts between %s and " - "a volatile file (%s)\n", + fprintf(stderr, "%s: swap layout to new file failed: %s\n", name, strerror(-rc)); error: /* give back group lock */ - if ((migration_flags & MIGRATION_BLOCKS) && have_gl && - (ioctl(fd, LL_IOC_GROUP_UNLOCK, gid) == -1)) { - /* we keep in rc the original error */ - fprintf(stderr, "cannot put group lock on %s (%s)\n", - name, strerror(-errno)); + if ((migration_flags & MIGRATION_BLOCKS) && have_gl) { + int rc2; + + /* we keep the original error in rc */ + rc2 = llapi_group_unlock(fd, gid); + if (rc2 < 0) + fprintf(stderr, "cannot put group lock on %s (%s)\n", + name, strerror(-rc2)); } close(fdv); @@ -556,30 +628,115 @@ free: return rc; } +/** + * Parse a string containing an OST index list into an array of integers. + * + * The input string contains a comma delimited list of individual + * indices and ranges, for example "1,2-4,7". Add the indices into the + * \a osts array and remove duplicates. + * + * \param[out] osts array to store indices in + * \param[in] size size of \a osts array + * \param[in] offset starting index in \a osts + * \param[in] arg string containing OST index list + * + * \retval positive number of indices in \a osts + * \retval -EINVAL unable to parse \a arg + */ +static int parse_targets(__u32 *osts, int size, int offset, char *arg) +{ + int rc; + int nr = offset; + int slots = size - offset; + char *ptr = NULL; + bool end_of_loop; + + if (arg == NULL) + return -EINVAL; + + end_of_loop = false; + while (!end_of_loop) { + int start_index; + int end_index; + int i; + char *endptr = NULL; + + rc = -EINVAL; + + ptr = strchrnul(arg, ','); + + end_of_loop = *ptr == '\0'; + *ptr = '\0'; + + start_index = strtol(arg, &endptr, 0); + if (endptr == arg) /* no data at all */ + break; + if (*endptr != '-' && *endptr != '\0') /* has invalid data */ + break; + if (start_index < 0) + break; + + end_index = start_index; + if (*endptr == '-') { + end_index = strtol(endptr + 1, &endptr, 0); + if (*endptr != '\0') + break; + if (end_index < start_index) + break; + } + + for (i = start_index; i <= end_index && slots > 0; i++) { + int j; + + /* remove duplicate */ + for (j = 0; j < offset; j++) { + if (osts[j] == i) + break; + } + if (j == offset) { /* no duplicate */ + osts[nr++] = i; + --slots; + } + } + if (slots == 0 && i < end_index) + break; + + *ptr = ','; + arg = ++ptr; + offset = nr; + rc = 0; + } + if (!end_of_loop && ptr != NULL) + *ptr = ','; + + return rc < 0 ? rc : nr; +} + /* functions */ static int lfs_setstripe(int argc, char **argv) { - char *fname; - int result; - 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; - unsigned long long size_units = 1; - int migrate_mode = 0; - __u64 migration_flags = 0; + struct llapi_stripe_param *param; + char *fname; + int result; + 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; + unsigned long long size_units = 1; + bool migrate_mode = false; + __u64 migration_flags = 0; + __u32 osts[LOV_MAX_STRIPE_COUNT] = { 0 }; + int nr_osts = 0; struct option long_opts[] = { /* valid only in migrate mode */ {"block", no_argument, 0, 'b'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "stripe-count", but was explicitly * made "stripe-count" for consistency with other options, * and to separate it from "mdt-count" when DNE arrives. */ @@ -588,9 +745,7 @@ static int lfs_setstripe(int argc, char **argv) {"stripe-count", required_argument, 0, 'c'}, {"stripe_count", required_argument, 0, 'c'}, {"delete", no_argument, 0, 'd'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --index option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "stripe-index", but was explicitly * made "stripe-index" for consistency with other options, * and to separate it from "mdt-index" when DNE arrives. */ @@ -598,18 +753,10 @@ static int lfs_setstripe(int argc, char **argv) #endif {"stripe-index", required_argument, 0, 'i'}, {"stripe_index", required_argument, 0, 'i'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset option" -#else - /* This formerly implied "stripe-index", but was confusing - * with "file offset" (which will eventually be needed for - * with different layouts by offset), so deprecate it. */ - {"offset", required_argument, 0, 'o'}, -#endif + {"ost-list", required_argument, 0, 'o'}, + {"ost_list", required_argument, 0, 'o'}, {"pool", required_argument, 0, 'p'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "--stripe-size", but was confusing * with "lfs find --size|-s", which means "file size", so use * the consistent "--stripe-size|-S" for all commands. */ @@ -620,108 +767,95 @@ static int lfs_setstripe(int argc, char **argv) {0, 0, 0, 0} }; - st_size = 0; - st_offset = -1; - st_count = 0; + st_size = 0; + st_offset = -1; + st_count = 0; if (strcmp(argv[0], "migrate") == 0) - migrate_mode = 1; + migrate_mode = true; -#if LUSTRE_VERSION < OBD_OCD_VERSION(2,4,50,0) - if (argc == 5 && argv[1][0] != '-' && - isnumber(argv[2]) && isnumber(argv[3]) && isnumber(argv[4])) { - fprintf(stderr, "error: obsolete usage of setstripe " - "positional parameters. Use -c, -i, -S instead.\n"); - return CMD_HELP; - } else -#else -#warning "remove obsolete positional parameter error" -#endif - { - optind = 0; - while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", - long_opts, NULL)) >= 0) { - switch (c) { - case 0: - /* Long options. */ - break; + optind = 0; + while ((c = getopt_long(argc, argv, "c:di:o:p:s:S:", + long_opts, NULL)) >= 0) { + switch (c) { + case 0: + /* Long options. */ + break; case 'b': - if (migrate_mode == 0) { + if (!migrate_mode) { fprintf(stderr, "--block is valid only for" " migrate mode"); return CMD_HELP; } migration_flags |= MIGRATION_BLOCKS; break; - case 'c': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - if (strcmp(argv[optind - 1], "--count") == 0) - fprintf(stderr, "warning: '--count' deprecated" - ", use '--stripe-count' instead\n"); -#endif - stripe_count_arg = optarg; - break; - case 'd': - /* delete the default striping pattern */ - delete = 1; - break; - case 'o': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0) - fprintf(stderr, "warning: '--offset|-o' deprecated, " - "use '--stripe-index|-i' instead\n"); -#else - if (strcmp(argv[optind - 1], "--offset") == 0) - /* need --stripe-index established first */ - fprintf(stderr, "warning: '--offset' deprecated" - ", use '--index' instead\n"); + 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 'i': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset and --index options" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - if (strcmp(argv[optind - 1], "--index") == 0) - fprintf(stderr, "warning: '--index' deprecated" - ", use '--stripe-index' instead\n"); + stripe_count_arg = optarg; + break; + case 'd': + /* delete the default striping pattern */ + delete = 1; + break; + case 'o': + nr_osts = parse_targets(osts, ARRAY_SIZE(osts), nr_osts, + optarg); + if (nr_osts < 0) { + fprintf(stderr, + "error: %s: bad OST indices '%s'\n", + argv[0], optarg); + return CMD_HELP; + } + + if (st_offset == -1) /* first in the command line */ + st_offset = osts[0]; + 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; - break; - case 's': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) - fprintf(stderr, "warning: '--size|-s' deprecated, " - "use '--stripe-size|-S' instead\n"); + stripe_off_arg = optarg; + break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) + case 's': +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) + fprintf(stderr, "warning: '--size|-s' deprecated, " + "use '--stripe-size|-S' instead\n"); #endif - case 'S': - stripe_size_arg = optarg; - break; - case 'p': - pool_name_arg = optarg; - break; - default: - return CMD_HELP; - } - } +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ + case 'S': + stripe_size_arg = optarg; + break; + case 'p': + pool_name_arg = optarg; + break; + default: + return CMD_HELP; + } + } - fname = argv[optind]; + fname = argv[optind]; - if (delete && - (stripe_size_arg != NULL || stripe_off_arg != NULL || - stripe_count_arg != NULL || pool_name_arg != NULL)) { - fprintf(stderr, "error: %s: cannot specify -d with " - "-s, -c, -o, or -p options\n", - argv[0]); - return CMD_HELP; - } - } + if (delete && + (stripe_size_arg != NULL || stripe_off_arg != NULL || + stripe_count_arg != NULL || pool_name_arg != NULL)) { + fprintf(stderr, "error: %s: cannot specify -d with " + "-s, -c, -o, or -p options\n", + argv[0]); + return CMD_HELP; + } - if (optind == argc) { - fprintf(stderr, "error: %s: missing filename|dirname\n", - argv[0]); - return CMD_HELP; - } + if (optind == argc) { + fprintf(stderr, "error: %s: missing filename|dirname\n", + argv[0]); + return CMD_HELP; + } /* get the stripe size */ if (stripe_size_arg != NULL) { @@ -752,15 +886,44 @@ static int lfs_setstripe(int argc, char **argv) } } + /* initialize stripe parameters */ + param = calloc(1, offsetof(typeof(*param), lsp_osts[nr_osts])); + if (param == NULL) { + fprintf(stderr, "error: %s: run out of memory\n", argv[0]); + return CMD_HELP; + } + + param->lsp_stripe_size = st_size; + param->lsp_stripe_offset = st_offset; + param->lsp_stripe_count = st_count; + param->lsp_stripe_pattern = 0; + param->lsp_pool = pool_name_arg; + param->lsp_is_specific = false; + if (nr_osts > 0) { + if (st_count > 0 && nr_osts != st_count) { + fprintf(stderr, "error: %s: stripe count '%d' doesn't " + "match the number of OSTs: %d\n", + argv[0], st_count, nr_osts); + return CMD_HELP; + } + + param->lsp_is_specific = true; + param->lsp_stripe_count = nr_osts; + memcpy(param->lsp_osts, osts, sizeof(*osts) * nr_osts); + } + do { - if (migrate_mode) - result = lfs_migrate(fname, st_size, st_offset, - st_count, 0, pool_name_arg, - migration_flags); - else - result = llapi_file_create_pool(fname, st_size, - st_offset, st_count, - 0, pool_name_arg); + if (!migrate_mode) { + result = llapi_file_open_param(fname, + O_CREAT | O_WRONLY, + 0644, param); + if (result >= 0) { + close(result); + result = 0; + } + } else { + result = lfs_migrate(fname, migration_flags, param); + } if (result) { fprintf(stderr, "error: %s: %s stripe file '%s' failed\n", @@ -771,6 +934,7 @@ static int lfs_setstripe(int argc, char **argv) fname = argv[++optind]; } while (fname != NULL); + free(param); return result; } @@ -886,9 +1050,13 @@ static int name2layout(__u32 *layout, char *name) #define FIND_POOL_OPT 3 static int lfs_find(int argc, char **argv) { - int c, ret; + int c, rc; + int ret = 0; time_t t; - struct find_param param = { .maxdepth = -1, .quiet = 1 }; + struct find_param param = { + .fp_max_depth = -1, + .quiet = 1, + }; struct option long_opts[] = { {"atime", required_argument, 0, 'A'}, {"stripe-count", required_argument, 0, 'c'}, @@ -967,32 +1135,32 @@ static int lfs_find(int argc, char **argv) if (strcmp(optarg, "!") == 0) neg_opt = 2; break; - case 'A': - xtime = ¶m.atime; - xsign = ¶m.asign; - param.exclude_atime = !!neg_opt; - /* no break, this falls through to 'C' for ctime */ - case 'C': - if (c == 'C') { - xtime = ¶m.ctime; - xsign = ¶m.csign; - param.exclude_ctime = !!neg_opt; - } - /* no break, this falls through to 'M' for mtime */ - case 'M': - if (c == 'M') { - xtime = ¶m.mtime; - xsign = ¶m.msign; - param.exclude_mtime = !!neg_opt; - } - ret = set_time(&t, xtime, optarg); - if (ret == INT_MAX) { - ret = -1; - goto err; - } - if (ret) - *xsign = ret; - break; + case 'A': + xtime = ¶m.fp_atime; + xsign = ¶m.fp_asign; + param.fp_exclude_atime = !!neg_opt; + /* no break, this falls through to 'C' for ctime */ + case 'C': + if (c == 'C') { + xtime = ¶m.fp_ctime; + xsign = ¶m.fp_csign; + param.fp_exclude_ctime = !!neg_opt; + } + /* no break, this falls through to 'M' for mtime */ + case 'M': + if (c == 'M') { + xtime = ¶m.fp_mtime; + xsign = ¶m.fp_msign; + param.fp_exclude_mtime = !!neg_opt; + } + rc = set_time(&t, xtime, optarg); + if (rc == INT_MAX) { + ret = -1; + goto err; + } + if (rc) + *xsign = rc; + break; case 'c': if (optarg[0] == '+') { param.stripecount_sign = -1; @@ -1012,14 +1180,14 @@ static int lfs_find(int argc, char **argv) param.check_stripecount = 1; param.exclude_stripecount = !!neg_opt; break; - case 'D': - param.maxdepth = strtol(optarg, 0, 0); - break; - case 'g': - case 'G': - ret = name2id(¶m.gid, optarg, GROUP); - if (ret) { - param.gid = strtoul(optarg, &endptr, 10); + case 'D': + param.fp_max_depth = strtol(optarg, 0, 0); + break; + case 'g': + case 'G': + rc = name2id(¶m.fp_gid, optarg, GROUP); + if (rc) { + param.fp_gid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "Group/GID: %s cannot " "be found.\n", optarg); @@ -1027,8 +1195,8 @@ static int lfs_find(int argc, char **argv) goto err; } } - param.exclude_gid = !!neg_opt; - param.check_gid = 1; + param.fp_exclude_gid = !!neg_opt; + param.fp_check_gid = 1; break; case 'L': ret = name2layout(¶m.layout, optarg); @@ -1039,9 +1207,9 @@ static int lfs_find(int argc, char **argv) break; case 'u': case 'U': - ret = name2id(¶m.uid, optarg, USER); - if (ret) { - param.uid = strtoul(optarg, &endptr, 10); + rc = name2id(¶m.fp_uid, optarg, USER); + if (rc) { + param.fp_uid = strtoul(optarg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "User/UID: %s cannot " "be found.\n", optarg); @@ -1049,8 +1217,8 @@ static int lfs_find(int argc, char **argv) goto err; } } - param.exclude_uid = !!neg_opt; - param.check_uid = 1; + param.fp_exclude_uid = !!neg_opt; + param.fp_check_uid = 1; break; case FIND_POOL_OPT: if (strlen(optarg) > LOV_MAXPOOLNAME) { @@ -1101,8 +1269,11 @@ static int lfs_find(int argc, char **argv) tmp = realloc(param.mdtuuid, param.num_alloc_mdts * sizeof(*param.mdtuuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + param.mdtuuid = tmp; } else { param.exclude_obd = !!neg_opt; @@ -1110,25 +1281,36 @@ static int lfs_find(int argc, char **argv) tmp = realloc(param.obduuid, param.num_alloc_obds * sizeof(*param.obduuid)); - if (tmp == NULL) - GOTO(err_free, ret = -ENOMEM); + if (tmp == NULL) { + ret = -ENOMEM; + goto err_free; + } + param.obduuid = tmp; } for (token = buf; token && *token; token = next) { - char *uuid; - if (c == 'm') - uuid = - param.mdtuuid[param.num_mdts++].uuid; - else - uuid = - param.obduuid[param.num_obds++].uuid; + struct obd_uuid *puuid; + if (c == 'm') { + puuid = + ¶m.mdtuuid[param.num_mdts++]; + } else { + puuid = + ¶m.obduuid[param.num_obds++]; + } p = strchr(token, ','); next = 0; if (p) { *p = 0; next = p+1; } - strcpy((char *)uuid, token); + + if (strlen(token) > sizeof(puuid->uuid) - 1) { + ret = -E2BIG; + goto err_free; + } + + strncpy(puuid->uuid, token, + sizeof(puuid->uuid)); } err_free: if (buf) @@ -1178,25 +1360,37 @@ err_free: param.check_stripesize = 1; param.exclude_stripesize = !!neg_opt; break; - case 't': - param.exclude_type = !!neg_opt; - switch(optarg[0]) { - case 'b': param.type = S_IFBLK; break; - case 'c': param.type = S_IFCHR; break; - case 'd': param.type = S_IFDIR; break; - case 'f': param.type = S_IFREG; break; - case 'l': param.type = S_IFLNK; break; - case 'p': param.type = S_IFIFO; break; - case 's': param.type = S_IFSOCK; break; -#ifdef S_IFDOOR /* Solaris only */ - case 'D': param.type = S_IFDOOR; break; -#endif - default: fprintf(stderr, "error: %s: bad type '%s'\n", - argv[0], optarg); - ret = CMD_HELP; - goto err; - }; - break; + case 't': + param.fp_exclude_type = !!neg_opt; + switch (optarg[0]) { + case 'b': + param.fp_type = S_IFBLK; + break; + case 'c': + param.fp_type = S_IFCHR; + break; + case 'd': + param.fp_type = S_IFDIR; + break; + case 'f': + param.fp_type = S_IFREG; + break; + case 'l': + param.fp_type = S_IFLNK; + break; + case 'p': + param.fp_type = S_IFIFO; + break; + case 's': + param.fp_type = S_IFSOCK; + break; + default: + fprintf(stderr, "error: %s: bad type '%s'\n", + argv[0], optarg); + ret = CMD_HELP; + goto err; + }; + break; default: ret = CMD_HELP; goto err; @@ -1213,9 +1407,11 @@ err_free: pathend = argc; } - do { - ret = llapi_find(argv[pathstart], ¶m); - } while (++pathstart < pathend && !ret); + do { + rc = llapi_find(argv[pathstart], ¶m); + if (rc != 0 && ret == 0) + ret = rc; + } while (++pathstart < pathend); if (ret) fprintf(stderr, "error: %s failed for %s.\n", @@ -1234,9 +1430,7 @@ static int lfs_getstripe_internal(int argc, char **argv, struct find_param *param) { struct option long_opts[] = { -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "stripe-count", but was explicitly * made "stripe-count" for consistency with other options, * and to separate it from "mdt-count" when DNE arrives. */ @@ -1245,10 +1439,9 @@ static int lfs_getstripe_internal(int argc, char **argv, {"stripe-count", no_argument, 0, 'c'}, {"stripe_count", no_argument, 0, 'c'}, {"directory", no_argument, 0, 'd'}, + {"default", no_argument, 0, 'D'}, {"generation", no_argument, 0, 'g'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --index option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "stripe-index", but was explicitly * made "stripe-index" for consistency with other options, * and to separate it from "mdt-index" when DNE arrives. */ @@ -1259,9 +1452,7 @@ static int lfs_getstripe_internal(int argc, char **argv, {"layout", no_argument, 0, 'L'}, {"mdt-index", no_argument, 0, 'M'}, {"mdt_index", no_argument, 0, 'M'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "stripe-index", but was confusing * with "file offset" (which will eventually be needed for * with different layouts by offset), so deprecate it. */ @@ -1273,9 +1464,7 @@ static int lfs_getstripe_internal(int argc, char **argv, {"quiet", no_argument, 0, 'q'}, {"recursive", no_argument, 0, 'r'}, {"raw", no_argument, 0, 'R'}, -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#else +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) /* This formerly implied "--stripe-size", but was confusing * with "lfs find --size|-s", which means "file size", so use * the consistent "--stripe-size|-S" for all commands. */ @@ -1288,9 +1477,9 @@ static int lfs_getstripe_internal(int argc, char **argv, }; int c, rc; - param->maxdepth = 1; + param->fp_max_depth = 1; optind = 0; - while ((c = getopt_long(argc, argv, "cdghiLMoO:pqrRsSv", + while ((c = getopt_long(argc, argv, "cdDghiLMoO:pqrRsSv", long_opts, NULL)) != -1) { switch (c) { case 'O': @@ -1306,7 +1495,10 @@ static int lfs_getstripe_internal(int argc, char **argv, param->quiet++; break; case 'd': - param->maxdepth = 0; + param->fp_max_depth = 0; + break; + case 'D': + param->get_default_lmv = 1; break; case 'r': param->recursive = 1; @@ -1315,75 +1507,66 @@ static int lfs_getstripe_internal(int argc, char **argv, param->verbose = VERBOSE_ALL | VERBOSE_DETAIL; break; case 'c': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --count option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) if (strcmp(argv[optind - 1], "--count") == 0) fprintf(stderr, "warning: '--count' deprecated," " use '--stripe-count' instead\n"); #endif if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_COUNT; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) case 's': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --size option" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) fprintf(stderr, "warning: '--size|-s' deprecated, " "use '--stripe-size|-S' instead\n"); #endif +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) */ case 'S': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_SIZE; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 53, 0) case 'o': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,4,50,0) fprintf(stderr, "warning: '--offset|-o' deprecated, " "use '--stripe-index|-i' instead\n"); -#else - if (strcmp(argv[optind - 1], "--offset") == 0) - /* need --stripe-index established first */ - fprintf(stderr, "warning: '--offset' deprecated" - ", use '--index' instead\n"); #endif case 'i': -#if LUSTRE_VERSION >= OBD_OCD_VERSION(2,9,50,0) -#warning "remove deprecated --offset and --index options" -#elif LUSTRE_VERSION >= OBD_OCD_VERSION(2,6,50,0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 53, 0) if (strcmp(argv[optind - 1], "--index") == 0) fprintf(stderr, "warning: '--index' deprecated" ", use '--stripe-index' instead\n"); #endif if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_OFFSET; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'p': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_POOL; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'g': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_GENERATION; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'L': if (!(param->verbose & VERBOSE_DETAIL)) { param->verbose |= VERBOSE_LAYOUT; - param->maxdepth = 0; + param->fp_max_depth = 0; } break; case 'M': if (!(param->verbose & VERBOSE_DETAIL)) - param->maxdepth = 0; + param->fp_max_depth = 0; param->verbose |= VERBOSE_MDTINDEX; break; case 'R': @@ -1398,7 +1581,7 @@ static int lfs_getstripe_internal(int argc, char **argv, return CMD_HELP; if (param->recursive) - param->maxdepth = -1; + param->fp_max_depth = -1; if (!param->verbose) param->verbose = VERBOSE_ALL; @@ -1471,30 +1654,52 @@ static int lfs_getdirstripe(int argc, char **argv) /* functions */ static int lfs_setdirstripe(int argc, char **argv) { - char *dname; - int result; - int st_offset, st_count; - char *end; - int c; - char *stripe_off_arg = NULL; - int flags = 0; + char *dname; + int result; + unsigned int stripe_offset = -1; + unsigned int stripe_count = 1; + enum lmv_hash_type hash_type; + char *end; + int c; + char *stripe_offset_opt = NULL; + char *stripe_count_opt = NULL; + char *stripe_hash_opt = NULL; + char *mode_opt = NULL; + int default_stripe = 0; + mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; + mode_t previous_mode = 0; struct option long_opts[] = { - {"index", required_argument, 0, 'i'}, + {"count", required_argument, 0, 'c'}, + {"index", required_argument, 0, 'i'}, + {"mode", required_argument, 0, 'm'}, + {"hash-type", required_argument, 0, 't'}, + {"default_stripe", no_argument, 0, 'D'}, {0, 0, 0, 0} }; - st_offset = -1; - st_count = 1; optind = 0; - while ((c = getopt_long(argc, argv, "i:o", - long_opts, NULL)) >= 0) { + + while ((c = getopt_long(argc, argv, "c:Di:m:t:", long_opts, + NULL)) >= 0) { switch (c) { case 0: /* Long options. */ break; + case 'c': + stripe_count_opt = optarg; + break; + case 'D': + default_stripe = 1; + break; case 'i': - stripe_off_arg = optarg; + stripe_offset_opt = optarg; + break; + case 'm': + mode_opt = optarg; + break; + case 't': + stripe_hash_opt = optarg; break; default: fprintf(stderr, "error: %s: option '%s' " @@ -1510,22 +1715,66 @@ static int lfs_setdirstripe(int argc, char **argv) return CMD_HELP; } - dname = argv[optind]; - if (stripe_off_arg == NULL) { - fprintf(stderr, "error: %s: missing stripe_off.\n", + if (stripe_offset_opt == NULL && stripe_count_opt == NULL) { + fprintf(stderr, "error: %s: missing stripe offset and count.\n", argv[0]); return CMD_HELP; } - /* get the stripe offset */ - st_offset = strtoul(stripe_off_arg, &end, 0); - if (*end != '\0') { - fprintf(stderr, "error: %s: bad stripe offset '%s'\n", - argv[0], stripe_off_arg); + + if (stripe_offset_opt != NULL) { + /* get the stripe offset */ + stripe_offset = strtoul(stripe_offset_opt, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe offset '%s'\n", + argv[0], stripe_offset_opt); + return CMD_HELP; + } + } + + if (mode_opt != NULL) { + mode = strtoul(mode_opt, &end, 8); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad mode '%s'\n", + argv[0], mode_opt); + return CMD_HELP; + } + previous_mode = umask(0); + } + + if (stripe_hash_opt == NULL || + strcmp(stripe_hash_opt, LMV_HASH_NAME_FNV_1A_64) == 0) { + hash_type = LMV_HASH_TYPE_FNV_1A_64; + } else if (strcmp(stripe_hash_opt, LMV_HASH_NAME_ALL_CHARS) == 0) { + hash_type = LMV_HASH_TYPE_ALL_CHARS; + } else { + fprintf(stderr, "error: %s: bad stripe hash type '%s'\n", + argv[0], stripe_hash_opt); return CMD_HELP; } + + /* get the stripe count */ + if (stripe_count_opt != NULL) { + stripe_count = strtoul(stripe_count_opt, &end, 0); + if (*end != '\0') { + fprintf(stderr, "error: %s: bad stripe count '%s'\n", + argv[0], stripe_count_opt); + return CMD_HELP; + } + } + + dname = argv[optind]; do { - result = llapi_dir_create_pool(dname, flags, st_offset, - st_count, 0, NULL); + if (default_stripe == 1) { + result = llapi_dir_set_default_lmv_stripe(dname, + stripe_offset, stripe_count, + hash_type, NULL); + } else { + result = llapi_dir_create_pool(dname, mode, + stripe_offset, + stripe_count, hash_type, + NULL); + } + if (result) { fprintf(stderr, "error: %s: create stripe dir '%s' " "failed\n", argv[0], dname); @@ -1534,6 +1783,9 @@ static int lfs_setdirstripe(int argc, char **argv) dname = argv[++optind]; } while (dname != NULL); + if (mode_opt != NULL) + umask(previous_mode); + return result; } @@ -1564,6 +1816,61 @@ static int lfs_rmentry(int argc, char **argv) return result; } +static int lfs_mv(int argc, char **argv) +{ + struct find_param param = { + .fp_max_depth = -1, + .mdtindex = -1, + }; + char *end; + int c; + int rc = 0; + struct option long_opts[] = { + {"--mdt-index", required_argument, 0, 'M'}, + {"verbose", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; + + while ((c = getopt_long(argc, argv, "M:v", long_opts, NULL)) != -1) { + switch (c) { + case 'M': { + param.mdtindex = strtoul(optarg, &end, 0); + if (*end != '\0') { + fprintf(stderr, "%s: invalid MDT index'%s'\n", + argv[0], optarg); + return CMD_HELP; + } + break; + } + case 'v': { + param.verbose = VERBOSE_DETAIL; + break; + } + default: + fprintf(stderr, "error: %s: unrecognized option '%s'\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (param.mdtindex == -1) { + fprintf(stderr, "%s MDT index must be indicated\n", argv[0]); + return CMD_HELP; + } + + if (optind >= argc) { + fprintf(stderr, "%s missing operand path\n", argv[0]); + return CMD_HELP; + } + + param.migrate = 1; + rc = llapi_mv(argv[optind], ¶m); + if (rc != 0) + fprintf(stderr, "cannot migrate '%s' to MDT%04x: %s\n", + argv[optind], param.mdtindex, strerror(-rc)); + return rc; +} + static int lfs_osts(int argc, char **argv) { return lfs_tgts(argc, argv); @@ -1598,7 +1905,10 @@ static int showdf(char *mntdir, struct obd_statfs *stat, double ratio = 0; char *suffix = "KMGTPEZY"; /* Note if we have >2^64 bytes/fs these buffers will need to be grown */ - char tbuf[20], ubuf[20], abuf[20], rbuf[20]; + char tbuf[3 * sizeof(__u64)]; + char ubuf[3 * sizeof(__u64)]; + char abuf[3 * sizeof(__u64)]; + char rbuf[3 * sizeof(__u64)]; if (!uuid || !stat) return -EINVAL; @@ -1679,16 +1989,17 @@ struct ll_stat_type { static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, int cooked, int lazy) { - struct obd_statfs stat_buf, sum = { .os_bsize = 1 }; - struct obd_uuid uuid_buf; - char *poolname = NULL; - struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" }, - { LL_STATFS_LOV, "OST" }, - { 0, NULL } }; - struct ll_stat_type *tp; - __u32 index; - __u32 type; - int rc; + struct obd_statfs stat_buf, sum = { .os_bsize = 1 }; + struct obd_uuid uuid_buf; + char *poolname = NULL; + struct ll_stat_type types[] = { { LL_STATFS_LMV, "MDT" }, + { LL_STATFS_LOV, "OST" }, + { 0, NULL } }; + struct ll_stat_type *tp; + __u64 ost_ffree = 0; + __u32 index; + __u32 type; + int rc; if (pool) { poolname = strchr(pool, '.'); @@ -1721,6 +2032,9 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, if (rc == -ENODEV) break; + if (rc == -EAGAIN) + continue; + if (poolname && tp->st_op == LL_STATFS_LOV && llapi_search_ost(fsname, poolname, obd_uuid2str(&uuid_buf)) != 1) @@ -1742,23 +2056,32 @@ static int mntdf(char *mntdir, char *fsname, char *pool, int ishow, sum.os_ffree += stat_buf.os_ffree; sum.os_files += stat_buf.os_files; } else /* if (tp->st_op == LL_STATFS_LOV) */ { - sum.os_blocks += stat_buf.os_blocks * - stat_buf.os_bsize; - sum.os_bfree += stat_buf.os_bfree * - stat_buf.os_bsize; - sum.os_bavail += stat_buf.os_bavail * - stat_buf.os_bsize; - } - } else if (rc == -EINVAL || rc == -EFAULT) { - break; - } - } - } + sum.os_blocks += stat_buf.os_blocks * + stat_buf.os_bsize; + sum.os_bfree += stat_buf.os_bfree * + stat_buf.os_bsize; + sum.os_bavail += stat_buf.os_bavail * + stat_buf.os_bsize; + ost_ffree += stat_buf.os_ffree; + } + } else if (rc == -EINVAL || rc == -EFAULT) { + break; + } + } + } - printf("\n"); - showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0,0); - printf("\n"); - return 0; + /* If we don't have as many objects free on the OST as inodes + * on the MDS, we reduce the total number of inodes to + * compensate, so that the "inodes in use" number is correct. + * Matches ll_statfs_internal() so the results are consistent. */ + if (ost_ffree < sum.os_ffree) { + sum.os_files = (sum.os_files - sum.os_ffree) + ost_ffree; + sum.os_ffree = ost_ffree; + } + printf("\n"); + showdf(mntdir, &sum, "filesystem summary:", ishow, cooked, NULL, 0, 0); + printf("\n"); + return 0; } static int lfs_df(int argc, char **argv) @@ -1890,9 +2213,7 @@ static int lfs_check(int argc, char **argv) return rc; } - rc = llapi_target_iterate(num_types, obd_types, - mntdir, llapi_ping_target); - + rc = llapi_target_check(num_types, obd_types, mntdir); if (rc) fprintf(stderr, "error: %s: %s status failed\n", argv[0],argv[1]); @@ -2517,29 +2838,50 @@ static void diff2str(time_t seconds, char *buf, time_t now) __sec2str(seconds - now, buf); } -static void print_quota_title(char *name, struct if_quotactl *qctl) +static void print_quota_title(char *name, struct if_quotactl *qctl, + bool human_readable) +{ + printf("Disk quotas for %s %s (%cid %u):\n", + type2name(qctl->qc_type), name, + *type2name(qctl->qc_type), qctl->qc_id); + printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", + "Filesystem", human_readable ? "used" : "kbytes", + "quota", "limit", "grace", + "files", "quota", "limit", "grace"); +} + +static void kbytes2str(__u64 num, char *buf, bool h) { - printf("Disk quotas for %s %s (%cid %u):\n", - type2name(qctl->qc_type), name, - *type2name(qctl->qc_type), qctl->qc_id); - printf("%15s%8s %7s%8s%8s%8s %7s%8s%8s\n", - "Filesystem", - "kbytes", "quota", "limit", "grace", - "files", "quota", "limit", "grace"); + if (!h) { + sprintf(buf, LPU64, num); + } else { + if (num >> 30) + sprintf(buf, "%5.4gT", (double)num / (1 << 30)); + else if (num >> 20) + sprintf(buf, "%5.4gG", (double)num / (1 << 20)); + else if (num >> 10) + sprintf(buf, "%5.4gM", (double)num / (1 << 10)); + else + sprintf(buf, LPU64"%s", num, "k"); + } } -static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) +static void print_quota(char *mnt, struct if_quotactl *qctl, int type, + int rc, bool h) { time_t now; time(&now); if (qctl->qc_cmd == LUSTRE_Q_GETQUOTA || qctl->qc_cmd == Q_GETOQUOTA) { - int bover = 0, iover = 0; - struct obd_dqblk *dqb = &qctl->qc_dqblk; + int bover = 0, iover = 0; + struct obd_dqblk *dqb = &qctl->qc_dqblk; + char numbuf[3][32]; + char timebuf[40]; + char strbuf[32]; if (dqb->dqb_bhardlimit && - toqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { + lustre_stoqb(dqb->dqb_curspace) >= dqb->dqb_bhardlimit) { bover = 1; } else if (dqb->dqb_bsoftlimit && dqb->dqb_btime) { if (dqb->dqb_btime > now) { @@ -2560,61 +2902,60 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) } } -#if 0 /* XXX: always print quotas even when no usages */ - if (dqb->dqb_curspace || dqb->dqb_curinodes) -#endif - { - char numbuf[3][32]; - char timebuf[40]; - if (strlen(mnt) > 15) - printf("%s\n%15s", mnt, ""); - else - printf("%15s", mnt); + if (strlen(mnt) > 15) + printf("%s\n%15s", mnt, ""); + else + printf("%15s", mnt); + + if (bover) + diff2str(dqb->dqb_btime, timebuf, now); + + kbytes2str(lustre_stoqb(dqb->dqb_curspace), strbuf, h); + if (rc == -EREMOTEIO) + sprintf(numbuf[0], "%s*", strbuf); + else + sprintf(numbuf[0], (dqb->dqb_valid & QIF_SPACE) ? + "%s" : "[%s]", strbuf); + + kbytes2str(dqb->dqb_bsoftlimit, strbuf, h); + if (type == QC_GENERAL) + sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) ? + "%s" : "[%s]", strbuf); + else + sprintf(numbuf[1], "%s", "-"); + + kbytes2str(dqb->dqb_bhardlimit, strbuf, h); + sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) ? + "%s" : "[%s]", strbuf); + + printf(" %7s%c %6s %7s %7s", + numbuf[0], bover ? '*' : ' ', numbuf[1], + numbuf[2], bover > 1 ? timebuf : "-"); + + if (iover) + diff2str(dqb->dqb_itime, timebuf, now); + + sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? + LPU64 : "["LPU64"]", dqb->dqb_curinodes); + + if (type == QC_GENERAL) + sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) ? + LPU64 : "["LPU64"]", dqb->dqb_isoftlimit); + else + sprintf(numbuf[1], "%s", "-"); + + sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? + LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); + + if (type != QC_OSTIDX) + printf(" %7s%c %6s %7s %7s", + numbuf[0], iover ? '*' : ' ', numbuf[1], + numbuf[2], iover > 1 ? timebuf : "-"); + else + printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); + printf("\n"); - if (bover) - diff2str(dqb->dqb_btime, timebuf, now); - if (rc == -EREMOTEIO) - sprintf(numbuf[0], LPU64"*", - toqb(dqb->dqb_curspace)); - else - sprintf(numbuf[0], - (dqb->dqb_valid & QIF_SPACE) ? - LPU64 : "["LPU64"]", - toqb(dqb->dqb_curspace)); - if (type == QC_GENERAL) - sprintf(numbuf[1], (dqb->dqb_valid & QIF_BLIMITS) - ? LPU64 : "["LPU64"]", - dqb->dqb_bsoftlimit); - else - sprintf(numbuf[1], "%s", "-"); - sprintf(numbuf[2], (dqb->dqb_valid & QIF_BLIMITS) - ? LPU64 : "["LPU64"]", dqb->dqb_bhardlimit); - printf(" %7s%c %6s %7s %7s", - numbuf[0], bover ? '*' : ' ', numbuf[1], - numbuf[2], bover > 1 ? timebuf : "-"); - - if (iover) - diff2str(dqb->dqb_itime, timebuf, now); - - sprintf(numbuf[0], (dqb->dqb_valid & QIF_INODES) ? - LPU64 : "["LPU64"]", dqb->dqb_curinodes); - if (type == QC_GENERAL) - sprintf(numbuf[1], (dqb->dqb_valid & QIF_ILIMITS) - ? LPU64 : "["LPU64"]", - dqb->dqb_isoftlimit); - else - sprintf(numbuf[1], "%s", "-"); - sprintf(numbuf[2], (dqb->dqb_valid & QIF_ILIMITS) ? - LPU64 : "["LPU64"]", dqb->dqb_ihardlimit); - if (type != QC_OSTIDX) - printf(" %7s%c %6s %7s %7s", - numbuf[0], iover ? '*' : ' ', numbuf[1], - numbuf[2], iover > 1 ? timebuf : "-"); - else - printf(" %7s %7s %7s %7s", "-", "-", "-", "-"); - printf("\n"); - } } else if (qctl->qc_cmd == LUSTRE_Q_GETINFO || qctl->qc_cmd == Q_GETOINFO) { char bgtimebuf[40]; @@ -2627,7 +2968,8 @@ static void print_quota(char *mnt, struct if_quotactl *qctl, int type, int rc) } } -static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) +static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt, + bool h, __u64 *total) { int rc = 0, rc1 = 0, count = 0; __u32 valid = qctl->qc_valid; @@ -2656,29 +2998,33 @@ static int print_obd_quota(char *mnt, struct if_quotactl *qctl, int is_mdt) continue; } - print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, qctl->qc_valid, 0); - } - + print_quota(obd_uuid2str(&qctl->obd_uuid), qctl, + qctl->qc_valid, 0, h); + *total += is_mdt ? qctl->qc_dqblk.dqb_ihardlimit : + qctl->qc_dqblk.dqb_bhardlimit; + } out: - qctl->qc_valid = valid; - return rc ? : rc1; + qctl->qc_valid = valid; + return rc ? : rc1; } static int lfs_quota(int argc, char **argv) { - int c; - char *mnt, *name = NULL; - struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA, - .qc_type = UGQUOTA }; - char *obd_type = (char *)qctl.obd_type; - char *obd_uuid = (char *)qctl.obd_uuid.uuid; - int rc, rc1 = 0, rc2 = 0, rc3 = 0, - verbose = 0, pass = 0, quiet = 0, inacc; - char *endptr; - __u32 valid = QC_GENERAL, idx = 0; + int c; + char *mnt, *name = NULL; + struct if_quotactl qctl = { .qc_cmd = LUSTRE_Q_GETQUOTA, + .qc_type = UGQUOTA }; + char *obd_type = (char *)qctl.obd_type; + char *obd_uuid = (char *)qctl.obd_uuid.uuid; + int rc, rc1 = 0, rc2 = 0, rc3 = 0, + verbose = 0, pass = 0, quiet = 0, inacc; + char *endptr; + __u32 valid = QC_GENERAL, idx = 0; + __u64 total_ialloc = 0, total_balloc = 0; + bool human_readable = false; - optind = 0; - while ((c = getopt(argc, argv, "gi:I:o:qtuv")) != -1) { + optind = 0; + while ((c = getopt(argc, argv, "gi:I:o:qtuvh")) != -1) { switch (c) { case 'u': if (qctl.qc_type != UGQUOTA) { @@ -2699,7 +3045,7 @@ static int lfs_quota(int argc, char **argv) break; case 'o': valid = qctl.qc_valid = QC_UUID; - strncpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); + strlcpy(obd_uuid, optarg, sizeof(qctl.obd_uuid)); break; case 'i': valid = qctl.qc_valid = QC_MDTIDX; @@ -2715,6 +3061,9 @@ static int lfs_quota(int argc, char **argv) case 'q': quiet = 1; break; + case 'h': + human_readable = true; + break; default: fprintf(stderr, "error: %s: option '-%c' " "unrecognized\n", argv[0], c); @@ -2785,8 +3134,8 @@ ug_output: } } - if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) - print_quota_title(name, &qctl); + if (qctl.qc_cmd == LUSTRE_Q_GETQUOTA && !quiet) + print_quota_title(name, &qctl, human_readable); if (rc1 && *obd_type) fprintf(stderr, "%s %s ", obd_type, obd_uuid); @@ -2794,15 +3143,24 @@ ug_output: if (qctl.qc_valid != QC_GENERAL) mnt = ""; - inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) && - ((qctl.qc_dqblk.dqb_valid&(QIF_LIMITS|QIF_USAGE))!=(QIF_LIMITS|QIF_USAGE)); + inacc = (qctl.qc_cmd == LUSTRE_Q_GETQUOTA) && + ((qctl.qc_dqblk.dqb_valid & (QIF_LIMITS|QIF_USAGE)) != + (QIF_LIMITS|QIF_USAGE)); - print_quota(mnt, &qctl, QC_GENERAL, rc1); + print_quota(mnt, &qctl, QC_GENERAL, rc1, human_readable); - if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && verbose) { - rc2 = print_obd_quota(mnt, &qctl, 1); - rc3 = print_obd_quota(mnt, &qctl, 0); - } + if (qctl.qc_valid == QC_GENERAL && qctl.qc_cmd != LUSTRE_Q_GETINFO && + verbose) { + char strbuf[32]; + + rc2 = print_obd_quota(mnt, &qctl, 1, human_readable, + &total_ialloc); + rc3 = print_obd_quota(mnt, &qctl, 0, human_readable, + &total_balloc); + kbytes2str(total_balloc, strbuf, human_readable); + printf("Total allocated inode limit: "LPU64", total " + "allocated block limit: %s\n", total_ialloc, strbuf); + } if (rc1 || rc2 || rc3 || inacc) printf("Some errors happened when getting quota info. " @@ -2839,10 +3197,10 @@ static int flushctx_ioctl(char *mp) static int lfs_flushctx(int argc, char **argv) { - int kdestroy = 0, c; - FILE *proc = NULL; - char procline[PATH_MAX], *line; - int rc = 0; + int kdestroy = 0, c; + char mntdir[PATH_MAX] = {'\0'}; + int index = 0; + int rc = 0; optind = 0; while ((c = getopt(argc, argv, "k")) != -1) { @@ -2858,46 +3216,24 @@ static int lfs_flushctx(int argc, char **argv) } if (kdestroy) { - int rc; if ((rc = system("kdestroy > /dev/null")) != 0) { rc = WEXITSTATUS(rc); fprintf(stderr, "error destroying tickets: %d, continuing\n", rc); } } - if (optind >= argc) { - /* flush for all mounted lustre fs. */ - proc = fopen("/proc/mounts", "r"); - if (!proc) { - fprintf(stderr, "error: %s: can't open /proc/mounts\n", - argv[0]); - return -1; - } + if (optind >= argc) { + /* flush for all mounted lustre fs. */ + while (!llapi_search_mounts(NULL, index++, mntdir, NULL)) { + /* Check if we have a mount point */ + if (mntdir[0] == '\0') + continue; - while ((line = fgets(procline, PATH_MAX, proc)) != NULL) { - char dev[PATH_MAX]; - char mp[PATH_MAX]; - char fs[PATH_MAX]; - - if (sscanf(line, "%s %s %s", dev, mp, fs) != 3) { - fprintf(stderr, "%s: unexpected format in " - "/proc/mounts\n", - argv[0]); + if (flushctx_ioctl(mntdir)) rc = -1; - goto out; - } - if (strcmp(fs, "lustre") != 0) - continue; - /* we use '@' to determine it's a client. are there - * any other better way? - */ - if (strchr(dev, '@') == NULL) - continue; - - if (flushctx_ioctl(mp)) - rc = -1; - } + mntdir[0] = '\0'; /* avoid matching in next loop */ + } } else { /* flush fs as specified */ while (optind < argc) { @@ -2905,10 +3241,6 @@ static int lfs_flushctx(int argc, char **argv) rc = -1; } } - -out: - if (proc != NULL) - fclose(proc); return rc; } @@ -2949,7 +3281,7 @@ static int lfs_ls(int argc, char **argv) static int lfs_changelog(int argc, char **argv) { void *changelog_priv; - struct changelog_ext_rec *rec; + struct changelog_rec *rec; long long startrec = 0, endrec = 0; char *mdd; struct option long_opts[] = { @@ -2983,15 +3315,16 @@ static int lfs_changelog(int argc, char **argv) if (argc > optind) endrec = strtoll(argv[optind++], NULL, 10); - rc = llapi_changelog_start(&changelog_priv, - CHANGELOG_FLAG_BLOCK | - (follow ? CHANGELOG_FLAG_FOLLOW : 0), - mdd, startrec); - if (rc < 0) { - fprintf(stderr, "Can't start changelog: %s\n", - strerror(errno = -rc)); - return rc; - } + rc = llapi_changelog_start(&changelog_priv, + CHANGELOG_FLAG_BLOCK | + CHANGELOG_FLAG_JOBID | + (follow ? CHANGELOG_FLAG_FOLLOW : 0), + mdd, startrec); + if (rc < 0) { + fprintf(stderr, "Can't start changelog: %s\n", + strerror(errno = -rc)); + return rc; + } while ((rc = llapi_changelog_recv(changelog_priv, &rec)) == 0) { time_t secs; @@ -3006,27 +3339,42 @@ static int lfs_changelog(int argc, char **argv) continue; } - secs = rec->cr_time >> 30; - gmtime_r(&secs, &ts); - printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d " - "0x%x t="DFID, 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)), - ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, - rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); - if (rec->cr_namelen) - /* namespace rec includes parent and filename */ + secs = rec->cr_time >> 30; + gmtime_r(&secs, &ts); + printf(LPU64" %02d%-5s %02d:%02d:%02d.%06d %04d.%02d.%02d " + "0x%x t="DFID, 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)), + ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, + rec->cr_flags & CLF_FLAGMASK, PFID(&rec->cr_tfid)); + + if (rec->cr_flags & CLF_JOBID) { + struct changelog_ext_jobid *jid = + changelog_rec_jobid(rec); + + if (jid->cr_jobid[0] != '\0') + printf(" j=%s", jid->cr_jobid); + } + + if (rec->cr_namelen) printf(" p="DFID" %.*s", PFID(&rec->cr_pfid), - rec->cr_namelen, rec->cr_name); - if (fid_is_sane(&rec->cr_sfid)) - printf(" s="DFID" sp="DFID" %.*s", - PFID(&rec->cr_sfid), PFID(&rec->cr_spfid), - changelog_rec_snamelen(rec), - changelog_rec_sname(rec)); + rec->cr_namelen, changelog_rec_name(rec)); + + if (rec->cr_flags & CLF_RENAME) { + struct changelog_ext_rename *rnm = + changelog_rec_rename(rec); + + if (!fid_is_zero(&rnm->cr_sfid)) + printf(" s="DFID" sp="DFID" %.*s", + PFID(&rnm->cr_sfid), + PFID(&rnm->cr_spfid), + (int)changelog_rec_snamelen(rec), + changelog_rec_sname(rec)); + } printf("\n"); - llapi_changelog_free(&rec); + llapi_changelog_free(&rec); } llapi_changelog_fini(&changelog_priv); @@ -3098,6 +3446,10 @@ static int lfs_fid2path(int argc, char **argv) device = argv[optind++]; path = calloc(1, PATH_MAX); + if (path == NULL) { + fprintf(stderr, "error: Not enough memory\n"); + return -errno; + } rc = 0; while (optind < argc) { @@ -3144,33 +3496,75 @@ static int lfs_fid2path(int argc, char **argv) static int lfs_path2fid(int argc, char **argv) { - char **path; - const char *sep = ""; - lustre_fid fid; - int rc = 0; + struct option long_opts[] = { + {"parents", no_argument, 0, 'p'}, + {0, 0, 0, 0} + }; + char **path; + const char short_opts[] = "p"; + const char *sep = ""; + lustre_fid fid; + int rc = 0; + bool show_parents = false; - if (argc < 2) + optind = 0; + while ((rc = getopt_long(argc, argv, short_opts, + long_opts, NULL)) != -1) { + switch (rc) { + case 'p': + show_parents = true; + break; + default: + fprintf(stderr, "error: %s: option '%s' unrecognized\n", + argv[0], argv[optind - 1]); + return CMD_HELP; + } + } + + if (optind > argc - 1) return CMD_HELP; - else if (argc > 2) + else if (optind < argc - 1) sep = ": "; - path = argv + 1; - while (*path != NULL) { - int err = llapi_path2fid(*path, &fid); + rc = 0; + for (path = argv + optind; *path != NULL; path++) { + int err = 0; + if (!show_parents) { + err = llapi_path2fid(*path, &fid); + if (!err) + printf("%s%s"DFID"\n", + *sep != '\0' ? *path : "", sep, + PFID(&fid)); + } else { + char name[NAME_MAX + 1]; + unsigned int linkno = 0; + + while ((err = llapi_path2parent(*path, linkno, &fid, + name, sizeof(name))) == 0) { + if (*sep != '\0' && linkno == 0) + printf("%s%s", *path, sep); + + printf("%s"DFID"/%s", linkno != 0 ? "\t" : "", + PFID(&fid), name); + linkno++; + } + + /* err == -ENODATA is end-of-loop */ + if (linkno > 0 && err == -ENODATA) { + printf("\n"); + err = 0; + } + } if (err) { - fprintf(stderr, "%s: can't get fid for %s: %s\n", - argv[0], *path, strerror(-err)); + fprintf(stderr, "%s: can't get %sfid for %s: %s\n", + argv[0], show_parents ? "parent " : "", *path, + strerror(-err)); if (rc == 0) { rc = err; errno = -err; } - goto out; } - printf("%s%s"DFID"\n", *sep != '\0' ? *path : "", sep, - PFID(&fid)); -out: - path++; } return rc; @@ -3178,46 +3572,47 @@ out: static int lfs_data_version(int argc, char **argv) { - char *path; - __u64 data_version; - int fd; - int rc; - int c; - int nolock = 0; + char *path; + __u64 data_version; + int fd; + int rc; + int c; + int data_version_flags = LL_DV_RD_FLUSH; /* Read by default */ - if (argc < 2) - return CMD_HELP; + if (argc < 2) + return CMD_HELP; - optind = 0; - while ((c = getopt(argc, argv, "n")) != -1) { - switch (c) { - case 'n': - nolock = LL_DV_NOFLUSH; - break; - default: - return CMD_HELP; - } - } - if (optind == argc) - return CMD_HELP; + optind = 0; + while ((c = getopt(argc, argv, "nrw")) != -1) { + switch (c) { + case 'n': + data_version_flags = 0; + break; + case 'r': + data_version_flags |= LL_DV_RD_FLUSH; + break; + case 'w': + data_version_flags |= LL_DV_WR_FLUSH; + break; + default: + return CMD_HELP; + } + } + if (optind == argc) + return CMD_HELP; - path = argv[optind]; - fd = open(path, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "can't open %s: %s\n", path, - strerror(errno)); - return errno; - } + path = argv[optind]; + fd = open(path, O_RDONLY); + if (fd < 0) + err(errno, "cannot open file %s", path); - rc = llapi_get_data_version(fd, &data_version, nolock); - if (rc) { - fprintf(stderr, "can't get version for %s: %s\n", path, - strerror(errno = -rc)); - } else + rc = llapi_get_data_version(fd, &data_version, data_version_flags); + if (rc < 0) + err(errno, "cannot get version for %s", path); + else printf(LPU64 "\n", data_version); close(fd); - return rc; } @@ -3392,7 +3787,7 @@ static int lfs_hsm_action(int argc, char **argv) if ((hps == HPS_RUNNING) && (hua == HUA_ARCHIVE || hua == HUA_RESTORE)) printf("("LPX64 " bytes moved)\n", he.length); - else if ((he.offset + he.length) == OBD_OBJECT_EOF) + else if ((he.offset + he.length) == LUSTRE_EOF) printf("(from "LPX64 " to EOF)\n", he.offset); else printf("(from "LPX64 " to "LPX64")\n", @@ -3433,6 +3828,13 @@ static int lfs_hsm_prepare_file(char *file, struct lu_fid *fid, fprintf(stderr, "Cannot stat %s: %s\n", file, strerror(errno)); return -errno; } + /* Checking for regular file as archiving as posix copytool + * rejects archiving files other than regular files + */ + if (!S_ISREG(st.st_mode)) { + fprintf(stderr, "error: \"%s\" is not a regular file\n", file); + return CMD_HELP; + } /* A request should be ... */ if (*last_dev != st.st_dev && *last_dev != 0) { fprintf(stderr, "All files should be " @@ -3530,8 +3932,13 @@ static int lfs_hsm_request(int argc, char **argv, int action) hur->hur_request.hr_flags = 0; /* All remaining args are files, add them */ - if (nbfile != 0) - strcpy(some_file, argv[optind]); + if (nbfile != 0) { + if (strlen(argv[optind]) > sizeof(some_file)-1) { + free(hur); + return -E2BIG; + } + strncpy(some_file, argv[optind], sizeof(some_file)); + } for (i = 0; i < nbfile; i++) { hur->hur_user_item[i].hui_extent.length = -1; @@ -3561,19 +3968,33 @@ static int lfs_hsm_request(int argc, char **argv, int action) /* If allocated buffer was too small, gets something * bigger */ if (nbfile_alloc <= hur->hur_request.hr_itemcount) { + ssize_t size; nbfile_alloc = nbfile_alloc * 2 + 1; oldhur = hur; hur = llapi_hsm_user_request_alloc(nbfile_alloc, opaque_len); if (hur == NULL) { - fprintf(stderr, "Cannot allocate " + fprintf(stderr, "hsm: cannot allocate " "the request: %s\n", strerror(errno)); hur = oldhur; rc = -errno; + fclose(fp); goto out_free; } - memcpy(hur, oldhur, hur_len(oldhur)); + size = hur_len(oldhur); + if (size < 0) { + fprintf(stderr, "hsm: cannot allocate " + "%u files + %u bytes data\n", + oldhur->hur_request.hr_itemcount, + oldhur->hur_request.hr_data_len); + free(hur); + hur = oldhur; + rc = -E2BIG; + fclose(fp); + goto out_free; + } + memcpy(hur, oldhur, size); free(oldhur); } @@ -3587,8 +4008,10 @@ static int lfs_hsm_request(int argc, char **argv, int action) rc = lfs_hsm_prepare_file(line, &hui->hui_fid, &last_dev); hur->hur_request.hr_itemcount++; - if (rc) + if (rc) { + fclose(fp); goto out_free; + } if ((some_file[0] == '\0') && (strlen(line) < sizeof(some_file))) @@ -3663,11 +4086,7 @@ int main(int argc, char **argv) setlinebuf(stdout); - ptl_initialize(argc, argv); - if (obd_initialize(argc, argv) < 0) - exit(2); - - Parser_init("lfs > ", cmdlist); + Parser_init("lfs > ", cmdlist); if (argc > 1) { rc = Parser_execarg(argc - 1, argv + 1, cmdlist); @@ -3675,7 +4094,10 @@ int main(int argc, char **argv) rc = Parser_commands(); } - obd_finalize(argc, argv); return rc < 0 ? -rc : rc; } +#ifdef _LUSTRE_IDL_H_ +/* Everything we need here should be included by lustreapi.h. */ +# error "lfs should not depend on lustre_idl.h" +#endif /* _LUSTRE_IDL_H_ */