From 9f4cf2ad4b27e639376c2930478311341ef67d7f Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 4 Nov 2011 09:41:02 -0400
Subject: [PATCH] --- yaml --- r: 274717 b: refs/heads/master c:
 56d2a48f81a1bde827c625b90221fade72fe9c61 h: refs/heads/master i:   274715:
 fd8b7c476e3f09ee0560f8be8f88a0330e6df962 v: v3

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

diff --git a/[refs] b/[refs]
index 29a9420d27e6..8dfc2570d8e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21ca543efc12674fddb22ddf4ea4906427f4e982
+refs/heads/master: 56d2a48f81a1bde827c625b90221fade72fe9c61
diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c
index 562dad10dee9..ed11d3866afd 100644
--- a/trunk/fs/btrfs/scrub.c
+++ b/trunk/fs/btrfs/scrub.c
@@ -655,6 +655,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix)
 		       "scrub_fixup: btrfs_map_block failed us for %llu\n",
 		       (unsigned long long)logical);
 		WARN_ON(1);
+		kfree(bbio);
 		return;
 	}