xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: qgroup: move noisy underflow warning to debugging build

Browse Source 
The WARN_ON and warning from report_reserved_underflow can become very
noisy and is visible unconditionally although this is namely for
debugging. The patch "btrfs: Add WARN_ON for qgroup reserved underflow"
(18dc22c19b) went to 4.11-rc1 and the plan
was to get the fix as well, but this hasn't happened.

CC: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
2017-04-18 17:00:12 +02:00
parent a967efb30b
commit 338bd52f3c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/qgroup.c
View File

@@ -1042,9 +1042,12 @@ static void report_reserved_underflow(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup *qgroup, struct btrfs_qgroup *qgroup,
u64 num_bytes) u64 num_bytes)
{ {
btrfs_warn(fs_info, #ifdef CONFIG_BTRFS_DEBUG
WARN_ON(qgroup->reserved < num_bytes);
btrfs_debug(fs_info,
"qgroup %llu reserved space underflow, have: %llu, to free: %llu", "qgroup %llu reserved space underflow, have: %llu, to free: %llu",
qgroup->qgroupid, qgroup->reserved, num_bytes); qgroup->qgroupid, qgroup->reserved, num_bytes);
#endif
qgroup->reserved = 0; qgroup->reserved = 0;
} }
/* /*
@@ -1075,7 +1078,7 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
qgroup->excl += sign * num_bytes; qgroup->excl += sign * num_bytes;
qgroup->excl_cmpr += sign * num_bytes; qgroup->excl_cmpr += sign * num_bytes;
if (sign > 0) { if (sign > 0) {
if (WARN_ON(qgroup->reserved < num_bytes)) if (qgroup->reserved < num_bytes)
report_reserved_underflow(fs_info, qgroup, num_bytes); report_reserved_underflow(fs_info, qgroup, num_bytes);
else else
qgroup->reserved -= num_bytes; qgroup->reserved -= num_bytes;
@@ -1100,7 +1103,7 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
WARN_ON(sign < 0 && qgroup->excl < num_bytes); WARN_ON(sign < 0 && qgroup->excl < num_bytes);
qgroup->excl += sign * num_bytes; qgroup->excl += sign * num_bytes;
if (sign > 0) { if (sign > 0) {
if (WARN_ON(qgroup->reserved < num_bytes)) if (qgroup->reserved < num_bytes)
report_reserved_underflow(fs_info, qgroup, report_reserved_underflow(fs_info, qgroup,
num_bytes); num_bytes);
else else
@@ -2469,7 +2472,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
qg = unode_aux_to_qgroup(unode); qg = unode_aux_to_qgroup(unode);
if (WARN_ON(qg->reserved < num_bytes)) if (qg->reserved < num_bytes)
report_reserved_underflow(fs_info, qg, num_bytes); report_reserved_underflow(fs_info, qg, num_bytes);
else else
qg->reserved -= num_bytes; qg->reserved -= num_bytes;