---

yaml --- r: 332589 b: refs/heads/master c: e8830e6 h: refs/heads/master i: 332587: 717db96 v: v3
git-mirror · Oct 9, 2012 · 1ae1f1b · 1ae1f1b
1 parent 9711ccb
commit 1ae1f1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);
 	}