diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2013-08-28 14:30:47 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2013-08-28 14:30:47 -0400 |
commit | 7afe5aa59ed3da7b6161617e7f157c7c680dc41e (patch) | |
tree | 5b2af14c70d9f06b040635181a1fe887d6538e4d /fs | |
parent | 27b1b22882d32aa711ab4801700dad997440d940 (diff) |
ext4: convert write_begin methods to stable_page_writes semantics
Use wait_for_stable_page() instead of wait_on_page_writeback()
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
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: | |||
969 | ext4_journal_stop(handle); | 969 | ext4_journal_stop(handle); |
970 | goto retry_grab; | 970 | goto retry_grab; |
971 | } | 971 | } |
972 | wait_on_page_writeback(page); | 972 | /* In case writeback began while the page was unlocked */ |
973 | wait_for_stable_page(page); | ||
973 | 974 | ||
974 | if (ext4_should_dioread_nolock(inode)) | 975 | if (ext4_should_dioread_nolock(inode)) |
975 | ret = __block_write_begin(page, pos, len, ext4_get_block_write); | 976 | ret = __block_write_begin(page, pos, len, ext4_get_block_write); |
@@ -2678,7 +2679,7 @@ retry_journal: | |||
2678 | goto retry_grab; | 2679 | goto retry_grab; |
2679 | } | 2680 | } |
2680 | /* In case writeback began while the page was unlocked */ | 2681 | /* In case writeback began while the page was unlocked */ |
2681 | wait_on_page_writeback(page); | 2682 | wait_for_stable_page(page); |
2682 | 2683 | ||
2683 | ret = __block_write_begin(page, pos, len, ext4_da_get_block_prep); | 2684 | ret = __block_write_begin(page, pos, len, ext4_da_get_block_prep); |
2684 | if (ret < 0) { | 2685 | if (ret < 0) { |