From c88c2f52fed9554306036385c5c15c012ba49629 Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Mon, 21 Jan 2013 16:57:25 +0100 Subject: btrfs-progs: Handle errors returned from open_ctree Signed-off-by: Danny Kukawka Signed-off-by: David Sterba --- find-root.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'find-root.c') diff --git a/find-root.c b/find-root.c index c0f38b88..83f1592b 100644 --- a/find-root.c +++ b/find-root.c @@ -448,8 +448,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); -- cgit v1.2.3 From 7f04a61b6da5a1231454b07e3e37cc24601a76e4 Mon Sep 17 00:00:00 2001 From: Wang Sheng-Hui Date: Sun, 18 Nov 2012 10:13:20 +0800 Subject: btrfs-progs: update options in find-root.c Remove the useless option "-v" and add the option "-o" in the description of usage. Signed-off-by: Wang Sheng-Hui --- find-root.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'find-root.c') diff --git a/find-root.c b/find-root.c index 83f1592b..51e9a233 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] \n"); + fprintf(stderr, "Usage: find-roots [-o search_objectid] \n"); } int csum_block(void *buf, u32 len) @@ -414,11 +413,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, -- cgit v1.2.3