summaryrefslogtreecommitdiffstats
path: root/fs/ext4/readpage.c
diff options
context:
space:
mode:
authorChandan Rajendra <chandan@linux.vnet.ibm.com>2018-12-12 10:50:10 +0100
committerTheodore Ts'o <tytso@mit.edu>2019-01-24 05:56:43 +0100
commit592ddec7578a33fb6b3e2ba78aed91614bbb30e2 (patch)
tree21b6aea465ac22643d6cec4796536fecd5d92e89 /fs/ext4/readpage.c
parentfscrypt: remove CRYPTO_CTR dependency (diff)
downloadlinux-592ddec7578a33fb6b3e2ba78aed91614bbb30e2.tar.xz
linux-592ddec7578a33fb6b3e2ba78aed91614bbb30e2.zip
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>
Diffstat (limited to 'fs/ext4/readpage.c')
-rw-r--r--fs/ext4/readpage.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index 6aa282ee455a..52d3ff5a9db1 100644
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -242,8 +242,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
if (bio == NULL) {
struct fscrypt_ctx *ctx = NULL;
- if (ext4_encrypted_inode(inode) &&
- S_ISREG(inode->i_mode)) {
+ if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) {
ctx = fscrypt_get_ctx(inode, GFP_NOFS);
if (IS_ERR(ctx))
goto set_error_page;