btrfs-progs: qgroup: show 'none' when we did not limit it on this qgroup
authorDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Wed, 3 Jun 2015 06:57:31 +0000 (14:57 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 5 Jun 2015 16:35:17 +0000 (18:35 +0200)
There are two understanding of the '0' value in btrfs qgroup show.
(1) is no-limitation on this qgroup. (2) is the max-limitation is 0.

This patch make it showing in different way.

(1) max-limitation for 0 is still showing '0'.
(2) no-limitation will show 'none'.

qgroupid         rfer         excl     max_rfer     max_excl parent
--------         ----         ----     --------     -------- ------
0/5           2.19GiB      2.19GiB         none         none ---
0/257       100.02MiB    100.02MiB         none         none ---

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Tested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
qgroup.c

index 53815b5408645ca7e3ecaab01224ce23066e94ae..dc04b033b145b77070e09e537bdd65a33343806c 100644 (file)
--- a/qgroup.c
+++ b/qgroup.c
@@ -237,10 +237,16 @@ static void print_qgroup_column(struct btrfs_qgroup *qgroup,
                print_qgroup_column_add_blank(BTRFS_QGROUP_PARENT, len);
                break;
        case BTRFS_QGROUP_MAX_RFER:
-               len = printf("%*s", max_len, pretty_size_mode(qgroup->max_rfer, unit_mode));
+               if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_RFER)
+                       len = printf("%*s", max_len, pretty_size_mode(qgroup->max_rfer, unit_mode));
+               else
+                       len = printf("%*s", max_len, "none");
                break;
        case BTRFS_QGROUP_MAX_EXCL:
-               len = printf("%*s", max_len, pretty_size_mode(qgroup->max_excl, unit_mode));
+               if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL)
+                       len = printf("%*s", max_len, pretty_size_mode(qgroup->max_excl, unit_mode));
+               else
+                       len = printf("%*s", max_len, "none");
                break;
        case BTRFS_QGROUP_CHILD:
                len = print_child_column(qgroup);