Skip to content

Commit 338bd52

Browse files
committed
btrfs: qgroup: move noisy underflow warning to debugging build
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" (18dc22c) went to 4.11-rc1 and the plan was to get the fix as well, but this hasn't happened. CC: Qu Wenruo <[email protected]> Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent a967efb commit 338bd52

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

fs/btrfs/qgroup.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,9 +1042,12 @@ static void report_reserved_underflow(struct btrfs_fs_info *fs_info,
10421042
struct btrfs_qgroup *qgroup,
10431043
u64 num_bytes)
10441044
{
1045-
btrfs_warn(fs_info,
1045+
#ifdef CONFIG_BTRFS_DEBUG
1046+
WARN_ON(qgroup->reserved < num_bytes);
1047+
btrfs_debug(fs_info,
10461048
"qgroup %llu reserved space underflow, have: %llu, to free: %llu",
10471049
qgroup->qgroupid, qgroup->reserved, num_bytes);
1050+
#endif
10481051
qgroup->reserved = 0;
10491052
}
10501053
/*
@@ -1075,7 +1078,7 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
10751078
qgroup->excl += sign * num_bytes;
10761079
qgroup->excl_cmpr += sign * num_bytes;
10771080
if (sign > 0) {
1078-
if (WARN_ON(qgroup->reserved < num_bytes))
1081+
if (qgroup->reserved < num_bytes)
10791082
report_reserved_underflow(fs_info, qgroup, num_bytes);
10801083
else
10811084
qgroup->reserved -= num_bytes;
@@ -1100,7 +1103,7 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
11001103
WARN_ON(sign < 0 && qgroup->excl < num_bytes);
11011104
qgroup->excl += sign * num_bytes;
11021105
if (sign > 0) {
1103-
if (WARN_ON(qgroup->reserved < num_bytes))
1106+
if (qgroup->reserved < num_bytes)
11041107
report_reserved_underflow(fs_info, qgroup,
11051108
num_bytes);
11061109
else
@@ -2469,7 +2472,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
24692472

24702473
qg = unode_aux_to_qgroup(unode);
24712474

2472-
if (WARN_ON(qg->reserved < num_bytes))
2475+
if (qg->reserved < num_bytes)
24732476
report_reserved_underflow(fs_info, qg, num_bytes);
24742477
else
24752478
qg->reserved -= num_bytes;

0 commit comments

Comments
 (0)