lisa/android_kernel_xiaomi_sm8350
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: 240921972
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit d5a44717f6e0f0943808671e36b1909619707016)
Change-Id: Ieb0f8945175ea5ccb0060690e882f054360fb8f0
This commit is contained in:
Jaegeuk Kim 2022-08-03 20:33:54 -07:00 committed by Jaegeuk Kim
parent 17bdd623f3
commit 26eb689452
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/f2fs/f2fs.h
View File

@ -3932,8 +3932,9 @@ static inline int f2fs_init_compress_mempool(void) { return 0; }
static inline void f2fs_destroy_compress_mempool(void) { } static inline void f2fs_destroy_compress_mempool(void) { }
#endif #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); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
F2FS_I(inode)->i_compress_algorithm = F2FS_I(inode)->i_compress_algorithm =
@ -3946,6 +3947,10 @@ static inline void set_compress_context(struct inode *inode)
set_inode_flag(inode, FI_COMPRESSED_FILE); set_inode_flag(inode, FI_COMPRESSED_FILE);
stat_inc_compr_inode(inode); stat_inc_compr_inode(inode);
f2fs_mark_inode_dirty_sync(inode, true); f2fs_mark_inode_dirty_sync(inode, true);
return 0;
#else
return -EOPNOTSUPP;
#endif
} }
static inline u32 f2fs_disable_compressed_file(struct inode *inode) static inline u32 f2fs_disable_compressed_file(struct inode *inode)

4
fs/f2fs/file.c
View File

@ -1847,8 +1847,8 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
if (iflags & F2FS_COMPR_FL) { if (iflags & F2FS_COMPR_FL) {
if (!f2fs_may_compress(inode)) if (!f2fs_may_compress(inode))
return -EINVAL; return -EINVAL;
if (set_compress_context(inode))
set_compress_context(inode); return -EOPNOTSUPP;
} }
} }
if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) { if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) {