btrfs: add message format for qgroupid
David Sterba
maintainerPATCH 1/1 btrfs: add message format for qgroupid
The qgroupid has a specific format, add common format specifier, similar to what we have for checksums and keys.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/fs.h | 4 ++++ fs/btrfs/qgroup.c | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-)
fs/btrfs/fs.h +4 -0
@@ -79,6 +79,10 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);#define BTRFS_KEY_FMT "(%llu %u %llu)"#define BTRFS_KEY_FMT_VALUE (key) (key)->objectid, (key)->type, (key)->offset +#define BTRFS_QGROUP_FMT "%hu/%llu" +#define BTRFS_QGROUP_FMT_VALUE (qgroup) btrfs_qgroup_level((qgroup)->qgroupid), \ + btrfs_qgroup_subvolid((qgroup)->qgroupid) +/* * Number of metadata items necessary for an unlink operation: *
fs/btrfs/qgroup.c +10 -15
@@ -373,10 +373,9 @@ static bool squota_check_parent_usage(struct btrfs_fs_info *fs_info, struct btrf parent->excl_cmpr != excl_cmpr_sum || parent->rfer_cmpr != rfer_cmpr_sum);WARN (mismatch, -"parent squota qgroup %hu/%llu has mismatched usage from its %d members. " +"parent squota qgroup " BTRFS_QGROUP_FMT " has mismatched usage from its %d members. " "%llu %llu %llu %llu vs %llu %llu %llu %llu\n" , -btrfs_qgroup_level (parent->qgroupid), -btrfs_qgroup_subvolid (parent->qgroupid), nr_members, parent->excl, +BTRFS_QGROUP_FMT_VALUE (parent), nr_members, parent->excl, parent->rfer, parent->excl_cmpr, parent->rfer_cmpr, excl_sum, rfer_sum, excl_cmpr_sum, rfer_cmpr_sum);return mismatch;
@@ -652,9 +651,8 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)if (qgroup->rsv.values[i]) { ret = true;btrfs_warn (fs_info, -"qgroup %hu/%llu has unreleased space, type %d rsv %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"qgroup " BTRFS_QGROUP_FMT " has unreleased space, type %d rsv %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), i, qgroup->rsv.values[i]); } }
@@ -1863,9 +1861,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS])) {DEBUG_WARN ();btrfs_warn_rl (fs_info, -"to be deleted qgroup %u/%llu has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"to be deleted qgroup " BTRFS_QGROUP_FMT " has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), qgroup->rsv.values[BTRFS_QGROUP_RSV_DATA ], qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC ], qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS ]);
@@ -1883,9 +1880,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) qgroup->rfer_cmpr || qgroup->excl_cmpr)) {DEBUG_WARN ();qgroup_mark_inconsistent (fs_info, -"to be deleted qgroup %u/%llu has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"to be deleted qgroup " BTRFS_QGROUP_FMT " has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), qgroup->rfer, qgroup->rfer_cmpr, qgroup->excl, qgroup->excl_cmpr); }
@@ -4971,9 +4967,8 @@ int btrfs_record_squota_delta(struct btrfs_fs_info *fs_info,ASSERT (qg->excl == qg->rfer);if (WARN_ON_ONCE (sign <0 && qg->excl < num_bytes)) {btrfs_warn (fs_info, -"squota underflow qg %hu/%llu excl %llu num_bytes %llu" , -btrfs_qgroup_level (qg->qgroupid), -btrfs_qgroup_subvolid (qg->qgroupid), +"squota underflow qg " BTRFS_QGROUP_FMT " excl %llu num_bytes %llu" , +BTRFS_QGROUP_FMT_VALUE (qg), qg->excl, num_bytes); qg->excl =0 ; qg->rfer =0 ;
Signature · 1 line
2.54.0
Quoted 3 lines · David Sterba
The qgroupid has a specific format, add common format specifier, similar to what we have for checksums and keys.
This is sweet, I hate typing that stuff out :)
Reviewed-by Boris Burkov <[email protected]>
Quoted 89 lines
Signed-off-by David Sterba <[email protected]>--- fs/btrfs/fs.h | 4 ++++ fs/btrfs/qgroup.c | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-)fs/btrfs/fs.h +4
-0@@ -79,6 +79,10 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);#define BTRFS_KEY_FMT "(%llu %u %llu)"#define BTRFS_KEY_FMT_VALUE (key) (key)->objectid, (key)->type, (key)->offset +#define BTRFS_QGROUP_FMT "%hu/%llu" +#define BTRFS_QGROUP_FMT_VALUE (qgroup) btrfs_qgroup_level((qgroup)->qgroupid), \ + btrfs_qgroup_subvolid((qgroup)->qgroupid) +/* * Number of metadata items necessary for an unlink operation: * fs/btrfs/qgroup.c +10
-15@@ -373,10 +373,9 @@ static bool squota_check_parent_usage(struct btrfs_fs_info *fs_info, struct btrf parent->excl_cmpr != excl_cmpr_sum || parent->rfer_cmpr != rfer_cmpr_sum);WARN (mismatch, -"parent squota qgroup %hu/%llu has mismatched usage from its %d members. " +"parent squota qgroup " BTRFS_QGROUP_FMT " has mismatched usage from its %d members. " "%llu %llu %llu %llu vs %llu %llu %llu %llu\n" , -btrfs_qgroup_level (parent->qgroupid), -btrfs_qgroup_subvolid (parent->qgroupid), nr_members, parent->excl, +BTRFS_QGROUP_FMT_VALUE (parent), nr_members, parent->excl, parent->rfer, parent->excl_cmpr, parent->rfer_cmpr, excl_sum, rfer_sum, excl_cmpr_sum, rfer_cmpr_sum);return mismatch;@@ -652,9 +651,8 @@ bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)if (qgroup->rsv.values[i]) { ret = true;btrfs_warn (fs_info, -"qgroup %hu/%llu has unreleased space, type %d rsv %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"qgroup " BTRFS_QGROUP_FMT " has unreleased space, type %d rsv %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), i, qgroup->rsv.values[i]); } }@@ -1863,9 +1861,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS])) {DEBUG_WARN ();btrfs_warn_rl (fs_info, -"to be deleted qgroup %u/%llu has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"to be deleted qgroup " BTRFS_QGROUP_FMT " has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), qgroup->rsv.values[BTRFS_QGROUP_RSV_DATA ], qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC ], qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS ]);@@ -1883,9 +1880,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) qgroup->rfer_cmpr || qgroup->excl_cmpr)) {DEBUG_WARN ();qgroup_mark_inconsistent (fs_info, -"to be deleted qgroup %u/%llu has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu" , -btrfs_qgroup_level (qgroup->qgroupid), -btrfs_qgroup_subvolid (qgroup->qgroupid), +"to be deleted qgroup " BTRFS_QGROUP_FMT " has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu" , +BTRFS_QGROUP_FMT_VALUE (qgroup), qgroup->rfer, qgroup->rfer_cmpr, qgroup->excl, qgroup->excl_cmpr); }@@ -4971,9 +4967,8 @@ int btrfs_record_squota_delta(struct btrfs_fs_info *fs_info,ASSERT (qg->excl == qg->rfer);if (WARN_ON_ONCE (sign <0 && qg->excl < num_bytes)) {btrfs_warn (fs_info, -"squota underflow qg %hu/%llu excl %llu num_bytes %llu" , -btrfs_qgroup_level (qg->qgroupid), -btrfs_qgroup_subvolid (qg->qgroupid), +"squota underflow qg " BTRFS_QGROUP_FMT " excl %llu num_bytes %llu" , +BTRFS_QGROUP_FMT_VALUE (qg), qg->excl, num_bytes); qg->excl =0 ; qg->rfer =0 ;Signature · 1 line
2.54.0