From 9f166a337cbadcc98673e5f171aff7cd8b5936f2 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Wed, 27 Feb 2013 19:03:21 +0800 Subject: Btrfs-progs: let the error message outputed only once If we fail to execute the command: btrfs qgroup show It will output the follow messages: ERROR: can't perform the search - Inappropriate ioctl for device ERROR: can't list qgroups The error is outputed twice, this is wrong, fix it. Signed-off-by: Wang Shilong --- cmds-qgroup.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cmds-qgroup.c') diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 26f0ab0..79888c8 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -120,7 +120,6 @@ int list_qgroups(int fd) struct btrfs_ioctl_search_header *sh; unsigned long off = 0; unsigned int i; - int e; struct btrfs_qgroup_info_item *info; memset(&args, 0, sizeof(args)); @@ -143,13 +142,9 @@ int list_qgroups(int fd) while (1) { ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); - e = errno; - if (ret < 0) { - fprintf(stderr, - "ERROR: can't perform the search - %s\n", - strerror(e)); + if (ret < 0) return ret; - } + /* the ioctl returns the number of item it found in nr_items */ if (sk->nr_items == 0) break; -- cgit v1.2.1