diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:42:24 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:42:24 -0500 |
| commit | 7b1c567c84a6292c138db3bd1638e19e73e0e593 (patch) | |
| tree | 9ab6983c6fa2cbb837e9b782d1020899e0d2d846 /find-root.c | |
| parent | 5ffe6597e708d74c02d72d79ebb4a8fd2181e227 (diff) | |
| parent | 2161e1b6f35d1c084fda49b479951219117c86e9 (diff) | |
| download | btrfs-progs-7b1c567c84a6292c138db3bd1638e19e73e0e593.tar.gz | |
Merge branch 'for-chris' of git://repo.or.cz/btrfs-progs-unstable/devel into raid56
Conflicts:
ctree.h
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'find-root.c')
| -rw-r--r-- | find-root.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/find-root.c b/find-root.c index 43ac0b7..3d71323 100644 --- a/find-root.c +++ b/find-root.c @@ -35,13 +35,12 @@ #include "utils.h" #include "crc32c.h" -static int verbose = 0; static u16 csum_size = 0; static u64 search_objectid = BTRFS_ROOT_TREE_OBJECTID; static void usage() { - fprintf(stderr, "Usage: find-roots [-v] <device>\n"); + fprintf(stderr, "Usage: find-roots [-o search_objectid] <device>\n"); } int csum_block(void *buf, u32 len) @@ -415,11 +414,8 @@ int main(int argc, char **argv) int opt; int ret; - while ((opt = getopt(argc, argv, "vo:")) != -1) { + while ((opt = getopt(argc, argv, "o:")) != -1) { switch(opt) { - case 'v': - verbose++; - break; case 'o': errno = 0; search_objectid = (u64)strtoll(optarg, NULL, @@ -449,8 +445,11 @@ int main(int argc, char **argv) root = open_ctree_broken(dev_fd, argv[optind]); close(dev_fd); - if (!root) + + if (!root) { + fprintf(stderr, "Open ctree failed\n"); exit(1); + } csum_size = btrfs_super_csum_size(&root->fs_info->super_copy); ret = find_root(root); |