aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-05-21 10:10:52 +0800
committerAlex Shi <alex.shi@linaro.org>2015-05-21 10:10:52 +0800
commit5163bb7b0353fa83b8f85a2d7c0ddd348fb9514d (patch)
tree5d4016eac0cd7939551e18293b20bfcb4e02ad71
parentbaf41996d83a6ecd270be42ca1870592827fb30d (diff)
parent16b1fe2ce62d6238acb13fbe59b4fc13b51b1445 (diff)
downloadlinux-linaro-stable-5163bb7b0353fa83b8f85a2d7c0ddd348fb9514d.tar.gz
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
-rw-r--r--fs/ext4/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9e3d8dd6c40a..8a277505a3be 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1032,7 +1032,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);
@@ -2729,7 +2730,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) {