From 7d81d380440002a4f209158d174d5e4c85624e36 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 2 Sep 2012 07:44:51 -0600
Subject: [PATCH] --- yaml --- r: 332536 b: refs/heads/master c:
 cf93dccea67ad8f5e0d9163c6a0a584550bbd7cd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cf8bab06d371..ece899d62b1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7014cdb49305eda0767d2ae6136f8c191ea8fd81
+refs/heads/master: cf93dccea67ad8f5e0d9163c6a0a584550bbd7cd
diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c
index b223620cd5a6..4e9eafe01c55 100644
--- a/trunk/fs/btrfs/scrub.c
+++ b/trunk/fs/btrfs/scrub.c
@@ -1029,6 +1029,7 @@ static int scrub_setup_recheck_block(struct scrub_dev *sdev,
 				spin_lock(&sdev->stat_lock);
 				sdev->stat.malloc_errors++;
 				spin_unlock(&sdev->stat_lock);
+				kfree(bbio);
 				return -ENOMEM;
 			}
 			sblock->page_count++;