diff options
| author |   Eric Biggers <ebiggers@google.com> | 2018-01-05 10:44:53 -0800 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2018-01-11 22:06:18 -0500 |
| commit | 4fd4b15ccbc79d512ad7982fc1a7ecd34703398f (patch) | |
| tree | 3aef31f51bda93d17d617c4a3cff23b52cecf176 /include/linux/fscrypt.h | |
| parent | fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers (diff) | |
| download | wireguard-linux-4fd4b15ccbc79d512ad7982fc1a7ecd34703398f.tar.xz wireguard-linux-4fd4b15ccbc79d512ad7982fc1a7ecd34703398f.zip | |
fscrypt: move fscrypt_control_page() to supp/notsupp headers
fscrypt_control_page() is already split into two versions depending on
whether the filesystem is being built with encryption support or not.
Move them into the appropriate headers.
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 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index d1c891b5bd9c..c23b2f16129a 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -123,24 +123,10 @@ static inline bool fscrypt_is_dot_dotdot(const struct qstr *str) } #if __FS_HAS_ENCRYPTION - -static inline struct page *fscrypt_control_page(struct page *page) -{ - return ((struct fscrypt_ctx *)page_private(page))->w.control_page; -} - #include <linux/fscrypt_supp.h> - -#else /* !__FS_HAS_ENCRYPTION */ - -static inline struct page *fscrypt_control_page(struct page *page) -{ - WARN_ON_ONCE(1); - return ERR_PTR(-EINVAL); -} - +#else #include <linux/fscrypt_notsupp.h> -#endif /* __FS_HAS_ENCRYPTION */ +#endif /** * fscrypt_require_key - require an inode's encryption key |