Re: [PATCH 5/8] btrfs-progs: qgroups: introduce and use info and limit structures
On 2.03.2018 20:47, je...@suse.com wrote: > From: Jeff Mahoney > > We use structures to pass the info and limit from the kernel as items > but store the individual values separately in btrfs_qgroup. We already > have a btrfs_qgroup_limit structure that's used for setting the limit. > > This patch introduces a btrfs_qgroup_info structure and uses that and > btrfs_qgroup_limit in btrfs_qgroup. > > Signed-off-by: Jeff Mahoney Reviewed-by: Nikolay Borisov -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/8] btrfs-progs: qgroups: introduce and use info and limit structures
From: Jeff Mahoney We use structures to pass the info and limit from the kernel as items but store the individual values separately in btrfs_qgroup. We already have a btrfs_qgroup_limit structure that's used for setting the limit. This patch introduces a btrfs_qgroup_info structure and uses that and btrfs_qgroup_limit in btrfs_qgroup. Signed-off-by: Jeff Mahoney --- qgroup.c | 73 +++- qgroup.h | 8 +++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/qgroup.c b/qgroup.c index 83918134..b1be3311 100644 --- a/qgroup.c +++ b/qgroup.c @@ -46,20 +46,12 @@ struct btrfs_qgroup { /* * info_item */ - u64 generation; - u64 rfer; /*referenced*/ - u64 rfer_cmpr; /*referenced compressed*/ - u64 excl; /*exclusive*/ - u64 excl_cmpr; /*exclusive compressed*/ + struct btrfs_qgroup_info info; /* *limit_item */ - u64 flags; /*which limits are set*/ - u64 max_rfer; - u64 max_excl; - u64 rsv_rfer; - u64 rsv_excl; + struct btrfs_qgroup_limit limit; /*qgroups this group is member of*/ struct list_head qgroups; @@ -272,24 +264,24 @@ static void print_qgroup_column(struct btrfs_qgroup *qgroup, print_qgroup_column_add_blank(BTRFS_QGROUP_QGROUPID, len); break; case BTRFS_QGROUP_RFER: - len = printf("%*s", max_len, pretty_size_mode(qgroup->rfer, unit_mode)); + len = printf("%*s", max_len, pretty_size_mode(qgroup->info.referenced, unit_mode)); break; case BTRFS_QGROUP_EXCL: - len = printf("%*s", max_len, pretty_size_mode(qgroup->excl, unit_mode)); + len = printf("%*s", max_len, pretty_size_mode(qgroup->info.exclusive, unit_mode)); break; case BTRFS_QGROUP_PARENT: len = print_parent_column(qgroup); print_qgroup_column_add_blank(BTRFS_QGROUP_PARENT, len); break; case BTRFS_QGROUP_MAX_RFER: - if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) - len = printf("%*s", max_len, pretty_size_mode(qgroup->max_rfer, unit_mode)); + if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_RFER) + len = printf("%*s", max_len, pretty_size_mode(qgroup->limit.max_referenced, unit_mode)); else len = printf("%*s", max_len, "none"); break; case BTRFS_QGROUP_MAX_EXCL: - if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) - len = printf("%*s", max_len, pretty_size_mode(qgroup->max_excl, unit_mode)); + if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) + len = printf("%*s", max_len, pretty_size_mode(qgroup->limit.max_exclusive, unit_mode)); else len = printf("%*s", max_len, "none"); break; @@ -432,9 +424,9 @@ static int comp_entry_with_rfer(struct btrfs_qgroup *entry1, { int ret; - if (entry1->rfer > entry2->rfer) + if (entry1->info.referenced > entry2->info.referenced) ret = 1; - else if (entry1->rfer < entry2->rfer) + else if (entry1->info.referenced < entry2->info.referenced) ret = -1; else ret = 0; @@ -448,9 +440,9 @@ static int comp_entry_with_excl(struct btrfs_qgroup *entry1, { int ret; - if (entry1->excl > entry2->excl) + if (entry1->info.exclusive > entry2->info.exclusive) ret = 1; - else if (entry1->excl < entry2->excl) + else if (entry1->info.exclusive < entry2->info.exclusive) ret = -1; else ret = 0; @@ -464,9 +456,9 @@ static int comp_entry_with_max_rfer(struct btrfs_qgroup *entry1, { int ret; - if (entry1->max_rfer > entry2->max_rfer) + if (entry1->limit.max_referenced > entry2->limit.max_referenced) ret = 1; - else if (entry1->max_rfer < entry2->max_rfer) + else if (entry1->limit.max_referenced < entry2->limit.max_referenced) ret = -1; else ret = 0; @@ -480,9 +472,9 @@ static int comp_entry_with_max_excl(struct btrfs_qgroup *entry1, { int ret; - if (entry1->max_excl > entry2->max_excl) + if (entry1->limit.max_exclusive > entry2->limit.max_exclusive) ret = 1; - else if (entry1->max_excl < entry2->max_excl) + else if (entry1->limit.max_exclusive < entry2->limit.max_exclusive) ret = -1; else ret = 0; @@ -739,11 +731,13 @@ static int update_qgroup_info(int fd, struct qgroup_lookup *qgroup_lookup, if (IS_ERR_OR_NULL(bq)) return PTR_ERR(bq); - bq->generatio
[PATCH 5/8] btrfs-progs: qgroups: introduce and use info and limit structures
From: Jeff Mahoney We use structures to pass the info and limit from the kernel as items but store the individual values separately in btrfs_qgroup. We already have a btrfs_qgroup_limit structure that's used for setting the limit. This patch introduces a btrfs_qgroup_info structure and uses that and btrfs_qgroup_limit in btrfs_qgroup. Signed-off-by: Jeff Mahoney --- qgroup.c | 73 +++- qgroup.h | 8 +++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/qgroup.c b/qgroup.c index 83918134..b1be3311 100644 --- a/qgroup.c +++ b/qgroup.c @@ -46,20 +46,12 @@ struct btrfs_qgroup { /* * info_item */ - u64 generation; - u64 rfer; /*referenced*/ - u64 rfer_cmpr; /*referenced compressed*/ - u64 excl; /*exclusive*/ - u64 excl_cmpr; /*exclusive compressed*/ + struct btrfs_qgroup_info info; /* *limit_item */ - u64 flags; /*which limits are set*/ - u64 max_rfer; - u64 max_excl; - u64 rsv_rfer; - u64 rsv_excl; + struct btrfs_qgroup_limit limit; /*qgroups this group is member of*/ struct list_head qgroups; @@ -272,24 +264,24 @@ static void print_qgroup_column(struct btrfs_qgroup *qgroup, print_qgroup_column_add_blank(BTRFS_QGROUP_QGROUPID, len); break; case BTRFS_QGROUP_RFER: - len = printf("%*s", max_len, pretty_size_mode(qgroup->rfer, unit_mode)); + len = printf("%*s", max_len, pretty_size_mode(qgroup->info.referenced, unit_mode)); break; case BTRFS_QGROUP_EXCL: - len = printf("%*s", max_len, pretty_size_mode(qgroup->excl, unit_mode)); + len = printf("%*s", max_len, pretty_size_mode(qgroup->info.exclusive, unit_mode)); break; case BTRFS_QGROUP_PARENT: len = print_parent_column(qgroup); print_qgroup_column_add_blank(BTRFS_QGROUP_PARENT, len); break; case BTRFS_QGROUP_MAX_RFER: - if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) - len = printf("%*s", max_len, pretty_size_mode(qgroup->max_rfer, unit_mode)); + if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_RFER) + len = printf("%*s", max_len, pretty_size_mode(qgroup->limit.max_referenced, unit_mode)); else len = printf("%*s", max_len, "none"); break; case BTRFS_QGROUP_MAX_EXCL: - if (qgroup->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) - len = printf("%*s", max_len, pretty_size_mode(qgroup->max_excl, unit_mode)); + if (qgroup->limit.flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) + len = printf("%*s", max_len, pretty_size_mode(qgroup->limit.max_exclusive, unit_mode)); else len = printf("%*s", max_len, "none"); break; @@ -432,9 +424,9 @@ static int comp_entry_with_rfer(struct btrfs_qgroup *entry1, { int ret; - if (entry1->rfer > entry2->rfer) + if (entry1->info.referenced > entry2->info.referenced) ret = 1; - else if (entry1->rfer < entry2->rfer) + else if (entry1->info.referenced < entry2->info.referenced) ret = -1; else ret = 0; @@ -448,9 +440,9 @@ static int comp_entry_with_excl(struct btrfs_qgroup *entry1, { int ret; - if (entry1->excl > entry2->excl) + if (entry1->info.exclusive > entry2->info.exclusive) ret = 1; - else if (entry1->excl < entry2->excl) + else if (entry1->info.exclusive < entry2->info.exclusive) ret = -1; else ret = 0; @@ -464,9 +456,9 @@ static int comp_entry_with_max_rfer(struct btrfs_qgroup *entry1, { int ret; - if (entry1->max_rfer > entry2->max_rfer) + if (entry1->limit.max_referenced > entry2->limit.max_referenced) ret = 1; - else if (entry1->max_rfer < entry2->max_rfer) + else if (entry1->limit.max_referenced < entry2->limit.max_referenced) ret = -1; else ret = 0; @@ -480,9 +472,9 @@ static int comp_entry_with_max_excl(struct btrfs_qgroup *entry1, { int ret; - if (entry1->max_excl > entry2->max_excl) + if (entry1->limit.max_exclusive > entry2->limit.max_exclusive) ret = 1; - else if (entry1->max_excl < entry2->max_excl) + else if (entry1->limit.max_exclusive < entry2->limit.max_exclusive) ret = -1; else ret = 0; @@ -739,11 +731,13 @@ static int update_qgroup_info(int fd, struct qgroup_lookup *qgroup_lookup, if (IS_ERR_OR_NULL(bq)) return PTR_ERR(bq); - bq->generatio