diff options
| -rw-r--r-- | cmds-qgroup.c | 20 | ||||
| -rw-r--r-- | qgroup.c | 16 | ||||
| -rw-r--r-- | qgroup.h | 1 |
3 files changed, 31 insertions, 6 deletions
diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 7c6c9176..5f1550a7 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -202,7 +202,7 @@ static int cmd_qgroup_destroy(int argc, char **argv) } static const char * const cmd_qgroup_show_usage[] = { - "btrfs qgroup show -pcreF <path>", + "btrfs qgroup show -pcreFf <path>", "Show subvolume quota groups.", "-p print parent qgroup id", "-c print child qgroup id", @@ -210,6 +210,8 @@ static const char * const cmd_qgroup_show_usage[] = { "-e print max exclusive size of qgroup", "-F list all qgroups which impact the given path" "(include ancestral qgroups)", + "-f list all qgroups which impact the given path" + "(exclude ancestral qgroups)", NULL }; @@ -229,7 +231,7 @@ static int cmd_qgroup_show(int argc, char **argv) optind = 1; while (1) { - c = getopt(argc, argv, "pcreF"); + c = getopt(argc, argv, "pcreFf"); if (c < 0) break; switch (c) { @@ -252,6 +254,9 @@ static int cmd_qgroup_show(int argc, char **argv) case 'F': filter_flag |= 0x1; break; + case 'f': + filter_flag |= 0x2; + break; default: usage(cmd_qgroup_show_usage); } @@ -268,9 +273,14 @@ static int cmd_qgroup_show(int argc, char **argv) if (filter_flag) { qgroupid = btrfs_get_path_rootid(fd); - btrfs_qgroup_setup_filter(&filter_set, - BTRFS_QGROUP_FILTER_ALL_PARENT, - qgroupid); + if (filter_flag & 0x1) + btrfs_qgroup_setup_filter(&filter_set, + BTRFS_QGROUP_FILTER_ALL_PARENT, + qgroupid); + if (filter_flag & 0x2) + btrfs_qgroup_setup_filter(&filter_set, + BTRFS_QGROUP_FILTER_PARENT, + qgroupid); } ret = btrfs_show_qgroups(fd, filter_set); e = errno; @@ -468,6 +468,18 @@ static int filter_all_parent_insert(struct qgroup_lookup *sort_tree, return 0; } +static int filter_by_parent(struct btrfs_qgroup *bq, u64 data) +{ + struct btrfs_qgroup *qgroup = + (struct btrfs_qgroup *)(unsigned long)data; + + if (data == 0) + return 0; + if (qgroup->qgroupid == bq->qgroupid) + return 1; + return 0; +} + static int filter_by_all_parent(struct btrfs_qgroup *bq, u64 data) { struct qgroup_lookup lookup; @@ -502,6 +514,7 @@ static int filter_by_all_parent(struct btrfs_qgroup *bq, u64 data) } static btrfs_qgroup_filter_func all_filter_funcs[] = { + [BTRFS_QGROUP_FILTER_PARENT] = filter_by_parent, [BTRFS_QGROUP_FILTER_ALL_PARENT] = filter_by_all_parent, }; @@ -586,7 +599,8 @@ static void pre_process_filter_set(struct qgroup_lookup *lookup, for (i = 0; i < set->nfilters; i++) { - if (set->filters[i].filter_func == filter_by_all_parent) { + if (set->filters[i].filter_func == filter_by_all_parent + || set->filters[i].filter_func == filter_by_parent) { qgroup_for_filter = qgroup_tree_search(lookup, set->filters[i].data); set->filters[i].data = @@ -49,6 +49,7 @@ enum btrfs_qgroup_column_enum { }; enum btrfs_qgroup_filter_enum { + BTRFS_QGROUP_FILTER_PARENT, BTRFS_QGROUP_FILTER_ALL_PARENT, BTRFS_QGROUP_FILTER_MAX, }; |