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.h | |
| parent | 542060c02cdb5c0740fd7156651463e321a859a3 (diff) | |
| download | linux-1493651b53b4811960b6220a340929074b58a55b.tar.gz linux-1493651b53b4811960b6220a340929074b58a55b.tar.bz2 linux-1493651b53b4811960b6220a340929074b58a55b.zip | |
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.h')
| -rw-r--r-- | include/linux/fscrypt.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 0f94d087a6d1..b671a4eef47f 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -75,14 +75,6 @@ struct fscrypt_operations { /* Maximum value for the third parameter of fscrypt_operations.set_context(). */ #define FSCRYPT_SET_CONTEXT_MAX_SIZE 28 -static inline bool fscrypt_dummy_context_enabled(struct inode *inode) -{ - if (inode->i_sb->s_cop->dummy_context && - inode->i_sb->s_cop->dummy_context(inode)) - return true; - return false; -} - static inline bool fscrypt_valid_enc_modes(u32 contents_mode, u32 filenames_mode) { |