From 85d6ec145850a4269518f7232618ada93320331f Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <djwong@us.ibm.com>
Date: Wed, 18 May 2011 13:53:20 -0400
Subject: [PATCH] --- yaml --- r: 251733 b: refs/heads/master c:
 7cb1a5351da8ac499d965a78e94c79ad27891f43 h: refs/heads/master i:   251731:
 682374fa9fe36218088665dab26526e4085ed064 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/ext4/inode.c       | 4 +---
 trunk/fs/ext4/move_extent.c | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cdb18848390c..330d122311ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed3ce80a52c4658f48ef8fc825bdedf8b3fcaa89
+refs/heads/master: 7cb1a5351da8ac499d965a78e94c79ad27891f43
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 3424e82392ad..f6caaac83731 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2796,9 +2796,7 @@ static int write_cache_pages_da(struct address_space *mapping,
 				continue;
 			}
 
-			if (PageWriteback(page))
-				wait_on_page_writeback(page);
-
+			wait_on_page_writeback(page);
 			BUG_ON(PageWriteback(page));
 
 			if (mpd->next_page != page->index)
diff --git a/trunk/fs/ext4/move_extent.c b/trunk/fs/ext4/move_extent.c
index b9f3e7862f13..2b8304bf3c50 100644
--- a/trunk/fs/ext4/move_extent.c
+++ b/trunk/fs/ext4/move_extent.c
@@ -876,8 +876,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
 	 * It needs to call wait_on_page_writeback() to wait for the
 	 * writeback of the page.
 	 */
-	if (PageWriteback(page))
-		wait_on_page_writeback(page);
+	wait_on_page_writeback(page);
 
 	/* Release old bh and drop refs */
 	try_to_release_page(page, 0);