marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs-progs: let the error message outputed only once 

If we fail to execute the command:
		btrfs qgroup show <mnt>
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 <wangsl-fnst@cn.fujitsu.com>
master
Wang Shilong 2013-02-27 19:03:21 +08:00 committed by David Sterba
parent 5e24225670
commit 9f166a337c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds-qgroup.c
View File

@ -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;