redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

f2fs: fix to detect truncation prior rather than EIO during read 

In procedure of synchonized read, after sending out the read request, reader
will try to lock the page for waiting device to finish the read jobs and
unlock the page, but meanwhile, truncater will race with reader, so after
reader get lock of the page, it should check page's mapping to detect
whether someone has truncated the page in advance, then reader has the
chance to do the retry if truncation was done, otherwise read can be failed
due to previous condition check.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
hifive-unleashed-5.1
Chao Yu 2016-07-03 22:05:12 +08:00 committed by Jaegeuk Kim
parent 78682f7944
commit 1563ac75e7
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/f2fs/data.c
View File

@ -500,14 +500,14 @@ repeat:
/* wait for read completion */
lock_page(page);
if (unlikely(!PageUptodate(page))) {
f2fs_put_page(page, 1);
return ERR_PTR(-EIO);
}
if (unlikely(page->mapping != mapping)) {
f2fs_put_page(page, 1);
goto repeat;
}
if (unlikely(!PageUptodate(page))) {
f2fs_put_page(page, 1);
return ERR_PTR(-EIO);
}
return page;
}
@ -1647,14 +1647,14 @@ repeat:
__submit_bio(sbi, READ_SYNC, bio, DATA);
lock_page(page);
if (unlikely(!PageUptodate(page))) {
err = -EIO;
goto fail;
}
if (unlikely(page->mapping != mapping)) {
f2fs_put_page(page, 1);
goto repeat;
}
if (unlikely(!PageUptodate(page))) {
err = -EIO;
goto fail;
}
}
out_update:
SetPageUptodate(page);

4
fs/f2fs/gc.c
View File

@ -593,11 +593,11 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
/* write page */
lock_page(fio.encrypted_page);
if (unlikely(!PageUptodate(fio.encrypted_page))) {
if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) {
err = -EIO;
goto put_page_out;
}
if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) {
if (unlikely(!PageUptodate(fio.encrypted_page))) {
err = -EIO;
goto put_page_out;
}

6
fs/f2fs/node.c
View File

@ -1146,13 +1146,13 @@ repeat:
lock_page(page);
if (unlikely(!PageUptodate(page)))
goto out_err;
if (unlikely(page->mapping != NODE_MAPPING(sbi))) {
f2fs_put_page(page, 1);
goto repeat;
}
if (unlikely(!PageUptodate(page)))
goto out_err;
page_hit:
if(unlikely(nid != nid_of_node(page))) {
f2fs_bug_on(sbi, 1);