Commit 0cab80ee authored Dec 01, 2015 by Chao Yu Committed by Jaegeuk Kim Dec 04, 2015

f2fs: fix to convert inline inode in ->setattr

In commit 3c454145 ("f2fs: do not trim preallocated blocks when
truncating after i_size"), in order to follow the regulation: "truncate(x)
where x > i_size will not trim all blocks past i_size." like other file
systems, in ->setattr we invoked truncate_setsize instead of f2fs_truncate
to avoid unneeded block trimming in such case, but forgot to call
f2fs_convert_inline_inode keep consistency of inline data conversion rule.

This patch fixes to convert inline data if necessary.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 3519e3f9

fs/f2fs/file.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -686,6 +686,14 @@ int f2fs_setattr(struct dentry dentry, struct iattr attr)
		* larger than i_size.
		*/
		truncate_setsize(inode, attr->ia_size);

		/* should convert inline inode here */
		if (f2fs_has_inline_data(inode) &&
		!f2fs_may_inline_data(inode)) {
		err = f2fs_convert_inline_inode(inode);
		if (err)
		return err;
		}
		inode->i_mtime = inode->i_ctime = CURRENT_TIME;
		}
		}

Admin message