f2fs: use IS_ENCRYPTED() to check encryption status

This commit removes the f2fs specific f2fs_encrypted_inode() and makes
use of the generic IS_ENCRYPTED() macro to check for the encryption
status of an inode.

Acked-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f91d8630c9a2d768d365e443811c37a4a1023a1e..a36eb260656e2e3943bc9079206a0cccd9fdc883 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1465,7 +1465,7 @@ next:
        }
 
        if (size) {
-               if (f2fs_encrypted_inode(inode))
+               if (IS_ENCRYPTED(inode))
                        flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;
 
                ret = fiemap_fill_next_extent(fieinfo, logical,
@@ -1736,7 +1736,7 @@ static inline bool check_inplace_update_policy(struct inode *inode,
        if (policy & (0x1 << F2FS_IPU_ASYNC) &&
                        fio && fio->op == REQ_OP_WRITE &&
                        !(fio->op_flags & REQ_SYNC) &&
-                       !f2fs_encrypted_inode(inode))
+                       !IS_ENCRYPTED(inode))
                return true;
 
        /* this is only set during fdatasync */

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 50d0d36280fac5e92094743c1a868bad55a25bda..713b36a10a7900a99bf3ddf24b138e2714a9cdab 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -385,7 +385,7 @@ struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,
                if (err)
                        goto put_error;
 
-               if ((f2fs_encrypted_inode(dir) || dummy_encrypt) &&
+               if ((IS_ENCRYPTED(dir) || dummy_encrypt) &&
                                        f2fs_may_encrypt(inode)) {
                        err = fscrypt_inherit_context(dir, inode, page, false);
                        if (err)
@@ -399,7 +399,7 @@ struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,
 
        if (new_name) {
                init_dent_inode(new_name, page);
-               if (f2fs_encrypted_inode(dir))
+               if (IS_ENCRYPTED(dir))
                        file_set_enc_name(inode);
        }
 
@@ -819,7 +819,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
                        goto out;
                }
 
-               if (f2fs_encrypted_inode(d->inode)) {
+               if (IS_ENCRYPTED(d->inode)) {
                        int save_len = fstr->len;
 
                        err = fscrypt_fname_disk_to_usr(d->inode,
@@ -862,7 +862,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
        struct fscrypt_str fstr = FSTR_INIT(NULL, 0);
        int err = 0;
 
-       if (f2fs_encrypted_inode(inode)) {
+       if (IS_ENCRYPTED(inode)) {
                err = fscrypt_get_encryption_info(inode);
                if (err && err != -ENOKEY)
                        goto out;
@@ -924,7 +924,7 @@ out:
 
 static int f2fs_dir_open(struct inode *inode, struct file *filp)
 {
-       if (f2fs_encrypted_inode(inode))
+       if (IS_ENCRYPTED(inode))
                return fscrypt_get_encryption_info(inode) ? -EACCES : 0;
        return 0;
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 12fabd6735ddb88e3eab3460b8a912924d164636..9ef6f38e51cc2a52beaa652858fe1dbc42553fbe 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3463,14 +3463,9 @@ void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi);
 /*
  * crypto support
  */
-static inline bool f2fs_encrypted_inode(struct inode *inode)
-{
-       return file_is_encrypt(inode);
-}
-
 static inline bool f2fs_encrypted_file(struct inode *inode)
 {
-       return f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode);
+       return IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode);
 }
 
 static inline void f2fs_set_encrypted_inode(struct inode *inode)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index bba56b39dcc55a1b15da3a90ddb3c53cb894e7f2..ba5954f41e1406caa3194ec09a1a6cc133a001f2 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -582,7 +582,7 @@ truncate_out:
        zero_user(page, offset, PAGE_SIZE - offset);
 
        /* An encrypted inode should have a key and truncate the last page. */
-       f2fs_bug_on(F2FS_I_SB(inode), cache_only && f2fs_encrypted_inode(inode));
+       f2fs_bug_on(F2FS_I_SB(inode), cache_only && IS_ENCRYPTED(inode));
        if (!cache_only)
                set_page_dirty(page);
        f2fs_put_page(page, 1);
@@ -711,7 +711,7 @@ int f2fs_getattr(const struct path *path, struct kstat *stat,
                stat->attributes |= STATX_ATTR_APPEND;
        if (flags & F2FS_COMPR_FL)
                stat->attributes |= STATX_ATTR_COMPRESSED;
-       if (f2fs_encrypted_inode(inode))
+       if (IS_ENCRYPTED(inode))
                stat->attributes |= STATX_ATTR_ENCRYPTED;
        if (flags & F2FS_IMMUTABLE_FL)
                stat->attributes |= STATX_ATTR_IMMUTABLE;
@@ -1563,7 +1563,7 @@ static long f2fs_fallocate(struct file *file, int mode,
        if (!S_ISREG(inode->i_mode))
                return -EINVAL;
 
-       if (f2fs_encrypted_inode(inode) &&
+       if (IS_ENCRYPTED(inode) &&
                (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))
                return -EOPNOTSUPP;
 
@@ -1647,7 +1647,7 @@ static int f2fs_ioc_getflags(struct file *filp, unsigned long arg)
        struct f2fs_inode_info *fi = F2FS_I(inode);
        unsigned int flags = fi->i_flags;
 
-       if (f2fs_encrypted_inode(inode))
+       if (IS_ENCRYPTED(inode))
                flags |= F2FS_ENCRYPT_FL;
        if (f2fs_has_inline_data(inode) || f2fs_has_inline_dentry(inode))
                flags |= F2FS_INLINE_DATA_FL;
@@ -2414,7 +2414,7 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in,
        if (!S_ISREG(src->i_mode) || !S_ISREG(dst->i_mode))
                return -EINVAL;
 
-       if (f2fs_encrypted_inode(src) || f2fs_encrypted_inode(dst))
+       if (IS_ENCRYPTED(src) || IS_ENCRYPTED(dst))
                return -EOPNOTSUPP;
 
        if (src == dst) {

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index bec52961630b91215eeb107029ad78610779201b..d910a820ae675cd19de332df5d296225eb9aa86a 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -43,7 +43,7 @@ void f2fs_set_inode_flags(struct inode *inode)
                new_fl |= S_NOATIME;
        if (flags & F2FS_DIRSYNC_FL)
                new_fl |= S_DIRSYNC;
-       if (f2fs_encrypted_inode(inode))
+       if (file_is_encrypt(inode))
                new_fl |= S_ENCRYPTED;
        inode_set_flags(inode, new_fl,
                        S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|
@@ -453,7 +453,7 @@ make_now:
                inode->i_mapping->a_ops = &f2fs_dblock_aops;
                inode_nohighmem(inode);
        } else if (S_ISLNK(inode->i_mode)) {
-               if (f2fs_encrypted_inode(inode))
+               if (file_is_encrypt(inode))
                        inode->i_op = &f2fs_encrypted_symlink_inode_operations;
                else
                        inode->i_op = &f2fs_symlink_inode_operations;

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 62d9829f3a6a7ea23746e04891a819dddb221c8a..e967d27c1a89012a4236b750ca8d7cc923b28907 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -75,7 +75,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
        set_inode_flag(inode, FI_NEW_INODE);
 
        /* If the directory encrypted, then we should encrypt the inode. */
-       if ((f2fs_encrypted_inode(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) &&
+       if ((IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) &&
                                f2fs_may_encrypt(inode))
                f2fs_set_encrypted_inode(inode);
 
@@ -476,7 +476,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
                if (err)
                        goto out_iput;
        }
-       if (f2fs_encrypted_inode(dir) &&
+       if (IS_ENCRYPTED(dir) &&
            (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
            !fscrypt_has_permitted_context(dir, inode)) {
                f2fs_msg(inode->i_sb, KERN_WARNING,
@@ -803,7 +803,7 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
        if (unlikely(f2fs_cp_error(sbi)))
                return -EIO;
 
-       if (f2fs_encrypted_inode(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) {
+       if (IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) {
                int err = fscrypt_get_encryption_info(dir);
                if (err)
                        return err;