diff options
| author | Chandan Rajendra | 2018-12-12 10:50:10 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2019-01-24 05:56:43 +0100 |
| commit | 592ddec7578a33fb6b3e2ba78aed91614bbb30e2 (patch) | |
| tree | 21b6aea465ac22643d6cec4796536fecd5d92e89 /fs/ext4/ialloc.c | |
| parent | fscrypt: remove CRYPTO_CTR dependency (diff) | |
| download | kernel-qcow2-linux-592ddec7578a33fb6b3e2ba78aed91614bbb30e2.tar.gz kernel-qcow2-linux-592ddec7578a33fb6b3e2ba78aed91614bbb30e2.tar.xz kernel-qcow2-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/ialloc.c')
| -rw-r--r-- | fs/ext4/ialloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 7ff14a1adba3..f3e17a8c84b4 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); |