diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-10-09 12:15:36 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-18 19:52:36 -0400 |
| commit | e0428a266d5a29a3c2eec287fcd49be9e8e2468e (patch) | |
| tree | 0ecedc8aa9793db447da6abdb31506229f582a50 /fs/crypto/fname.c | |
| parent | 2ee6a576be56427209d370d8a511d49340c84139 (diff) | |
| download | linux-e0428a266d5a29a3c2eec287fcd49be9e8e2468e.tar.bz2 | |
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/fname.c')
| -rw-r--r-- | fs/crypto/fname.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index ad9f814fdead..2878289b3ed2 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -382,8 +382,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, memset(fname, 0, sizeof(struct fscrypt_name)); fname->usr_fname = iname; - if (!dir->i_sb->s_cop->is_encrypted(dir) || - fscrypt_is_dot_dotdot(iname)) { + if (!IS_ENCRYPTED(dir) || fscrypt_is_dot_dotdot(iname)) { fname->disk_name.name = (unsigned char *)iname->name; fname->disk_name.len = iname->len; return 0; |