summaryrefslogtreecommitdiffstats
path: root/fs/crypto/crypto.c
diff options
context:
space:
mode:
authorEric Biggers2017-10-09 21:15:36 +0200
committerTheodore Ts'o2017-10-19 01:52:36 +0200
commite0428a266d5a29a3c2eec287fcd49be9e8e2468e (patch)
tree0ecedc8aa9793db447da6abdb31506229f582a50 /fs/crypto/crypto.c
parentfs, fscrypt: add an S_ENCRYPTED inode flag (diff)
downloadkernel-qcow2-linux-e0428a266d5a29a3c2eec287fcd49be9e8e2468e.tar.gz
kernel-qcow2-linux-e0428a266d5a29a3c2eec287fcd49be9e8e2468e.tar.xz
kernel-qcow2-linux-e0428a266d5a29a3c2eec287fcd49be9e8e2468e.zip
fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED()
IS_ENCRYPTED() now gives the same information as i_sb->s_cop->is_encrypted() but is more efficient, since IS_ENCRYPTED() is just a simple flag check. Prepare to remove ->is_encrypted() by switching all callers to IS_ENCRYPTED(). Acked-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto/crypto.c')
-rw-r--r--fs/crypto/crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index c7835df7e7b8..608f6bbe0f31 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -340,7 +340,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
return -ECHILD;
dir = dget_parent(dentry);
- if (!d_inode(dir)->i_sb->s_cop->is_encrypted(d_inode(dir))) {
+ if (!IS_ENCRYPTED(d_inode(dir))) {
dput(dir);
return 0;
}