[PATCH v3 2/2] f2fs: change return value of f2fs_disable_compressed_file to bool

[Daeho Jeong]

From: Daeho Jeong <daehoje...@google.com>

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

Signed-off-by: Daeho Jeong <daehoje...@google.com>
---
 fs/f2fs/data.c |  2 +-
 fs/f2fs/f2fs.h | 17 ++++++-----------
 fs/f2fs/file.c |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 48cab85205e2..f30348063017 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3936,7 +3936,7 @@ static int f2fs_swap_activate(struct swap_info_struct 
*sis, struct file *file,
        if (ret)
                return ret;
 
-       if (f2fs_disable_compressed_file(inode))
+       if (!f2fs_disable_compressed_file(inode))
                return -EINVAL;
 
        ret = check_swap_activate(sis, file, span);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c615e75c82fd..a33c837e833a 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3930,26 +3930,21 @@ static inline void set_compress_context(struct inode 
*inode)
        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);
-       u32 i_compr_blocks;
 
        if (!f2fs_compressed_file(inode))
-               return 0;
-       if (S_ISREG(inode->i_mode)) {
-               if (get_dirty_pages(inode))
-                       return 1;
-               i_compr_blocks = atomic_read(&fi->i_compr_blocks);
-               if (i_compr_blocks)
-                       return i_compr_blocks;
-       }
+               return true;
+       if (S_ISREG(inode->i_mode) &&
+               (get_dirty_pages(inode) || atomic_read(&fi->i_compr_blocks)))
+               return false;
 
        fi->i_flags &= ~F2FS_COMPR_FL;
        stat_dec_compr_inode(inode);
        clear_inode_flag(inode, FI_COMPRESSED_FILE);
        f2fs_mark_inode_dirty_sync(inode, true);
-       return 0;
+       return true;
 }
 
 #define F2FS_FEATURE_FUNCS(name, flagname) \
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index adc4acad488a..d69def08e25e 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1828,7 +1828,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 
iflags, u32 mask)
 
        if ((iflags ^ 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;
                }
                if (iflags & F2FS_NOCOMP_FL)
@@ -3258,7 +3258,7 @@ static int f2fs_ioc_set_pin_file(struct file *filp, 
unsigned long arg)
        if (ret)
                goto out;
 
-       if (f2fs_disable_compressed_file(inode)) {
+       if (!f2fs_disable_compressed_file(inode)) {
                ret = -EOPNOTSUPP;
                goto out;
        }
-- 
2.28.0.526.ge36021eeef-goog