From 1ae1f1b862535d7e1dd4636c5453739599c38fcc Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Wed, 19 Sep 2012 22:14:29 -0600
Subject: [PATCH] --- yaml --- r: 332589 b: refs/heads/master c:
 e8830e606ffee383f073e32313f11fc5692813fe h: refs/heads/master i:   332587:
 717db961e9fa3615e506f4076b075cd9d7074883 v: v3

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

diff --git a/[refs] b/[refs]
index 65d1f5133480..155f7b5f586c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d24bec3ae528a47149b838aad76c006d40fe8a39
+refs/heads/master: e8830e606ffee383f073e32313f11fc5692813fe
diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c
index 910ff8051ba9..35489644c247 100644
--- a/trunk/fs/btrfs/transaction.c
+++ b/trunk/fs/btrfs/transaction.c
@@ -351,8 +351,10 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
 	 */
 	if (type != TRANS_JOIN_NOLOCK &&
 	    !__sb_start_write(root->fs_info->sb, SB_FREEZE_FS, false)) {
-		if (type == TRANS_JOIN_FREEZE)
+		if (type == TRANS_JOIN_FREEZE) {
+			kmem_cache_free(btrfs_trans_handle_cachep, h);
 			return ERR_PTR(-EPERM);
+		}
 		sb_start_intwrite(root->fs_info->sb);
 	}