Btrfs-progs: let the error message outputed only once
authorWang Shilong <wangsl-fnst@cn.fujitsu.com>
Wed, 27 Feb 2013 11:03:21 +0000 (19:03 +0800)
committerDavid Sterba <dsterba@suse.cz>
Wed, 27 Feb 2013 15:13:15 +0000 (16:13 +0100)
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>
cmds-qgroup.c

index 26f0ab0..79888c8 100644 (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;