diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-05 10:44:56 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-11 22:06:18 -0500 |
| commit | 1493651b53b4811960b6220a340929074b58a55b (patch) | |
| tree | 75d08b21572cfab9f5e86bb4a5a3ed27a23bb3d2 /include/linux/fscrypt_supp.h | |
| parent | 542060c02cdb5c0740fd7156651463e321a859a3 (diff) | |
fscrypt: split fscrypt_dummy_context_enabled() into supp/notsupp versions
fscrypt_dummy_context_enabled() accesses ->s_cop, which now is only set
when the filesystem is built with encryption support. This didn't
actually matter because no filesystems called it. However, it will
start being used soon, so fix it by moving it from fscrypt.h to
fscrypt_supp.h and stubbing it out in fscrypt_notsupp.h.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'include/linux/fscrypt_supp.h')
| -rw-r--r-- | include/linux/fscrypt_supp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/fscrypt_supp.h b/include/linux/fscrypt_supp.h index fd6ee089ced0..e7dfa2974906 100644 --- a/include/linux/fscrypt_supp.h +++ b/include/linux/fscrypt_supp.h @@ -31,6 +31,12 @@ static inline bool fscrypt_has_encryption_key(const struct inode *inode) return (inode->i_crypt_info != NULL); } +static inline bool fscrypt_dummy_context_enabled(struct inode *inode) +{ + return inode->i_sb->s_cop->dummy_context && + inode->i_sb->s_cop->dummy_context(inode); +} + /* crypto.c */ extern struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *, gfp_t); extern void fscrypt_release_ctx(struct fscrypt_ctx *); |