From 43c43127086d0b2bd61eb8246a38c9a11a4d026a Mon Sep 17 00:00:00 2001
From: Daniel J Blueman <daniel.blueman@gmail.com>
Date: Wed, 9 Mar 2011 16:46:42 +0000
Subject: [PATCH] --- yaml --- r: 234092 b: refs/heads/master c:
 b4966b7770349deb05e3dd2bd2c65d2d044abbbb h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d6e983840af..61197b5adfac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea8efc74bd0402b4d5f663d007b4e25fa29ea778
+refs/heads/master: b4966b7770349deb05e3dd2bd2c65d2d044abbbb
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 44b926646e33..e7a8303328b2 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -6058,6 +6058,7 @@ static void btrfs_submit_direct(int rw, struct bio *bio, struct inode *inode,
 	if (!skip_sum) {
 		dip->csums = kmalloc(sizeof(u32) * bio->bi_vcnt, GFP_NOFS);
 		if (!dip->csums) {
+			kfree(dip);
 			ret = -ENOMEM;
 			goto free_ordered;
 		}