From 3823e17e50a5e261a9967c55e0c6b5d8baa1c5cc Mon Sep 17 00:00:00 2001
From: Liu Bo <liubo2009@cn.fujitsu.com>
Date: Sun, 11 Sep 2011 10:52:24 -0400
Subject: [PATCH] --- yaml --- r: 263733 b: refs/heads/master c:
 65450aa645b1ef7ed74e41c34b28d53333744978 h: refs/heads/master i:   263731:
 7b27dea4ed9f3f202eb3fc90871da11594e94be0 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/btrfs/free-space-cache.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 95af7b15dcdf..b03ce5d3cfba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddf23b3fc6850bd4654d51ec9457fe7c77cde51e
+refs/heads/master: 65450aa645b1ef7ed74e41c34b28d53333744978
diff --git a/trunk/fs/btrfs/free-space-cache.c b/trunk/fs/btrfs/free-space-cache.c
index 6a265b9f85f2..41ac927401d0 100644
--- a/trunk/fs/btrfs/free-space-cache.c
+++ b/trunk/fs/btrfs/free-space-cache.c
@@ -190,9 +190,11 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
 				    struct btrfs_path *path,
 				    struct inode *inode)
 {
+	struct btrfs_block_rsv *rsv;
 	loff_t oldsize;
 	int ret = 0;
 
+	rsv = trans->block_rsv;
 	trans->block_rsv = root->orphan_block_rsv;
 	ret = btrfs_block_rsv_check(trans, root,
 				    root->orphan_block_rsv,
@@ -210,6 +212,8 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
 	 */
 	ret = btrfs_truncate_inode_items(trans, root, inode,
 					 0, BTRFS_EXTENT_DATA_KEY);
+
+	trans->block_rsv = rsv;
 	if (ret) {
 		WARN_ON(1);
 		return ret;