Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"We have one more fix for btrfs.
This gets rid of a new WARN_ON from rc1 that ended up making more
noise than we really want. The larger fix for the underflow got
delayed a bit and it's better for now to put it under
CONFIG_BTRFS_DEBUG"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: qgroup: move noisy underflow warning to debugging build
+7
-4
+7
-4
fs/btrfs/qgroup.c
+7
-4
fs/btrfs/qgroup.c
···
1042
1042
struct btrfs_qgroup *qgroup,
1043
1043
u64 num_bytes)
1044
1044
{
1045
-
btrfs_warn(fs_info,
1045
+
#ifdef CONFIG_BTRFS_DEBUG
1046
+
WARN_ON(qgroup->reserved < num_bytes);
1047
+
btrfs_debug(fs_info,
1046
1048
"qgroup %llu reserved space underflow, have: %llu, to free: %llu",
1047
1049
qgroup->qgroupid, qgroup->reserved, num_bytes);
1050
+
#endif
1048
1051
qgroup->reserved = 0;
1049
1052
}
1050
1053
/*
···
1078
1075
qgroup->excl += sign * num_bytes;
1079
1076
qgroup->excl_cmpr += sign * num_bytes;
1080
1077
if (sign > 0) {
1081
-
if (WARN_ON(qgroup->reserved < num_bytes))
1078
+
if (qgroup->reserved < num_bytes)
1082
1079
report_reserved_underflow(fs_info, qgroup, num_bytes);
1083
1080
else
1084
1081
qgroup->reserved -= num_bytes;
···
1103
1100
WARN_ON(sign < 0 && qgroup->excl < num_bytes);
1104
1101
qgroup->excl += sign * num_bytes;
1105
1102
if (sign > 0) {
1106
-
if (WARN_ON(qgroup->reserved < num_bytes))
1103
+
if (qgroup->reserved < num_bytes)
1107
1104
report_reserved_underflow(fs_info, qgroup,
1108
1105
num_bytes);
1109
1106
else
···
2472
2469
2473
2470
qg = unode_aux_to_qgroup(unode);
2474
2471
2475
-
if (WARN_ON(qg->reserved < num_bytes))
2472
+
if (qg->reserved < num_bytes)
2476
2473
report_reserved_underflow(fs_info, qg, num_bytes);
2477
2474
else
2478
2475
qg->reserved -= num_bytes;