X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fext4%2Finode.c;h=47c8e4654371b2571c98852e7860c4de40660630;hb=7afe5aa59ed3da7b6161617e7f157c7c680dc41e;hp=fc4051eb4e0fc3ba10bd56850086614e8e4ca73e;hpb=27b1b22882d32aa711ab4801700dad997440d940;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index fc4051eb4e0f..47c8e4654371 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -969,7 +969,8 @@ retry_journal:
 		ext4_journal_stop(handle);
 		goto retry_grab;
 	}
-	wait_on_page_writeback(page);
+	/* In case writeback began while the page was unlocked */
+	wait_for_stable_page(page);
 
 	if (ext4_should_dioread_nolock(inode))
 		ret = __block_write_begin(page, pos, len, ext4_get_block_write);
@@ -2678,7 +2679,7 @@ retry_journal:
 		goto retry_grab;
 	}
 	/* In case writeback began while the page was unlocked */
-	wait_on_page_writeback(page);
+	wait_for_stable_page(page);
 
 	ret = __block_write_begin(page, pos, len, ext4_da_get_block_prep);
 	if (ret < 0) {