diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:13:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-21 10:13:26 +0800 |
| commit | 9106e24eb8e4dbe7f8de197317e68624ada540b0 (patch) | |
| tree | 13d53c1272779bcc3e62462d17f99b01e98c46e1 | |
| parent | b7f57fc3577b8a6822b411fa971e6562335485aa (diff) | |
| parent | 5163bb7b0353fa83b8f85a2d7c0ddd348fb9514d (diff) | |
| download | linux-linaro-stable-linux-linaro-lsk-rt.tar.gz | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rtlsk-v3.10-15.07-rtlsk-v3.10-15.06-rtlsk-v3.10-15.05-rtlinux-linaro-lsk-v3.10-rt-testlinux-linaro-lsk-rt
| -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 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) { |