---

yaml --- r: 251733 b: refs/heads/master c: 7cb1a53 h: refs/heads/master i: 251731: 682374f v: v3
git-mirror · May 18, 2011 · 85d6ec1 · 85d6ec1
1 parent 0484df2
commit 85d6ec1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);