diff options
| author |   Eric Biggers <ebiggers@google.com> | 2018-01-05 10:44:52 -0800 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2018-01-11 22:06:17 -0500 |
| commit | 3d463f28564618805713658c6aeb786fa23f420b (patch) | |
| tree | b6d983e16b740a065fcafb6f8f0a51f86f74e9ba /include/linux/fscrypt.h | |
| parent | Linux 4.15-rc4 (diff) | |
| download | wireguard-linux-3d463f28564618805713658c6aeb786fa23f420b.tar.xz wireguard-linux-3d463f28564618805713658c6aeb786fa23f420b.zip | |
fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers
fscrypt_has_encryption_key() 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 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 08b4b40c5aa8..d1c891b5bd9c 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -129,11 +129,6 @@ static inline struct page *fscrypt_control_page(struct page *page) return ((struct fscrypt_ctx *)page_private(page))->w.control_page; } -static inline bool fscrypt_has_encryption_key(const struct inode *inode) -{ - return (inode->i_crypt_info != NULL); -} - #include <linux/fscrypt_supp.h> #else /* !__FS_HAS_ENCRYPTION */ @@ -144,11 +139,6 @@ static inline struct page *fscrypt_control_page(struct page *page) return ERR_PTR(-EINVAL); } -static inline bool fscrypt_has_encryption_key(const struct inode *inode) -{ - return 0; -} - #include <linux/fscrypt_notsupp.h> #endif /* __FS_HAS_ENCRYPTION */ |