iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: remove cfs_module() macro

Browse Source 
Open code the module_init/module_exit lines, and also use
MODULE_VERSION, as it seems that was intended, but just never hooked up
at all.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-04 08:16:25 +08:00
parent 305ec768ff
commit 6960736c01
11 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
View File

@ -107,15 +107,6 @@ typedef struct task_struct task_t;
current->journal_info = journal_info; \
} while(0)
/* Module interfaces */
#define cfs_module(name, version, init, fini) \
module_init(init); \
module_exit(fini)
/*
* Signal
*/
/*
* Timer
*/

4
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
View File

@ -2898,5 +2898,7 @@ ksocknal_module_init (void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Kernel TCP Socket LND v3.0.0");
MODULE_LICENSE("GPL");
MODULE_VERSION("3.0.0");
cfs_module(ksocknal, "3.0.0", ksocknal_module_init, ksocknal_module_fini);
module_init(ksocknal_module_init);
module_exit(ksocknal_module_fini);

4
drivers/staging/lustre/lnet/lnet/module.c
View File

@ -149,5 +149,7 @@ fini_lnet(void)
MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
MODULE_DESCRIPTION("Portals v3.1");
MODULE_LICENSE("GPL");
MODULE_VERSION("1.0.0");
cfs_module(lnet, "1.0.0", init_lnet, fini_lnet);
module_init(init_lnet);
module_exit(fini_lnet);

4
drivers/staging/lustre/lnet/selftest/module.c
View File

@ -165,5 +165,7 @@ error:
MODULE_DESCRIPTION("LNet Selftest");
MODULE_LICENSE("GPL");
MODULE_VERSION("0.9.0");
cfs_module(lnet, "0.9.0", lnet_selftest_init, lnet_selftest_fini);
module_init(lnet_selftest_init);
module_exit(lnet_selftest_fini);

4
drivers/staging/lustre/lustre/fid/fid_request.c
View File

@ -564,5 +564,7 @@ static void __exit fid_mod_exit(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre FID Module");
MODULE_LICENSE("GPL");
MODULE_VERSION("0.1.0");
cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
module_init(fid_mod_init);
module_exit(fid_mod_exit);

4
drivers/staging/lustre/lustre/libcfs/module.c
View File

@ -491,4 +491,6 @@ static void exit_libcfs_module(void)
libcfs_arch_cleanup();
}
cfs_module(libcfs, "1.0.0", init_libcfs_module, exit_libcfs_module);
MODULE_VERSION("1.0.0");
module_init(init_libcfs_module);
module_exit(exit_libcfs_module);

4
drivers/staging/lustre/lustre/lov/lov_obd.c
View File

@ -2870,5 +2870,7 @@ static void /*__exit*/ lov_exit(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
cfs_module(lov, LUSTRE_VERSION_STRING, lov_init, lov_exit);
module_init(lov_init);
module_exit(lov_exit);

4
drivers/staging/lustre/lustre/obdclass/class_obd.c
View File

@ -680,5 +680,7 @@ static void cleanup_obdclass(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Class Driver Build Version: " BUILD_VERSION);
MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
cfs_module(obdclass, LUSTRE_VERSION_STRING, init_obdclass, cleanup_obdclass);
module_init(init_obdclass);
module_exit(cleanup_obdclass);

4
drivers/staging/lustre/lustre/obdecho/echo_client.c
View File

@ -3163,7 +3163,9 @@ static void /*__exit*/ obdecho_exit(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Testing Echo OBD driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
cfs_module(obdecho, LUSTRE_VERSION_STRING, obdecho_init, obdecho_exit);
module_init(obdecho_init);
module_exit(obdecho_exit);
/** @} echo_client */

4
drivers/staging/lustre/lustre/osc/osc_request.c
View File

@ -3656,5 +3656,7 @@ static void /*__exit*/ osc_exit(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Object Storage Client (OSC)");
MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
cfs_module(osc, LUSTRE_VERSION_STRING, osc_init, osc_exit);
module_init(osc_init);
module_exit(osc_exit);

4
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
View File

@ -149,5 +149,7 @@ static void __exit ptlrpc_exit(void)
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Request Processor and Lock Management");
MODULE_LICENSE("GPL");
MODULE_VERSION("1.0.0");
cfs_module(ptlrpc, "1.0.0", ptlrpc_init, ptlrpc_exit);
module_init(ptlrpc_init);
module_exit(ptlrpc_exit);