From 7ffc7bedd397718b820a845f5523a8beaf346cde Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Wed, 17 Apr 2013 10:17:05 -0400
Subject: [PATCH] --- yaml --- r: 374881 b: refs/heads/master c:
 b8d7f3ac10a865ca727f9373a796ef8537e3a474 h: refs/heads/master i:   374879:
 d722b36e2032c0afba0f7ffda7e3ffc80b12a619 v: v3

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

diff --git a/[refs] b/[refs]
index 3c0dc920fb00..4393ea70d4ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccf7f29d1a23696ca69a981adbf7eda2e13c8635
+refs/heads/master: b8d7f3ac10a865ca727f9373a796ef8537e3a474
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 8a7a366267ec..aab7d89f3ff0 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -3763,10 +3763,9 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
 			if (eb)
 				ret = test_and_clear_bit(EXTENT_BUFFER_DIRTY,
 							 &eb->bflags);
-			if (PageWriteback(page))
-				end_page_writeback(page);
-
 			lock_page(page);
+
+			wait_on_page_writeback(page);
 			if (PageDirty(page)) {
 				clear_page_dirty_for_io(page);
 				spin_lock_irq(&page->mapping->tree_lock);