Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aa6f1c5 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to truncate inline data in inode page when setattr 



Previous we do not truncate inline data in inode page when setattr, so following
case could still read the inline data which has already truncated:

1.write inline data
2.ftruncate size to 0
3.ftruncate size to max inline data size
4.read from offset 0

This patch introduces truncate_inline_data() to fix this problem.

change log from v1:
 o fix a bug and do not truncate first page data after truncate inline data.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 817202d9

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1410,5 +1410,6 @@ bool f2fs_may_inline(struct inode *); 
int f2fs_read_inline_data(struct inode *, struct page *);

int f2fs_convert_inline_data(struct inode *, pgoff_t);

int f2fs_write_inline_data(struct inode *, struct page *, unsigned int);

void truncate_inline_data(struct inode *, u64);

int recover_inline_data(struct inode *, struct page *);

#endif

fs/f2fs/file.c

+3 −0
Original line number Diff line number Diff line
@@ -369,6 +369,9 @@ static void truncate_partial_data_page(struct inode *inode, u64 from) 
	unsigned offset = from & (PAGE_CACHE_SIZE - 1);

	struct page *page;



	if (f2fs_has_inline_data(inode))

		return truncate_inline_data(inode, from);



	if (!offset)

		return;

fs/f2fs/inline.c

+18 −0
Original line number Diff line number Diff line
@@ -176,6 +176,24 @@ int f2fs_write_inline_data(struct inode *inode, 
	return 0;

}



void truncate_inline_data(struct inode *inode, u64 from)

{

	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);

	struct page *ipage;



	if (from >= MAX_INLINE_DATA)

		return;



	ipage = get_node_page(sbi, inode->i_ino);

	if (IS_ERR(ipage))

		return;



	zero_user_segment(ipage, INLINE_DATA_OFFSET + from,

				INLINE_DATA_OFFSET + MAX_INLINE_DATA);

	set_page_dirty(ipage);

	f2fs_put_page(ipage, 1);

}



int recover_inline_data(struct inode *inode, struct page *npage)

{

	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);