From 2193b1e04154ac5b076196a7b579eda561649458 Mon Sep 17 00:00:00 2001
From: Liu Bo <liubo2009@cn.fujitsu.com>
Date: Thu, 23 Feb 2012 10:49:04 -0500
Subject: [PATCH] --- yaml --- r: 287903 b: refs/heads/master c:
 5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf h: refs/heads/master i:   287901:
 26f095bf374efc9e9df1bc757b8aade25e47609a   287899:
 7e9388bbc2e7c65a4f684e54c184e271796ea128   287895:
 e332125a89aa65f3601de55a2948abd769c4d277   287887:
 0ff4123d268056570c4fdd8370f1ab1b41efda6c   287871:
 1c4f017dd4372f5aa06122d23da38ffb684678fd v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0934e375237..ac5e1b54d16f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 506531905296d6aee84480c879b25ea98c3f9db6
+refs/heads/master: 5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index dc083f55bcfd..079e5a1c343c 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -4108,7 +4108,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);
+		num_bytes = div64_u64(meta_used, 3) * 2;
 
 	return ALIGN(num_bytes, fs_info->extent_root->leafsize << 10);
 }