[PATCH] fscrypt: remove loadable module related code

[PATCH] fscrypt: remove loadable module related code

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

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.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/crypto/crypto.c          | 20 +-------------------
 fs/crypto/fscrypt_private.h |  2 --
 fs/crypto/keyinfo.c         |  5 -----
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 45c3d0427fb253..d52c788b723d01 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -510,22 +510,4 @@ static int __init fscrypt_init(void)
 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 8978eec9d766dd..224178294371a4 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 207ebed918c159..9bcadc09e2aded 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -437,11 +437,6 @@ static int init_essiv_generator(struct fscrypt_info *ci, const u8 *raw_key,
 	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
-- 
2.22.0.657.g960e92d24f-goog

Re: [PATCH] fscrypt: remove loadable module related code

[Chandan Rajendra]

On Thursday, July 25, 2019 1:14:38 AM IST Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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.
>

Looks good to me,

Reviewed-by: Chandan Rajendra <chandan@linux.ibm.com>

> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  fs/crypto/crypto.c          | 20 +-------------------
>  fs/crypto/fscrypt_private.h |  2 --
>  fs/crypto/keyinfo.c         |  5 -----
>  3 files changed, 1 insertion(+), 26 deletions(-)
> 
> diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
> index 45c3d0427fb253..d52c788b723d01 100644
> --- a/fs/crypto/crypto.c
> +++ b/fs/crypto/crypto.c
> @@ -510,22 +510,4 @@ static int __init fscrypt_init(void)
>  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 8978eec9d766dd..224178294371a4 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 207ebed918c159..9bcadc09e2aded 100644
> --- a/fs/crypto/keyinfo.c
> +++ b/fs/crypto/keyinfo.c
> @@ -437,11 +437,6 @@ static int init_essiv_generator(struct fscrypt_info *ci, const u8 *raw_key,
>  	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
> 


-- 
chandan

Re: [PATCH] fscrypt: remove loadable module related code

[Eric Biggers]

On Wed, Jul 24, 2019 at 12:44:38PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Applied to fscrypt tree for 5.4.

- Eric