btrfs-progs: Use common unit parser for btrfs qgroup command

Move to use get_unit_mode_from_arg() for btrfs qgroup command,
to make "btrfs qgroup show"'s unit argument same with other
tools.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index d58df5e..48c1733 100644 (file)
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -275,15 +275,7 @@ static const char * const cmd_qgroup_show_usage[] = {
        "               (including ancestral qgroups)",
        "-f             list all qgroups which impact the given path",
        "               (excluding ancestral qgroups)",
-       "--raw          raw numbers in bytes",
-       "--human-readable",
-       "               human firendly numbers in given base, 1024 by default",
-       "--iec          use 1024 as a base (KiB, MiB, GiB, TiB)",
-       "--si           use 1000 as a base (kB, MB, GB, TB)",
-       "--kbytes       show sizes in KiB, or kB with --si",
-       "--mbytes       show sizes in MiB, or MB with --si",
-       "--gbytes       show sizes in GiB, or GB with --si",
-       "--tbytes       show sizes in TiB, or TB with --si",
+       HELPINFO_OUTPUT_UNIT,
        "--sort=qgroupid,rfer,excl,max_rfer,max_excl",
        "               list qgroups sorted by specified items",
        "               you can use '+' or '-' in front of each item.",
@@ -300,27 +292,20 @@ static int cmd_qgroup_show(int argc, char **argv)
        DIR *dirstream = NULL;
        u64 qgroupid;
        int filter_flag = 0;
-       unsigned unit_mode = UNITS_DEFAULT;
+       unsigned unit_mode;
 
        struct btrfs_qgroup_comparer_set *comparer_set;
        struct btrfs_qgroup_filter_set *filter_set;
        filter_set = btrfs_qgroup_alloc_filter_set();
        comparer_set = btrfs_qgroup_alloc_comparer_set();
 
+       unit_mode = get_unit_mode_from_arg(&argc, argv, 0);
+
        optind = 1;
        while (1) {
                int c;
                static const struct option long_options[] = {
                        {"sort", required_argument, NULL, 'S'},
-                       {"raw", no_argument, NULL, GETOPT_VAL_RAW},
-                       {"kbytes", no_argument, NULL, GETOPT_VAL_KBYTES},
-                       {"mbytes", no_argument, NULL, GETOPT_VAL_MBYTES},
-                       {"gbytes", no_argument, NULL, GETOPT_VAL_GBYTES},
-                       {"tbytes", no_argument, NULL, GETOPT_VAL_TBYTES},
-                       {"si", no_argument, NULL, GETOPT_VAL_SI},
-                       {"iec", no_argument, NULL, GETOPT_VAL_IEC},
-                       { "human-readable", no_argument, NULL,
-                               GETOPT_VAL_HUMAN_READABLE},
                        { NULL, 0, NULL, 0 }
                };
 
@@ -356,30 +341,6 @@ static int cmd_qgroup_show(int argc, char **argv)
                        if (ret)
                                usage(cmd_qgroup_show_usage);
                        break;
-               case GETOPT_VAL_RAW:
-                       unit_mode = UNITS_RAW;
-                       break;
-               case GETOPT_VAL_KBYTES:
-                       units_set_base(&unit_mode, UNITS_KBYTES);
-                       break;
-               case GETOPT_VAL_MBYTES:
-                       units_set_base(&unit_mode, UNITS_MBYTES);
-                       break;
-               case GETOPT_VAL_GBYTES:
-                       units_set_base(&unit_mode, UNITS_GBYTES);
-                       break;
-               case GETOPT_VAL_TBYTES:
-                       units_set_base(&unit_mode, UNITS_TBYTES);
-                       break;
-               case GETOPT_VAL_SI:
-                       units_set_mode(&unit_mode, UNITS_DECIMAL);
-                       break;
-               case GETOPT_VAL_IEC:
-                       units_set_mode(&unit_mode, UNITS_BINARY);
-                       break;
-               case GETOPT_VAL_HUMAN_READABLE:
-                       unit_mode = UNITS_HUMAN_BINARY;
-                       break;
                default:
                        usage(cmd_qgroup_show_usage);
                }