commit 592ddec7578a33fb6b3e2ba78aed91614bbb30e2
author Chandan Rajendra <chandan@linux.vnet.ibm.com> Wed Dec 12 15:20:10 2018 +0530
committer Theodore Ts'o <tytso@mit.edu> Wed Jan 23 23:56:43 2019 -0500
tree 21b6aea465ac22643d6cec4796536fecd5d92e89
parent 1058ef0dcb7116fc49270131fda3037fddcc6595

ext4: use IS_ENCRYPTED() to check encryption status

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

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>

fs/ext4/ialloc.c

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 7ff14a1..f3e17a8c8 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -771,7 +771,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
 	if (unlikely(ext4_forced_shutdown(sbi)))
 		return ERR_PTR(-EIO);
 
-	if ((ext4_encrypted_inode(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) &&
+	if ((IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) &&
 	    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) &&
 	    !(i_flags & EXT4_EA_INODE_FL)) {
 		err = fscrypt_get_encryption_info(dir);