X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-inspect.c;h=afd7fe48df5cc6aba8642401ea2b6b8c835d3240;hb=8bcac688beff3b8b863633744f0fb5f6d77e4ed9;hp=05f1ccf9d0152aa62a480eb6921088394b670702;hpb=934dd0e1f720b3c1feb06e8b5db519f6bb2565e8;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/cmds-inspect.c b/cmds-inspect.c index 05f1ccf..afd7fe4 100644 --- a/cmds-inspect.c +++ b/cmds-inspect.c @@ -20,15 +20,18 @@ #include #include #include +#include +#include #include "kerncompat.h" #include "ioctl.h" #include "utils.h" #include "ctree.h" #include "send-utils.h" - +#include "disk-io.h" #include "commands.h" #include "btrfs-list.h" +#include "help.h" static const char * const inspect_cmd_group_usage[] = { "btrfs inspect-internal ", @@ -40,20 +43,16 @@ static int __ino_to_path_fd(u64 inum, int fd, int verbose, const char *prepend) int ret; int i; struct btrfs_ioctl_ino_path_args ipa; - struct btrfs_data_container *fspath; - - fspath = malloc(4096); - if (!fspath) - return -ENOMEM; + struct btrfs_data_container fspath[PATH_MAX]; memset(fspath, 0, sizeof(*fspath)); ipa.inum = inum; - ipa.size = 4096; + ipa.size = PATH_MAX; ipa.fspath = ptr_to_u64(fspath); ret = ioctl(fd, BTRFS_IOC_INO_PATHS, &ipa); - if (ret) { - printf("ioctl ret=%d, error: %s\n", ret, strerror(errno)); + if (ret < 0) { + error("ino paths ioctl: %m"); goto out; } @@ -77,11 +76,10 @@ static int __ino_to_path_fd(u64 inum, int fd, int verbose, const char *prepend) } out: - free(fspath); return !!ret; } -static const char * const cmd_inode_resolve_usage[] = { +static const char * const cmd_inspect_inode_resolve_usage[] = { "btrfs inspect-internal inode-resolve [-v] ", "Get file system paths for the given inode", "", @@ -89,14 +87,13 @@ static const char * const cmd_inode_resolve_usage[] = { NULL }; -static int cmd_inode_resolve(int argc, char **argv) +static int cmd_inspect_inode_resolve(int argc, char **argv) { int fd; int verbose = 0; int ret; DIR *dirstream = NULL; - optind = 1; while (1) { int c = getopt(argc, argv, "v"); if (c < 0) @@ -107,18 +104,16 @@ static int cmd_inode_resolve(int argc, char **argv) verbose = 1; break; default: - usage(cmd_inode_resolve_usage); + usage(cmd_inspect_inode_resolve_usage); } } if (check_argc_exact(argc - optind, 2)) - usage(cmd_inode_resolve_usage); + usage(cmd_inspect_inode_resolve_usage); - fd = open_file_or_dir(argv[optind+1], &dirstream); - if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind+1]); + fd = btrfs_open_dir(argv[optind + 1], &dirstream, 1); + if (fd < 0) return 1; - } ret = __ino_to_path_fd(arg_strtou64(argv[optind]), fd, verbose, argv[optind+1]); @@ -127,7 +122,7 @@ static int cmd_inode_resolve(int argc, char **argv) } -static const char * const cmd_logical_resolve_usage[] = { +static const char * const cmd_inspect_logical_resolve_usage[] = { "btrfs inspect-internal logical-resolve [-Pv] [-s bufsize] ", "Get file system paths for the given logical address", "-P skip the path resolving and print the inodes instead", @@ -138,7 +133,7 @@ static const char * const cmd_logical_resolve_usage[] = { NULL }; -static int cmd_logical_resolve(int argc, char **argv) +static int cmd_inspect_logical_resolve(int argc, char **argv) { int ret; int fd; @@ -149,11 +144,10 @@ static int cmd_logical_resolve(int argc, char **argv) struct btrfs_ioctl_logical_ino_args loi; struct btrfs_data_container *inodes; u64 size = 4096; - char full_path[4096]; + char full_path[PATH_MAX]; char *path_ptr; DIR *dirstream = NULL; - optind = 1; while (1) { int c = getopt(argc, argv, "Pvs:"); if (c < 0) @@ -170,14 +164,14 @@ static int cmd_logical_resolve(int argc, char **argv) size = arg_strtou64(optarg); break; default: - usage(cmd_logical_resolve_usage); + usage(cmd_inspect_logical_resolve_usage); } } if (check_argc_exact(argc - optind, 2)) - usage(cmd_logical_resolve_usage); + usage(cmd_inspect_logical_resolve_usage); - size = min(size, (u64)64 * 1024); + size = min(size, (u64)SZ_64K); inodes = malloc(size); if (!inodes) return 1; @@ -187,16 +181,15 @@ static int cmd_logical_resolve(int argc, char **argv) loi.size = size; loi.inodes = ptr_to_u64(inodes); - fd = open_file_or_dir(argv[optind+1], &dirstream); + fd = btrfs_open_dir(argv[optind + 1], &dirstream, 1); if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind+1]); ret = 12; goto out; } ret = ioctl(fd, BTRFS_IOC_LOGICAL_INO, &loi); - if (ret) { - printf("ioctl ret=%d, error: %s\n", ret, strerror(errno)); + if (ret < 0) { + error("logical ino ioctl: %m"); goto out; } @@ -212,7 +205,10 @@ static int cmd_logical_resolve(int argc, char **argv) ret = snprintf(full_path, bytes_left, "%s/", argv[optind+1]); path_ptr = full_path + ret; bytes_left -= ret + 1; - BUG_ON(bytes_left < 0); + if (bytes_left < 0) { + error("path buffer too small: %d bytes", bytes_left); + goto out; + } for (i = 0; i < inodes->elem_cnt; i += 3) { u64 inum = inodes->val[i]; @@ -235,12 +231,15 @@ static int cmd_logical_resolve(int argc, char **argv) path_ptr[-1] = '/'; ret = snprintf(path_ptr, bytes_left, "%s", name); - BUG_ON(ret >= bytes_left); free(name); - path_fd = open_file_or_dir(full_path, &dirs); + if (ret >= bytes_left) { + error("path buffer too small: %d bytes", + bytes_left - ret); + goto out; + } + path_fd = btrfs_open_dir(full_path, &dirs, 1); if (path_fd < 0) { - fprintf(stderr, "ERROR: can't access " - "'%s'\n", full_path); + ret = -ENOENT; goto out; } } @@ -259,13 +258,13 @@ out: return !!ret; } -static const char * const cmd_subvolid_resolve_usage[] = { +static const char * const cmd_inspect_subvolid_resolve_usage[] = { "btrfs inspect-internal subvolid-resolve ", "Get file system paths for the given subvolume ID.", NULL }; -static int cmd_subvolid_resolve(int argc, char **argv) +static int cmd_inspect_subvolid_resolve(int argc, char **argv) { int ret; int fd = -1; @@ -273,23 +272,23 @@ static int cmd_subvolid_resolve(int argc, char **argv) char path[PATH_MAX]; DIR *dirstream = NULL; - if (check_argc_exact(argc, 3)) - usage(cmd_subvolid_resolve_usage); + clean_args_no_options(argc, argv, cmd_inspect_subvolid_resolve_usage); - fd = open_file_or_dir(argv[2], &dirstream); + if (check_argc_exact(argc - optind, 2)) + usage(cmd_inspect_subvolid_resolve_usage); + + fd = btrfs_open_dir(argv[optind + 1], &dirstream, 1); if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", argv[2]); ret = -ENOENT; goto out; } - subvol_id = arg_strtou64(argv[1]); + subvol_id = arg_strtou64(argv[optind]); ret = btrfs_subvolid_resolve(fd, path, sizeof(path), subvol_id); if (ret) { - fprintf(stderr, - "%s: btrfs_subvolid_resolve(subvol_id %llu) failed with ret=%d\n", - argv[0], (unsigned long long)subvol_id, ret); + error("resolving subvolid %llu error %d", + (unsigned long long)subvol_id, ret); goto out; } @@ -298,36 +297,36 @@ static int cmd_subvolid_resolve(int argc, char **argv) out: close_file_or_dir(fd, dirstream); - return ret ? 1 : 0; + return !!ret; } -static const char* const cmd_rootid_usage[] = { +static const char* const cmd_inspect_rootid_usage[] = { "btrfs inspect-internal rootid ", "Get tree ID of the containing subvolume of path.", NULL }; -static int cmd_rootid(int argc, char **argv) +static int cmd_inspect_rootid(int argc, char **argv) { int ret; int fd = -1; u64 rootid; DIR *dirstream = NULL; - if (check_argc_exact(argc, 2)) - usage(cmd_rootid_usage); + clean_args_no_options(argc, argv, cmd_inspect_rootid_usage); - fd = open_file_or_dir(argv[1], &dirstream); + if (check_argc_exact(argc - optind, 1)) + usage(cmd_inspect_rootid_usage); + + fd = btrfs_open_file_or_dir(argv[optind], &dirstream, 1); if (fd < 0) { - fprintf(stderr, "ERROR: can't access '%s'\n", argv[1]); ret = -ENOENT; goto out; } - ret = lookup_ino_rootid(fd, &rootid); + ret = lookup_path_rootid(fd, &rootid); if (ret) { - fprintf(stderr, "%s: rootid failed with ret=%d\n", - argv[0], ret); + error("failed to lookup root id: %s", strerror(-ret)); goto out; } @@ -338,6 +337,14 @@ out: return !!ret; } +static const char* const cmd_inspect_min_dev_size_usage[] = { + "btrfs inspect-internal min-dev-size [options] ", + "Get the minimum size the device can be shrunk to. The", + "device id 1 is used by default.", + "--id DEVID specify the device id to query", + NULL +}; + struct dev_extent_elem { u64 start; /* inclusive end */ @@ -411,7 +418,7 @@ static void adjust_dev_min_size(struct list_head *extents, /* * List of device extents is sorted by descending order of the extent's * end offset. If some extent goes beyond the computed minimum size, - * which initially matches the sum of the lenghts of all extents, + * which initially matches the sum of the lengths of all extents, * we need to check if the extent can be relocated to an hole in the * device between [0, *min_size[ (which is what the resize ioctl does). */ @@ -477,11 +484,11 @@ static void adjust_dev_min_size(struct list_head *extents, * chunk tree, so often this can lead to the need of allocating * a new system chunk too, which has a maximum size of 32Mb. */ - *min_size += 32 * 1024 * 1024; + *min_size += SZ_32M; } } -static int get_min_size(int fd, DIR *dirstream, u64 devid) +static int print_min_dev_size(int fd, u64 devid) { int ret = 1; /* @@ -491,7 +498,7 @@ static int get_min_size(int fd, DIR *dirstream, u64 devid) * possibility of deprecating/removing it has been discussed, so we * ignore it here. */ - u64 min_size = 1 * 1024 * 1024ull; + u64 min_size = SZ_1M; struct btrfs_ioctl_search_args args; struct btrfs_ioctl_search_key *sk = &args.key; u64 last_pos = (u64)-1; @@ -517,9 +524,7 @@ static int get_min_size(int fd, DIR *dirstream, u64 devid) ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); if (ret < 0) { - fprintf(stderr, - "Error invoking tree search ioctl: %s\n", - strerror(errno)); + error("tree search ioctl: %m"); ret = 1; goto out; } @@ -535,32 +540,33 @@ static int get_min_size(int fd, DIR *dirstream, u64 devid) off); off += sizeof(*sh); extent = (struct btrfs_dev_extent *)(args.buf + off); - off += sh->len; + off += btrfs_search_header_len(sh); - sk->min_objectid = sh->objectid; - sk->min_type = sh->type; - sk->min_offset = sh->offset + 1; + sk->min_objectid = btrfs_search_header_objectid(sh); + sk->min_type = btrfs_search_header_type(sh); + sk->min_offset = btrfs_search_header_offset(sh) + 1; - if (sh->objectid != devid || - sh->type != BTRFS_DEV_EXTENT_KEY) + if (btrfs_search_header_objectid(sh) != devid || + btrfs_search_header_type(sh) != BTRFS_DEV_EXTENT_KEY) continue; len = btrfs_stack_dev_extent_length(extent); min_size += len; - ret = add_dev_extent(&extents, sh->offset, - sh->offset + len - 1, 0); + ret = add_dev_extent(&extents, + btrfs_search_header_offset(sh), + btrfs_search_header_offset(sh) + len - 1, 0); if (!ret && last_pos != (u64)-1 && - last_pos != sh->offset) + last_pos != btrfs_search_header_offset(sh)) ret = add_dev_extent(&holes, last_pos, - sh->offset - 1, 1); + btrfs_search_header_offset(sh) - 1, 1); if (ret) { - fprintf(stderr, "Error: %s\n", strerror(-ret)); + error("add device extent: %s", strerror(-ret)); ret = 1; goto out; } - last_pos = sh->offset + len; + last_pos = btrfs_search_header_offset(sh) + len; } if (sk->min_type != BTRFS_DEV_EXTENT_KEY || @@ -572,25 +578,75 @@ static int get_min_size(int fd, DIR *dirstream, u64 devid) printf("%llu bytes (%s)\n", min_size, pretty_size(min_size)); ret = 0; out: - close_file_or_dir(fd, dirstream); free_dev_extent_list(&extents); free_dev_extent_list(&holes); return ret; } +static int cmd_inspect_min_dev_size(int argc, char **argv) +{ + int ret; + int fd = -1; + DIR *dirstream = NULL; + u64 devid = 1; + + while (1) { + int c; + enum { GETOPT_VAL_DEVID = 256 }; + static const struct option long_options[] = { + { "id", required_argument, NULL, GETOPT_VAL_DEVID }, + {NULL, 0, NULL, 0} + }; + + c = getopt_long(argc, argv, "", long_options, NULL); + if (c < 0) + break; + + switch (c) { + case GETOPT_VAL_DEVID: + devid = arg_strtou64(optarg); + break; + default: + usage(cmd_inspect_min_dev_size_usage); + } + } + if (check_argc_exact(argc - optind, 1)) + usage(cmd_inspect_min_dev_size_usage); + + fd = btrfs_open_dir(argv[optind], &dirstream, 1); + if (fd < 0) { + ret = -ENOENT; + goto out; + } + + ret = print_min_dev_size(fd, devid); + close_file_or_dir(fd, dirstream); +out: + return !!ret; +} + static const char inspect_cmd_group_info[] = "query various internal information"; const struct cmd_group inspect_cmd_group = { inspect_cmd_group_usage, inspect_cmd_group_info, { - { "inode-resolve", cmd_inode_resolve, cmd_inode_resolve_usage, - NULL, 0 }, - { "logical-resolve", cmd_logical_resolve, - cmd_logical_resolve_usage, NULL, 0 }, - { "subvolid-resolve", cmd_subvolid_resolve, - cmd_subvolid_resolve_usage, NULL, 0 }, - { "rootid", cmd_rootid, cmd_rootid_usage, NULL, 0 }, + { "inode-resolve", cmd_inspect_inode_resolve, + cmd_inspect_inode_resolve_usage, NULL, 0 }, + { "logical-resolve", cmd_inspect_logical_resolve, + cmd_inspect_logical_resolve_usage, NULL, 0 }, + { "subvolid-resolve", cmd_inspect_subvolid_resolve, + cmd_inspect_subvolid_resolve_usage, NULL, 0 }, + { "rootid", cmd_inspect_rootid, cmd_inspect_rootid_usage, NULL, + 0 }, + { "min-dev-size", cmd_inspect_min_dev_size, + cmd_inspect_min_dev_size_usage, NULL, 0 }, + { "dump-tree", cmd_inspect_dump_tree, + cmd_inspect_dump_tree_usage, NULL, 0 }, + { "dump-super", cmd_inspect_dump_super, + cmd_inspect_dump_super_usage, NULL, 0 }, + { "tree-stats", cmd_inspect_tree_stats, + cmd_inspect_tree_stats_usage, NULL, 0 }, NULL_CMD_STRUCT } };