summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorChao Yu <chao2.yu@samsung.com>2013-12-30 18:36:23 +0800
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2014-01-06 16:42:22 +0900
commit04a17fb17fafada39f96bfb41ceb2dc1c11b2af6 (patch)
tree424c1e59091553c44bb3cdf0abec337439d94514 /fs/f2fs
parent18309aaa41909cfddb93e932b16a7d14ec425c9b (diff)
downloadop-kernel-dev-04a17fb17fafada39f96bfb41ceb2dc1c11b2af6.zip
op-kernel-dev-04a17fb17fafada39f96bfb41ceb2dc1c11b2af6.tar.gz
f2fs: avoid to read inline data except first page
Here is a case which could read inline page data not from first page. 1. write inline data 2. lseek to offset 4096 3. read 4096 bytes from offset 4096 (read_inline_data read inline data page to non-first page, And previously VFS has add this page to page cache) 4. ftruncate offset 8192 5. read 4096 bytes from offset 4096 (we meet this updated page with inline data in cache) So we should leave this page with inited data and uptodate flag for this case. Change log from v1: o fix a deadlock bug Signed-off-by: Chao Yu <chao2.yu@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/inline.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 89f0c18..e0d800a 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -39,6 +39,11 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
struct page *ipage;
void *src_addr, *dst_addr;
+ if (page->index) {
+ zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+ goto out;
+ }
+
ipage = get_node_page(sbi, inode->i_ino);
if (IS_ERR(ipage))
return PTR_ERR(ipage);
@@ -52,6 +57,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
kunmap(page);
f2fs_put_page(ipage, 1);
+out:
SetPageUptodate(page);
unlock_page(page);
OpenPOWER on IntegriCloud