From d6ea9c23bc47adc67c0dbe97180ccbf9c7cf2922 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Fri, 4 May 2012 15:16:06 -0400
Subject: [PATCH] --- yaml --- r: 300078 b: refs/heads/master c:
 17de39ac17bf99b8bf0d819d13668d5048836efc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cee4252d11d4..3ed5d7b348b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5846fc665d1c3dd32d877febe7402ccd583b8a1
+refs/heads/master: 17de39ac17bf99b8bf0d819d13668d5048836efc
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
index 0c23e57077c6..2fb52c26c677 100644
--- a/trunk/fs/btrfs/extent_io.c
+++ b/trunk/fs/btrfs/extent_io.c
@@ -4120,6 +4120,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree,
 			if (atomic_inc_not_zero(&exists->refs)) {
 				spin_unlock(&mapping->private_lock);
 				unlock_page(p);
+				page_cache_release(p);
 				mark_extent_buffer_accessed(exists);
 				goto free_eb;
 			}
@@ -4199,8 +4200,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree,
 			unlock_page(eb->pages[i]);
 	}
 
-	if (!atomic_dec_and_test(&eb->refs))
-		return exists;
+	WARN_ON(!atomic_dec_and_test(&eb->refs));
 	btrfs_release_extent_buffer(eb);
 	return exists;
 }