github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

Browse Source
This commit is contained in:
Alex Shi 2015-05-21 10:13:07 +08:00
commit 488d2f6a82
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext4/inode.c
View File

@ -1032,7 +1032,8 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
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 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
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) {