summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2012-04-12 13:46:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-22 15:38:56 -0700
commitbfe050c8857bbc0cd6832c8bf978422573c439f5 (patch)
tree26c32b7875ffb530ad378ecbb47ff88b65b73f68
parent7cb14d84e9e4afbb1547969b923640f39eb1db84 (diff)
downloadlwn-bfe050c8857bbc0cd6832c8bf978422573c439f5.tar.gz
lwn-bfe050c8857bbc0cd6832c8bf978422573c439f5.zip
Revert "Btrfs: increase the global block reserve estimates"
commit 8e62c2de6e23e5c1fee04f59de51b54cc2868ca5 upstream. This reverts commit 5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf. We've had a number of complaints of early enospc that bisect down to this patch. We'll hae to fix the reservations differently. Signed-off-by: Chris Mason <chris.mason@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 37e0a800d34e..f6f584fd5494 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4110,7 +4110,7 @@ static u64 calc_global_metadata_size(struct btrfs_fs_info *fs_info)
num_bytes += div64_u64(data_used + meta_used, 50);
if (num_bytes * 3 > meta_used)
- num_bytes = div64_u64(meta_used, 3) * 2;
+ num_bytes = div64_u64(meta_used, 3);
return ALIGN(num_bytes, fs_info->extent_root->leafsize << 10);
}