Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9842574a authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

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: default avatarChandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent a0efa0dc

fs/crypto/crypto.c

+1 −19
Original line number Diff line number Diff line
@@ -509,22 +509,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)

fs/crypto/fscrypt_private.h

+0 −2
Original line number Diff line number Diff line
@@ -166,6 +166,4 @@ struct fscrypt_mode { 
	bool needs_essiv;

};



extern void __exit fscrypt_essiv_cleanup(void);



#endif /* _FSCRYPT_PRIVATE_H */

fs/crypto/keyinfo.c

+0 −5
Original line number Diff line number Diff line
@@ -438,11 +438,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