anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BACKPORT: f2fs: do not set compression bit if kernel doesn't support

Browse Source 
If kernel doesn't have CONFIG_F2FS_FS_COMPRESSION, a file having FS_COMPR_FL via
ioctl(FS_IOC_SETFLAGS) is unaccessible due to f2fs_is_compress_backend_ready().
Let's avoid it.

Bug: 228919347
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 816857d20b4fe42e2eb40329ebed9ade61d3378f)
Change-Id: I6a85f18de1b0a98ea009e0295cd213e692db3aad
This commit is contained in:
Jaegeuk Kim
2022-08-03 20:33:54 -07:00
committed by Todd Kjos
parent 66a0472aac
commit 70d1b9fe5f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/f2fs/f2fs.h
View File

@@ -4280,8 +4280,9 @@ static inline void f2fs_update_extent_tree_range_compressed(struct inode *inode,
unsigned int c_len) { }
#endif
static inline void set_compress_context(struct inode *inode)
static inline int set_compress_context(struct inode *inode)
{
#ifdef CONFIG_F2FS_FS_COMPRESSION
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
F2FS_I(inode)->i_compress_algorithm =
@@ -4304,6 +4305,10 @@ static inline void set_compress_context(struct inode *inode)
stat_inc_compr_inode(inode);
inc_compr_inode_stat(inode);
f2fs_mark_inode_dirty_sync(inode, true);
return 0;
#else
return -EOPNOTSUPP;
#endif
}
static inline bool f2fs_disable_compressed_file(struct inode *inode)

4
fs/f2fs/file.c
View File

@@ -1874,8 +1874,8 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
return -EINVAL;
if (S_ISREG(inode->i_mode) && inode->i_size)
return -EINVAL;
set_compress_context(inode);
if (set_compress_context(inode))
return -EOPNOTSUPP;
}
}