Merge branch 'v3.10/topic/misc' into linux-linaro-lsk-v3.10
Pick up a ext4 optimiztion commit:
7afe5aa59ed3d ext4: convert write_begin methods to stable_page_writes
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9e3d8dd..8a27750 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1032,7 +1032,8 @@
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);
@@ -2729,7 +2730,7 @@
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) {