diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-07-24 11:07:57 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-08-12 19:04:41 -0700 |
| commit | 75798f85f2badb04074cc909dbbb93072f4041ff (patch) | |
| tree | 141805b5dd8d3f13cc42526ed41e876cc1856ef9 /fs/crypto | |
| parent | e21a712a9685488f5ce80495b37b9fdbe96c230d (diff) | |
| download | linux-stable-75798f85f2badb04074cc909dbbb93072f4041ff.tar.gz linux-stable-75798f85f2badb04074cc909dbbb93072f4041ff.tar.bz2 linux-stable-75798f85f2badb04074cc909dbbb93072f4041ff.zip | |
fscrypt: remove loadable module related code
Since commit 643fa9612bf1 ("fscrypt: remove filesystem specific build
config option"), fs/crypto/ can no longer be built as a loadable module.
Thus it no longer needs a module_exit function, nor a MODULE_LICENSE.
So remove them, and change module_init to late_initcall.
Reviewed-by: Chandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/crypto.c | 20 | ||||
| -rw-r--r-- | fs/crypto/fscrypt_private.h | 2 | ||||
| -rw-r--r-- | fs/crypto/keyinfo.c | 5 |
3 files changed, 1 insertions, 26 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index 45c3d0427fb2..d52c788b723d 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -510,22 +510,4 @@ fail_free_queue: fail: return -ENOMEM; } -module_init(fscrypt_init) - -/** - * fscrypt_exit() - Shutdown the fs encryption system - */ -static void __exit fscrypt_exit(void) -{ - fscrypt_destroy(); - - if (fscrypt_read_workqueue) - destroy_workqueue(fscrypt_read_workqueue); - kmem_cache_destroy(fscrypt_ctx_cachep); - kmem_cache_destroy(fscrypt_info_cachep); - - fscrypt_essiv_cleanup(); -} -module_exit(fscrypt_exit); - -MODULE_LICENSE("GPL"); +late_initcall(fscrypt_init) diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 8978eec9d766..224178294371 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -166,6 +166,4 @@ struct fscrypt_mode { bool needs_essiv; }; -extern void __exit fscrypt_essiv_cleanup(void); - #endif /* _FSCRYPT_PRIVATE_H */ diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 207ebed918c1..9bcadc09e2ad 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -437,11 +437,6 @@ out: return err; } -void __exit fscrypt_essiv_cleanup(void) -{ - crypto_free_shash(essiv_hash_tfm); -} - /* * Given the encryption mode and key (normally the derived key, but for * FS_POLICY_FLAG_DIRECT_KEY mode it's the master key), set up the inode's |