f2fs: fix error path of f2fs_convert_inline_page()
PATCH v2 1/2 f2fs: fix error path of f2fs_convert_inline_page()
In error path of f2fs_convert_inline_page(), we missed to truncate newly reserved block in .i_addrs[0] once we failed in get_node_info(), fix it.
Fixes 7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/inline.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/inline.c +1 -0
@@ -131,6 +131,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) err =f2fs_get_node_info (fio.sbi, dn->nid, &ni);if (err) { +f2fs_truncate_data_blocks_range (dn,1 );f2fs_put_dnode (dn);return err; }
Signature · 1 line
2.18.0.rc1
PATCH v2 2/2 f2fs: convert inline_data in prior to i_size_write
From: Jaegeuk Kim <[email protected]>
In below call path, we change i_size before inline conversion, however, if we failed to convert inline inode, the inode may have wrong i_size which is larger than max inline size, result inline inode corruption.
- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode
This patch reorders truncate_setsize() and f2fs_convert_inline_inode() to guarantee inline_data has valid i_size.
Fixes 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Reviewed-by Chao Yu <[email protected]>
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/file.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
fs/f2fs/file.c +13 -13
@@ -814,14 +814,24 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) }if (attr->ia_valid &ATTR_SIZE ) { -bool to_smaller = (attr->ia_size <=i_size_read (inode)); +loff_t old_size =i_size_read (inode); + +if (attr->ia_size >MAX_INLINE_DATA (inode)) { +/* +* should convert inline inode before i_size_write to +* keep smaller than inline_data size with inline flag. +*/ + err =f2fs_convert_inline_inode (inode); +if (err) +return err; + }down_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]);down_write (&F2FS_I (inode)->i_mmap_sem);truncate_setsize (inode, attr->ia_size); -if (to_smaller) +if (attr->ia_size <= old_size) err =f2fs_truncate (inode);/* * do not trim all blocks after i_size if target size is
@@ -829,21 +839,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)*/ up_write (&F2FS_I (inode)->i_mmap_sem);up_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]); -if (err)return err; -if (!to_smaller) { -/* should convert inline inode here */ -if (!f2fs_may_inline_data (inode)) { - err =f2fs_convert_inline_inode (inode); -if (err) -return err; - } - inode->i_mtime = inode->i_ctime =current_time (inode); - } -down_write (&F2FS_I (inode)->i_sem); + inode->i_mtime = inode->i_ctime =current_time (inode);F2FS_I (inode)->last_disk_size =i_size_read (inode);up_write (&F2FS_I (inode)->i_sem); }
Signature · 1 line
2.18.0.rc1