UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

f2fs: change return value of f2fs_disable_compressed_file to bool 

The returned integer is not required anywhere. So we need to change
the return value to bool type.

Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Daeho Jeong 2020-09-08 11:44:11 +09:00 committed by Jaegeuk Kim
parent c2759ebaf7
commit 78134d0351
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/data.c
View File

@ -3996,7 +3996,7 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file,
if (ret) if (ret)
return ret; return ret;
if (f2fs_disable_compressed_file(inode)) if (!f2fs_disable_compressed_file(inode))
return -EINVAL; return -EINVAL;
ret = check_swap_activate(sis, file, span); ret = check_swap_activate(sis, file, span);

17
fs/f2fs/f2fs.h
View File

@ -3963,26 +3963,21 @@ static inline void set_compress_context(struct inode *inode)
f2fs_mark_inode_dirty_sync(inode, true); f2fs_mark_inode_dirty_sync(inode, true);
} }
static inline u32 f2fs_disable_compressed_file(struct inode *inode) static inline bool f2fs_disable_compressed_file(struct inode *inode)
{ {
struct f2fs_inode_info *fi = F2FS_I(inode); struct f2fs_inode_info *fi = F2FS_I(inode);
u32 i_compr_blocks;
if (!f2fs_compressed_file(inode)) if (!f2fs_compressed_file(inode))
return 0; return true;
if (S_ISREG(inode->i_mode)) { if (S_ISREG(inode->i_mode) &&
if (get_dirty_pages(inode)) (get_dirty_pages(inode) || atomic_read(&fi->i_compr_blocks)))
return 1; return false;
i_compr_blocks = atomic_read(&fi->i_compr_blocks);
if (i_compr_blocks)
return i_compr_blocks;
}
fi->i_flags &= ~F2FS_COMPR_FL; fi->i_flags &= ~F2FS_COMPR_FL;
stat_dec_compr_inode(inode); stat_dec_compr_inode(inode);
clear_inode_flag(inode, FI_COMPRESSED_FILE); clear_inode_flag(inode, FI_COMPRESSED_FILE);
f2fs_mark_inode_dirty_sync(inode, true); f2fs_mark_inode_dirty_sync(inode, true);
return 0; return true;
} }
#define F2FS_FEATURE_FUNCS(name, flagname) \ #define F2FS_FEATURE_FUNCS(name, flagname) \

4
fs/f2fs/file.c
View File

@ -1813,7 +1813,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
if ((iflags ^ masked_flags) & F2FS_COMPR_FL) { if ((iflags ^ masked_flags) & F2FS_COMPR_FL) {
if (masked_flags & F2FS_COMPR_FL) { if (masked_flags & F2FS_COMPR_FL) {
if (f2fs_disable_compressed_file(inode)) if (!f2fs_disable_compressed_file(inode))
return -EINVAL; return -EINVAL;
} }
if (iflags & F2FS_NOCOMP_FL) if (iflags & F2FS_NOCOMP_FL)
@ -3246,7 +3246,7 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)
if (ret) if (ret)
goto out; goto out;
if (f2fs_disable_compressed_file(inode)) { if (!f2fs_disable_compressed_file(inode)) {
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto out; goto out;
} }