Merge "ext4: convert write_begin methods to stable_page_writes semantics" (f83b6272) · Commits · e / devices / android_kernel_sony_msm8994

fs/ext4/inode.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1030,7 +1030,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);
		@@ -2712,7 +2713,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) {