Commit aa576970 authored Mar 27, 2020 by Chao Yu Committed by Jaegeuk Kim Apr 03, 2020

f2fs: fix to disable compression on directory



It needs to call f2fs_disable_compressed_file() to disable
compression on directory.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 9b6ed143

fs/f2fs/f2fs.h

+6 −4

Original line number	Diff line number	Diff line
		@@ -3849,10 +3849,12 @@ static inline u64 f2fs_disable_compressed_file(struct inode *inode)

		if (!f2fs_compressed_file(inode))
		return 0;
		if (S_ISREG(inode->i_mode)) {
		if (get_dirty_pages(inode))
		return 1;
		if (fi->i_compr_blocks)
		return fi->i_compr_blocks;
		}

		fi->i_flags &= ~F2FS_COMPR_FL;
		stat_dec_compr_inode(inode);

fs/f2fs/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1815,7 +1815,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
		}

		if ((iflags ^ masked_flags) & F2FS_COMPR_FL) {
		if (S_ISREG(inode->i_mode) && (masked_flags & F2FS_COMPR_FL)) {
		if (masked_flags & F2FS_COMPR_FL) {
		if (f2fs_disable_compressed_file(inode))
		return -EINVAL;
		}