btrfs-progs: update CHANGES for v4.14.1

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

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 59a5926..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>",
@@ -272,8 +273,7 @@ static int cmd_qgroup_destroy(int argc, char **argv)
 }
 
 static const char * const cmd_qgroup_show_usage[] = {
-       "btrfs qgroup show -pcreFf "
-       "[--sort=qgroupid,rfer,excl,max_rfer,max_excl] <path>",
+       "btrfs qgroup show [options] <path>",
        "Show subvolume quota groups.",
        "-p             print parent qgroup id",
        "-c             print child qgroup id",
@@ -288,6 +288,7 @@ static const char * const cmd_qgroup_show_usage[] = {
        "               list qgroups sorted by specified items",
        "               you can use '+' or '-' in front of each item.",
        "               (+:ascending, -:descending, ascending default)",
+       "--sync         force sync of the filesystem before getting info",
        NULL
 };
 
@@ -300,6 +301,7 @@ static int cmd_qgroup_show(int argc, char **argv)
        u64 qgroupid;
        int filter_flag = 0;
        unsigned unit_mode;
+       int sync = 0;
 
        struct btrfs_qgroup_comparer_set *comparer_set;
        struct btrfs_qgroup_filter_set *filter_set;
@@ -310,8 +312,13 @@ static int cmd_qgroup_show(int argc, char **argv)
 
        while (1) {
                int c;
+               enum {
+                       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 }
                };
 
@@ -341,12 +348,15 @@ 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)
                                usage(cmd_qgroup_show_usage);
                        break;
+               case GETOPT_VAL_SYNC:
+                       sync = 1;
+                       break;
                default:
                        usage(cmd_qgroup_show_usage);
                }
@@ -364,6 +374,13 @@ static int cmd_qgroup_show(int argc, char **argv)
                return 1;
        }
 
+       if (sync) {
+               ret = ioctl(fd, BTRFS_IOC_SYNC);
+               if (ret < 0)
+                       warning("sync ioctl failed on '%s': %s", path,
+                             strerror(errno));
+       }
+
        if (filter_flag) {
                ret = lookup_path_rootid(fd, &qgroupid);
                if (ret < 0) {
@@ -382,9 +399,11 @@ static int cmd_qgroup_show(int argc, char **argv)
                                        qgroupid);
        }
        ret = btrfs_show_qgroups(fd, filter_set, comparer_set);
-       close_file_or_dir(fd, dirstream);
-       if (ret < 0)
+       if (ret == -ENOENT)
+               error("can't list qgroups: quotas not enabled");
+       else if (ret < 0)
                error("can't list qgroups: %s", strerror(-ret));
+       close_file_or_dir(fd, dirstream);
 
 out:
        return !!ret;