X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-filesystem.c;h=dec0f26bf6a3c2af63bbd1114fa13e094445b0d7;hb=5b2fbc6f4e93286273f9e7a67834a02004f3f875;hp=7998add6165f374d9278e3bf6d3f2fdeb3dacafb;hpb=c6cf9778e8f8dbdb0597edfd8adb712663b9e422;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 7998add..dec0f26 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -37,7 +37,7 @@ #include "cmds-fi-usage.h" #include "list_sort.h" #include "disk-io.h" - +#include "help.h" /* * for btrfs fi show, we maintain a hash of fsids we've already printed. @@ -58,7 +58,14 @@ static int is_seen_fsid(u8 *fsid) int slot = hash % SEEN_FSID_HASH_SIZE; struct seen_fsid *seen = seen_fsid_hash[slot]; - return seen ? 1 : 0; + while (seen) { + if (memcmp(seen->fsid, fsid, BTRFS_FSID_SIZE) == 0) + return 1; + + seen = seen->next; + } + + return 0; } static int add_seen_fsid(u8 *fsid) @@ -121,25 +128,16 @@ static const char * const filesystem_cmd_group_usage[] = { }; static const char * const cmd_filesystem_df_usage[] = { - "btrfs filesystem df [options] ", - "Show space usage information for a mount point", - "-b|--raw raw numbers in bytes", - "-h|--human-readable", - " human friendly numbers, base 1024 (default)", - "-H human friendly numbers, base 1000", - "--iec use 1024 as a base (KiB, MiB, GiB, TiB)", - "--si use 1000 as a base (kB, MB, GB, TB)", - "-k|--kbytes show sizes in KiB, or kB with --si", - "-m|--mbytes show sizes in MiB, or MB with --si", - "-g|--gbytes show sizes in GiB, or GB with --si", - "-t|--tbytes show sizes in TiB, or TB with --si", - NULL + "btrfs filesystem df [options] ", + "Show space usage information for a mount point", + HELPINFO_UNITS_SHORT_LONG, + NULL }; static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) { u64 count = 0; - int ret, e; + int ret; struct btrfs_ioctl_space_args *sargs; sargs = malloc(sizeof(struct btrfs_ioctl_space_args)); @@ -150,12 +148,10 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) sargs->total_spaces = 0; ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs); - e = errno; - if (ret) { - fprintf(stderr, "ERROR: couldn't get space info - %s\n", - strerror(e)); + if (ret < 0) { + error("cannot get space info: %s", strerror(errno)); free(sargs); - return -e; + return -errno; } /* This really should never happen */ if (!sargs->total_spaces) { @@ -173,12 +169,11 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) sargs->space_slots = count; sargs->total_spaces = 0; ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs); - e = errno; - if (ret) { - fprintf(stderr, "ERROR: get space info count %llu - %s\n", - count, strerror(e)); + if (ret < 0) { + error("cannot get space info with %llu slots: %s", + count, strerror(errno)); free(sargs); - return -e; + return -errno; } *sargs_ret = sargs; return 0; @@ -205,77 +200,28 @@ static int cmd_filesystem_df(int argc, char **argv) int fd; char *path; DIR *dirstream = NULL; - unsigned unit_mode = UNITS_DEFAULT; + unsigned unit_mode; - while (1) { - int c; - static const struct option long_options[] = { - { "raw", no_argument, NULL, 'b'}, - { "kbytes", no_argument, NULL, 'k'}, - { "mbytes", no_argument, NULL, 'm'}, - { "gbytes", no_argument, NULL, 'g'}, - { "tbytes", no_argument, NULL, 't'}, - { "si", no_argument, NULL, GETOPT_VAL_SI}, - { "iec", no_argument, NULL, GETOPT_VAL_IEC}, - { "human-readable", no_argument, NULL, - GETOPT_VAL_HUMAN_READABLE}, - { NULL, 0, NULL, 0 } - }; + unit_mode = get_unit_mode_from_arg(&argc, argv, 1); - c = getopt_long(argc, argv, "bhHkmgt", long_options, NULL); - if (c < 0) - break; - switch (c) { - case 'b': - unit_mode = UNITS_RAW; - break; - case 'k': - units_set_base(&unit_mode, UNITS_KBYTES); - break; - case 'm': - units_set_base(&unit_mode, UNITS_MBYTES); - break; - case 'g': - units_set_base(&unit_mode, UNITS_GBYTES); - break; - case 't': - units_set_base(&unit_mode, UNITS_TBYTES); - break; - case GETOPT_VAL_HUMAN_READABLE: - case 'h': - unit_mode = UNITS_HUMAN_BINARY; - break; - case 'H': - unit_mode = UNITS_HUMAN_DECIMAL; - break; - case GETOPT_VAL_SI: - units_set_mode(&unit_mode, UNITS_DECIMAL); - break; - case GETOPT_VAL_IEC: - units_set_mode(&unit_mode, UNITS_BINARY); - break; - default: - usage(cmd_filesystem_df_usage); - } - } + clean_args_no_options(argc, argv, cmd_filesystem_df_usage); - if (check_argc_exact(argc, optind + 1)) + if (check_argc_exact(argc - optind, 1)) usage(cmd_filesystem_df_usage); path = argv[optind]; - fd = open_file_or_dir(path, &dirstream); - if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", path); + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) return 1; - } + ret = get_df(fd, &sargs); if (ret == 0) { print_df(sargs, unit_mode); free(sargs); } else { - fprintf(stderr, "ERROR: get_df failed %s\n", strerror(-ret)); + error("get_df failed %s", strerror(-ret)); } close_file_or_dir(fd, dirstream); @@ -293,7 +239,7 @@ static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, if (!strncmp(uuidbuf, search, search_len)) return 1; - if (strlen(label) && strcmp(label, search) == 0) + if (*label && strcmp(label, search) == 0) return 1; if (strcmp(mnt, search) == 0) @@ -302,7 +248,7 @@ static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, return 0; } -static int uuid_search(struct btrfs_fs_devices *fs_devices, char *search) +static int uuid_search(struct btrfs_fs_devices *fs_devices, const char *search) { char uuidbuf[BTRFS_UUID_UNPARSED_SIZE]; struct list_head *cur; @@ -447,7 +393,7 @@ static u64 calc_used_bytes(struct btrfs_ioctl_space_args *si) static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info, struct btrfs_ioctl_dev_info_args *dev_info, struct btrfs_ioctl_space_args *space_info, - char *label, char *path, unsigned unit_mode) + char *label, unsigned unit_mode) { int i; int fd; @@ -463,7 +409,7 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info, return ret; uuid_unparse(fs_info->fsid, uuidbuf); - if (label && strlen(label)) + if (label && *label) printf("Label: '%s' ", label); else printf("Label: none "); @@ -518,65 +464,67 @@ static int btrfs_scan_kernel(void *search, unsigned unit_mode) memset(label, 0, sizeof(label)); while ((mnt = getmntent(f)) != NULL) { + free(dev_info_arg); + dev_info_arg = NULL; if (strcmp(mnt->mnt_type, "btrfs")) continue; ret = get_fs_info(mnt->mnt_dir, &fs_info_arg, &dev_info_arg); - if (ret) { - kfree(dev_info_arg); + if (ret) goto out; - } - if (get_label_mounted(mnt->mnt_dir, label)) { - kfree(dev_info_arg); + /* skip all fs already shown as mounted fs */ + if (is_seen_fsid(fs_info_arg.fsid)) + continue; + + ret = get_label_mounted(mnt->mnt_dir, label); + /* provide backward kernel compatibility */ + if (ret == -ENOTTY) + ret = get_label_unmounted( + (const char *)dev_info_arg->path, label); + + if (ret) goto out; - } + if (search && !match_search_item_kernel(fs_info_arg.fsid, mnt->mnt_dir, label, search)) { - kfree(dev_info_arg); continue; } fd = open(mnt->mnt_dir, O_RDONLY); if ((fd != -1) && !get_df(fd, &space_info_arg)) { print_one_fs(&fs_info_arg, dev_info_arg, - space_info_arg, label, mnt->mnt_dir, - unit_mode); - kfree(space_info_arg); + space_info_arg, label, unit_mode); + free(space_info_arg); memset(label, 0, sizeof(label)); found = 1; } if (fd != -1) close(fd); - kfree(dev_info_arg); } out: + free(dev_info_arg); endmntent(f); return !found; } -static int dev_to_fsid(char *dev, __u8 *fsid) +static int dev_to_fsid(const char *dev, __u8 *fsid) { struct btrfs_super_block *disk_super; - char *buf; + char buf[BTRFS_SUPER_INFO_SIZE]; int ret; int fd; - buf = malloc(4096); - if (!buf) - return -ENOMEM; - fd = open(dev, O_RDONLY); if (fd < 0) { ret = -errno; - free(buf); return ret; } disk_super = (struct btrfs_super_block *)buf; ret = btrfs_read_dev_super(fd, disk_super, - BTRFS_SUPER_INFO_OFFSET, 0); + BTRFS_SUPER_INFO_OFFSET, SBREAD_DEFAULT); if (ret) goto out; @@ -585,7 +533,6 @@ static int dev_to_fsid(char *dev, __u8 *fsid) out: close(fd); - free(buf); return ret; } @@ -732,7 +679,7 @@ static int search_umounted_fs_uuids(struct list_head *all_uuids, if (is_seen_fsid(cur_fs->fsid)) continue; - fs_copy = malloc(sizeof(*fs_copy)); + fs_copy = calloc(1, sizeof(*fs_copy)); if (!fs_copy) { ret = -ENOMEM; goto out; @@ -776,7 +723,7 @@ static int map_seed_devices(struct list_head *all_uuids) /* * open_ctree_* detects seed/sprout mapping */ - fs_info = open_ctree_fs_info(device->name, 0, 0, + fs_info = open_ctree_fs_info(device->name, 0, 0, 0, OPEN_CTREE_PARTIAL); if (!fs_info) continue; @@ -820,14 +767,7 @@ static const char * const cmd_filesystem_show_usage[] = { "Show the structure of a filesystem", "-d|--all-devices show only disks under /dev containing btrfs filesystem", "-m|--mounted show only mounted btrfs", - "--raw raw numbers in bytes", - "--human-readable human friendly numbers, base 1024 (default)", - "--iec use 1024 as a base (KiB, MiB, GiB, TiB)", - "--si use 1000 as a base (kB, MB, GB, TB)", - "--kbytes show sizes in KiB, or kB with --si", - "--mbytes show sizes in MiB, or MB with --si", - "--gbytes show sizes in GiB, or GB with --si", - "--tbytes show sizes in TiB, or TB with --si", + HELPINFO_UNITS_LONG, "If no argument is given, structure of all present filesystems is shown.", NULL }; @@ -845,23 +785,16 @@ static int cmd_filesystem_show(int argc, char **argv) char path[PATH_MAX]; __u8 fsid[BTRFS_FSID_SIZE]; char uuid_buf[BTRFS_UUID_UNPARSED_SIZE]; - unsigned unit_mode = UNITS_DEFAULT; + unsigned unit_mode; int found = 0; + unit_mode = get_unit_mode_from_arg(&argc, argv, 0); + while (1) { int c; static const struct option long_options[] = { { "all-devices", no_argument, NULL, 'd'}, { "mounted", no_argument, NULL, 'm'}, - { "raw", no_argument, NULL, GETOPT_VAL_RAW}, - { "kbytes", no_argument, NULL, GETOPT_VAL_KBYTES}, - { "mbytes", no_argument, NULL, GETOPT_VAL_MBYTES}, - { "gbytes", no_argument, NULL, GETOPT_VAL_GBYTES}, - { "tbytes", no_argument, NULL, GETOPT_VAL_TBYTES}, - { "si", no_argument, NULL, GETOPT_VAL_SI}, - { "iec", no_argument, NULL, GETOPT_VAL_IEC}, - { "human-readable", no_argument, NULL, - GETOPT_VAL_HUMAN_READABLE}, { NULL, 0, NULL, 0 } }; @@ -875,30 +808,6 @@ static int cmd_filesystem_show(int argc, char **argv) case 'm': where = BTRFS_SCAN_MOUNTED; break; - case GETOPT_VAL_RAW: - units_set_mode(&unit_mode, UNITS_RAW); - break; - case GETOPT_VAL_KBYTES: - units_set_base(&unit_mode, UNITS_KBYTES); - break; - case GETOPT_VAL_MBYTES: - units_set_base(&unit_mode, UNITS_MBYTES); - break; - case GETOPT_VAL_GBYTES: - units_set_base(&unit_mode, UNITS_GBYTES); - break; - case GETOPT_VAL_TBYTES: - units_set_base(&unit_mode, UNITS_TBYTES); - break; - case GETOPT_VAL_SI: - units_set_mode(&unit_mode, UNITS_DECIMAL); - break; - case GETOPT_VAL_IEC: - units_set_mode(&unit_mode, UNITS_BINARY); - break; - case GETOPT_VAL_HUMAN_READABLE: - units_set_mode(&unit_mode, UNITS_HUMAN_BINARY); - break; default: usage(cmd_filesystem_show_usage); } @@ -909,7 +818,7 @@ static int cmd_filesystem_show(int argc, char **argv) if (argc > optind) { search = argv[optind]; - if (strlen(search) == 0) + if (*search == 0) usage(cmd_filesystem_show_usage); type = check_arg_type(search); @@ -937,9 +846,7 @@ static int cmd_filesystem_show(int argc, char **argv) } else { ret = dev_to_fsid(search, fsid); if (ret) { - fprintf(stderr, - "ERROR: No btrfs on %s\n", - search); + error("no btrfs on %s", search); return 1; } uuid_unparse(fsid, uuid_buf); @@ -965,17 +872,16 @@ static int cmd_filesystem_show(int argc, char **argv) goto out; devs_only: - ret = btrfs_scan_lblkid(); + ret = btrfs_scan_devices(); if (ret) { - fprintf(stderr, "ERROR: %d while scanning\n", ret); + error("blkid device scan returned %d", ret); return 1; } ret = search_umounted_fs_uuids(&all_uuids, search, &found); if (ret < 0) { - fprintf(stderr, - "ERROR: %d while searching target device\n", ret); + error("searching target device returned error %d", ret); return 1; } @@ -985,24 +891,23 @@ devs_only: */ ret = map_seed_devices(&all_uuids); if (ret) { - fprintf(stderr, - "ERROR: %d while mapping seed devices\n", ret); + error("mapping seed devices returned error %d", ret); return 1; } list_for_each_entry(fs_devices, &all_uuids, list) print_one_uuid(fs_devices, unit_mode); - if (search && !found) + if (search && !found) { + error("not a valid btrfs filesystem: %s", search); ret = 1; - + } while (!list_empty(&all_uuids)) { fs_devices = list_entry(all_uuids.next, struct btrfs_fs_devices, list); free_fs_devices(fs_devices); } out: - printf("%s\n", PACKAGE_STRING); free_seen_fsid(); return ret; } @@ -1019,24 +924,22 @@ static int cmd_filesystem_sync(int argc, char **argv) char *path; DIR *dirstream = NULL; - if (check_argc_exact(argc, 2)) + clean_args_no_options(argc, argv, cmd_filesystem_sync_usage); + + if (check_argc_exact(argc - optind, 1)) usage(cmd_filesystem_sync_usage); - path = argv[1]; + path = argv[optind]; - fd = open_file_or_dir(path, &dirstream); - if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", path); + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) return 1; - } - printf("FSSync '%s'\n", path); res = ioctl(fd, BTRFS_IOC_SYNC); e = errno; close_file_or_dir(fd, dirstream); if( res < 0 ){ - fprintf(stderr, "ERROR: unable to fs-syncing '%s' - %s\n", - path, strerror(e)); + error("sync ioctl failed on '%s': %s", path, strerror(e)); return 1; } @@ -1049,8 +952,10 @@ static int parse_compress_type(char *s) return BTRFS_COMPRESS_ZLIB; else if (strcmp(optarg, "lzo") == 0) return BTRFS_COMPRESS_LZO; + else if (strcmp(optarg, "zstd") == 0) + return BTRFS_COMPRESS_ZSTD; else { - fprintf(stderr, "Unknown compress type %s\n", s); + error("unknown compression type %s", s); exit(1); }; } @@ -1059,30 +964,16 @@ static const char * const cmd_filesystem_defrag_usage[] = { "btrfs filesystem defragment [options] | [|...]", "Defragment a file or a directory", "", - "-v be verbose", - "-r defragment files recursively", - "-c[zlib,lzo] compress the file while defragmenting", - "-f flush data to disk immediately after defragmenting", - "-s start defragment only from byte onward", - "-l len defragment only up to len bytes", - "-t size target extent size hint", + "-v be verbose", + "-r defragment files recursively", + "-c[zlib,lzo,zstd] compress the file while defragmenting", + "-f flush data to disk immediately after defragmenting", + "-s start defragment only from byte onward", + "-l len defragment only up to len bytes", + "-t size target extent size hint (default: 32M)", NULL }; -static int do_defrag(int fd, int fancy_ioctl, - struct btrfs_ioctl_defrag_range_args *range) -{ - int ret; - - if (!fancy_ioctl) - ret = ioctl(fd, BTRFS_IOC_DEFRAG, NULL); - else - ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE, range); - - return ret; -} - -static int defrag_global_fancy_ioctl; static struct btrfs_ioctl_defrag_range_args defrag_global_range; static int defrag_global_verbose; static int defrag_global_errors; @@ -1090,33 +981,34 @@ static int defrag_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf) { int ret = 0; - int e = 0; + int err = 0; int fd = 0; if ((typeflag == FTW_F) && S_ISREG(sb->st_mode)) { if (defrag_global_verbose) printf("%s\n", fpath); fd = open(fpath, O_RDWR); - e = errno; - if (fd < 0) + if (fd < 0) { + err = errno; goto error; - ret = do_defrag(fd, defrag_global_fancy_ioctl, &defrag_global_range); - e = errno; + } + ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE, &defrag_global_range); close(fd); - if (ret && e == ENOTTY && defrag_global_fancy_ioctl) { - fprintf(stderr, "ERROR: defrag range ioctl not " - "supported in this kernel, please try " - "without any options.\n"); + if (ret && errno == ENOTTY) { + error( +"defrag range ioctl not supported in this kernel version, 2.6.33 and newer is required"); defrag_global_errors++; return ENOTTY; } - if (ret) + if (ret) { + err = errno; goto error; + } } return 0; error: - fprintf(stderr, "ERROR: defrag failed on %s - %s\n", fpath, strerror(e)); + error("defrag failed on %s: %s", fpath, strerror(err)); defrag_global_errors++; return 0; } @@ -1127,20 +1019,24 @@ static int cmd_filesystem_defrag(int argc, char **argv) int flush = 0; u64 start = 0; u64 len = (u64)-1; - u64 thresh = 0; + u64 thresh; int i; int recursive = 0; int ret = 0; - struct btrfs_ioctl_defrag_range_args range; - int e = 0; int compress_type = BTRFS_COMPRESS_NONE; DIR *dirstream; + /* + * Kernel has a different default (256K) that is supposed to be safe, + * but it does not defragment very well. The 32M will likely lead to + * better results and is independent of the kernel default. We have to + * use the v2 defrag ioctl. + */ + thresh = SZ_32M; + defrag_global_errors = 0; defrag_global_verbose = 0; defrag_global_errors = 0; - defrag_global_fancy_ioctl = 0; - optind = 1; while(1) { int c = getopt(argc, argv, "vrc::fs:l:t:"); if (c < 0) @@ -1151,31 +1047,27 @@ static int cmd_filesystem_defrag(int argc, char **argv) compress_type = BTRFS_COMPRESS_ZLIB; if (optarg) compress_type = parse_compress_type(optarg); - defrag_global_fancy_ioctl = 1; break; case 'f': flush = 1; - defrag_global_fancy_ioctl = 1; break; case 'v': defrag_global_verbose = 1; break; case 's': start = parse_size(optarg); - defrag_global_fancy_ioctl = 1; break; case 'l': len = parse_size(optarg); - defrag_global_fancy_ioctl = 1; break; case 't': thresh = parse_size(optarg); if (thresh > (u32)-1) { - fprintf(stderr, - "WARNING: target extent size %llu too big, trimmed to %u", + warning( + "target extent size %llu too big, trimmed to %u", thresh, (u32)-1); + thresh = (u32)-1; } - defrag_global_fancy_ioctl = 1; break; case 'r': recursive = 1; @@ -1188,7 +1080,7 @@ static int cmd_filesystem_defrag(int argc, char **argv) if (check_argc_min(argc - optind, 1)) usage(cmd_filesystem_defrag_usage); - memset(&defrag_global_range, 0, sizeof(range)); + memset(&defrag_global_range, 0, sizeof(defrag_global_range)); defrag_global_range.start = start; defrag_global_range.len = len; defrag_global_range.extent_thresh = (u32)thresh; @@ -1199,71 +1091,89 @@ static int cmd_filesystem_defrag(int argc, char **argv) if (flush) defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_START_IO; + /* + * Look for directory arguments and warn if the recursive mode is not + * requested, as this is not implemented as recursive defragmentation + * in kernel. The stat errors are silent here as we check them below. + */ + if (!recursive) { + int found = 0; + + for (i = optind; i < argc; i++) { + struct stat st; + + if (stat(argv[i], &st)) + continue; + + if (S_ISDIR(st.st_mode)) { + warning( + "directory specified but recursive mode not requested: %s", + argv[i]); + found = 1; + } + } + if (found) { + warning( +"a directory passed to the defrag ioctl will not process the files\n" +"recursively but will defragment the subvolume tree and the extent tree.\n" +"If this is not intended, please use option -r ."); + } + } + for (i = optind; i < argc; i++) { struct stat st; + int defrag_err = 0; dirstream = NULL; fd = open_file_or_dir(argv[i], &dirstream); if (fd < 0) { - fprintf(stderr, "ERROR: failed to open %s - %s\n", argv[i], + error("cannot open %s: %s", argv[i], strerror(errno)); defrag_global_errors++; close_file_or_dir(fd, dirstream); continue; } if (fstat(fd, &st)) { - fprintf(stderr, "ERROR: failed to stat %s - %s\n", + error("failed to stat %s: %s", argv[i], strerror(errno)); defrag_global_errors++; close_file_or_dir(fd, dirstream); continue; } if (!(S_ISDIR(st.st_mode) || S_ISREG(st.st_mode))) { - fprintf(stderr, - "ERROR: %s is not a directory or a regular file\n", - argv[i]); + error("%s is not a directory or a regular file", + argv[i]); defrag_global_errors++; close_file_or_dir(fd, dirstream); continue; } - if (recursive) { - if (S_ISDIR(st.st_mode)) { - ret = nftw(argv[i], defrag_callback, 10, + if (recursive && S_ISDIR(st.st_mode)) { + ret = nftw(argv[i], defrag_callback, 10, FTW_MOUNT | FTW_PHYS); - if (ret == ENOTTY) - exit(1); - /* errors are handled in the callback */ - ret = 0; - } else { - if (defrag_global_verbose) - printf("%s\n", argv[i]); - ret = do_defrag(fd, defrag_global_fancy_ioctl, - &defrag_global_range); - e = errno; - } + if (ret == ENOTTY) + exit(1); + /* errors are handled in the callback */ + ret = 0; } else { if (defrag_global_verbose) printf("%s\n", argv[i]); - ret = do_defrag(fd, defrag_global_fancy_ioctl, + ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE, &defrag_global_range); - e = errno; + defrag_err = errno; } close_file_or_dir(fd, dirstream); - if (ret && e == ENOTTY && defrag_global_fancy_ioctl) { - fprintf(stderr, "ERROR: defrag range ioctl not " - "supported in this kernel, please try " - "without any options.\n"); + if (ret && defrag_err == ENOTTY) { + error( +"defrag range ioctl not supported in this kernel version, 2.6.33 and newer is required"); defrag_global_errors++; break; } if (ret) { - fprintf(stderr, "ERROR: defrag failed on %s - %s\n", - argv[i], strerror(e)); + error("defrag failed on %s: %s", argv[i], + strerror(defrag_err)); defrag_global_errors++; } } - if (defrag_global_verbose) - printf("%s\n", PACKAGE_STRING); if (defrag_global_errors) fprintf(stderr, "total %d failures\n", defrag_global_errors); @@ -1287,38 +1197,35 @@ static int cmd_filesystem_resize(int argc, char **argv) DIR *dirstream = NULL; struct stat st; - if (check_argc_exact(argc, 3)) + clean_args_no_options_relaxed(argc, argv, cmd_filesystem_resize_usage); + + if (check_argc_exact(argc - optind, 2)) usage(cmd_filesystem_resize_usage); - amount = argv[1]; - path = argv[2]; + amount = argv[optind]; + path = argv[optind + 1]; len = strlen(amount); if (len == 0 || len >= BTRFS_VOL_NAME_MAX) { - fprintf(stderr, "ERROR: size value too long ('%s)\n", - amount); + error("resize value too long (%s)", amount); return 1; } res = stat(path, &st); if (res < 0) { - fprintf(stderr, "ERROR: resize: cannot stat %s: %s\n", - path, strerror(errno)); + error("resize: cannot stat %s: %s", path, strerror(errno)); return 1; } if (!S_ISDIR(st.st_mode)) { - fprintf(stderr, - "ERROR: resize works on mounted filesystems and accepts only\n" + error("resize works on mounted filesystems and accepts only\n" "directories as argument. Passing file containing a btrfs image\n" "would resize the underlying filesystem instead of the image.\n"); return 1; } - fd = open_file_or_dir(path, &dirstream); - if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", path); + fd = btrfs_open_dir(path, &dirstream, 1); + if (fd < 0) return 1; - } printf("Resize '%s' of '%s'\n", path, amount); memset(&args, 0, sizeof(args)); @@ -1327,18 +1234,23 @@ static int cmd_filesystem_resize(int argc, char **argv) e = errno; close_file_or_dir(fd, dirstream); if( res < 0 ){ - fprintf(stderr, "ERROR: unable to resize '%s' - %s\n", - path, strerror(e)); + switch (e) { + case EFBIG: + error("unable to resize '%s': no enough free space", + path); + break; + default: + error("unable to resize '%s': %s", path, strerror(e)); + break; + } return 1; } else if (res > 0) { const char *err_str = btrfs_err_str(res); if (err_str) { - fprintf(stderr, "ERROR: btrfs error resizing '%s' - %s\n", - path, err_str); + error("resizing of '%s' failed: %s", path, err_str); } else { - fprintf(stderr, - "ERROR: btrfs error resizing '%s' - unknown btrfs_err_code %d\n", + error("resizing of '%s' failed: unknown error %d", path, res); } return 1; @@ -1356,16 +1268,19 @@ static const char * const cmd_filesystem_label_usage[] = { static int cmd_filesystem_label(int argc, char **argv) { - if (check_argc_min(argc, 2) || check_argc_max(argc, 3)) + clean_args_no_options(argc, argv, cmd_filesystem_label_usage); + + if (check_argc_min(argc - optind, 1) || + check_argc_max(argc - optind, 2)) usage(cmd_filesystem_label_usage); - if (argc > 2) { - return set_label(argv[1], argv[2]); + if (argc - optind > 1) { + return set_label(argv[optind], argv[optind + 1]); } else { char label[BTRFS_LABEL_SIZE]; int ret; - ret = get_label(argv[1], label); + ret = get_label(argv[optind], label); if (!ret) fprintf(stdout, "%s\n", label); @@ -1379,6 +1294,7 @@ static const char filesystem_cmd_group_info[] = const struct cmd_group filesystem_cmd_group = { filesystem_cmd_group_usage, filesystem_cmd_group_info, { { "df", cmd_filesystem_df, cmd_filesystem_df_usage, NULL, 0 }, + { "du", cmd_filesystem_du, cmd_filesystem_du_usage, NULL, 0 }, { "show", cmd_filesystem_show, cmd_filesystem_show_usage, NULL, 0 }, { "sync", cmd_filesystem_sync, cmd_filesystem_sync_usage, NULL,