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>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 62d9829f3a6a..e967d27c1a89 100644
--- 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;