diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-10-09 21:15:36 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-19 01:52:36 +0200 |
| commit | e0428a266d5a29a3c2eec287fcd49be9e8e2468e (patch) | |
| tree | 0ecedc8aa9793db447da6abdb31506229f582a50 /fs/crypto/keyinfo.c | |
| parent | fs, fscrypt: add an S_ENCRYPTED inode flag (diff) | |
| download | linux-e0428a266d5a29a3c2eec287fcd49be9e8e2468e.tar.xz 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/keyinfo.c')
| -rw-r--r-- | fs/crypto/keyinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 018c588c7ac3..236a68d4ea72 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -268,7 +268,7 @@ int fscrypt_get_encryption_info(struct inode *inode) res = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx)); if (res < 0) { if (!fscrypt_dummy_context_enabled(inode) || - inode->i_sb->s_cop->is_encrypted(inode)) + IS_ENCRYPTED(inode)) return res; /* Fake up a context for an unencrypted directory */ memset(&ctx, 0, sizeof(ctx)); |