btrfs-progs: prop: also allow "none" to disable compression

[platform/upstream/btrfs-progs.git] / cmds-qgroup.c

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 6f07309..38382ea 100644 (file)
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -26,6 +26,7 @@
 #include "commands.h"
 #include "qgroup.h"
 #include "utils.h"
+#include "help.h"
 
 static const char * const qgroup_cmd_group_usage[] = {
        "btrfs qgroup <command> [options] <path>",
@@ -312,10 +313,11 @@ static int cmd_qgroup_show(int argc, char **argv)
        while (1) {
                int c;
                enum {
-                       GETOPT_VAL_SYNC = 256
+                       GETOPT_VAL_SORT = 256,
+                       GETOPT_VAL_SYNC
                };
                static const struct option long_options[] = {
-                       {"sort", required_argument, NULL, 'S'},
+                       {"sort", required_argument, NULL, GETOPT_VAL_SORT},
                        {"sync", no_argument, NULL, GETOPT_VAL_SYNC},
                        { NULL, 0, NULL, 0 }
                };
@@ -346,7 +348,7 @@ static int cmd_qgroup_show(int argc, char **argv)
                case 'f':
                        filter_flag |= 0x2;
                        break;
-               case 'S':
+               case GETOPT_VAL_SORT:
                        ret = btrfs_qgroup_parse_sort_string(optarg,
                                                             &comparer_set);
                        if (ret)
@@ -374,12 +376,9 @@ static int cmd_qgroup_show(int argc, char **argv)
 
        if (sync) {
                ret = ioctl(fd, BTRFS_IOC_SYNC);
-               if (ret < 0) {
-                       error("sync ioctl failed on '%s': %s", path,
+               if (ret < 0)
+                       warning("sync ioctl failed on '%s': %s", path,
                              strerror(errno));
-                       close_file_or_dir(fd, dirstream);
-                       goto out;
-               }
        }
 
        if (filter_flag) {