diff options
author | Chao Yu <yuchao0@huawei.com> | 2016-07-03 22:05:12 +0800 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-07-08 10:33:25 -0700 |
commit | 1563ac75e7e45adcdc1271e6bb55fe27a23d4e4e (patch) | |
tree | 7b3f921f969550d54ebd4d97e3e922468d2b18c9 /fs/f2fs/gc.c | |
parent | 78682f79447998369a85f12b6437fa8fdbbdca50 (diff) | |
download | linux-stable-1563ac75e7e45adcdc1271e6bb55fe27a23d4e4e.tar.gz linux-stable-1563ac75e7e45adcdc1271e6bb55fe27a23d4e4e.tar.bz2 linux-stable-1563ac75e7e45adcdc1271e6bb55fe27a23d4e4e.zip |
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>
Diffstat (limited to 'fs/f2fs/gc.c')
-rw-r--r-- | fs/f2fs/gc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index e1d274cdecb8..c9602d0dc57a 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -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; } |