Commit e0f94113 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

staging: lustre: make module_init/exit naming consistent 



Make the name of the module_init()/_exit() functions consistently
{module_name}_init and {module_name}_exit.

Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16787


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarFrank Zago <fzago@cray.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57878e17

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+2 −2
Original line number Diff line number Diff line
@@ -450,8 +450,8 @@ lnet_ni_t *lnet_net2ni(__u32 net); 


extern int portal_rotor;



int lnet_init(void);

void lnet_fini(void);

int lnet_lib_init(void);

void lnet_lib_exit(void);



int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, unsigned long when);

void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive,

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+4 −4
Original line number Diff line number Diff line
@@ -2840,12 +2840,12 @@ net_failed: 
	return -ENETDOWN;

}



static void __exit kiblnd_module_fini(void)

static void __exit ko2iblnd_exit(void)

{

	lnet_unregister_lnd(&the_o2iblnd);

}



static int __init kiblnd_module_init(void)

static int __init ko2iblnd_init(void)

{

	int rc;
@@ -2871,5 +2871,5 @@ MODULE_DESCRIPTION("OpenIB gen2 LNet Network Driver"); 
MODULE_VERSION("2.7.0");

MODULE_LICENSE("GPL");



module_init(kiblnd_module_init);

module_exit(kiblnd_module_fini);
 
module_init(ko2iblnd_init);

module_exit(ko2iblnd_exit);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+4 −6
Original line number Diff line number Diff line
@@ -2889,14 +2889,12 @@ ksocknal_startup(lnet_ni_t *ni) 
	return -ENETDOWN;

}



static void __exit

ksocknal_module_fini(void)

static void __exit ksocklnd_exit(void)

{

	lnet_unregister_lnd(&the_ksocklnd);

}



static int __init

ksocknal_module_init(void)

static int __init ksocklnd_init(void)

{

	int rc;
@@ -2929,5 +2927,5 @@ MODULE_DESCRIPTION("TCP Socket LNet Network Driver"); 
MODULE_VERSION("2.7.0");

MODULE_LICENSE("GPL");



module_init(ksocknal_module_init);

module_exit(ksocknal_module_fini);
 
module_init(ksocklnd_init);

module_exit(ksocklnd_exit);

drivers/staging/lustre/lnet/lnet/api-ni.c

+4 −6
Original line number Diff line number Diff line
@@ -1386,13 +1386,12 @@ failed: 
 * Initialize LNet library.

 *

 * Automatically called at module loading time. Caller has to call

 * lnet_exit() after a call to lnet_init(), if and only if the

 * lnet_lib_exit() after a call to lnet_lib_init(), if and only if the

 * latter returned 0. It must be called exactly once.

 *

 * \return 0 on success, and -ve on failures.

 */

int

lnet_init(void)

int lnet_lib_init(void)

{

	int rc;
@@ -1451,11 +1450,10 @@ lnet_init(void) 
/**

 * Finalize LNet library.

 *

 * \pre lnet_init() called with success.

 * \pre lnet_lib_init() called with success.

 * \pre All LNet users called LNetNIFini() for matching LNetNIInit() calls.

 */

void

lnet_fini(void)

void lnet_lib_exit(void)

{

	LASSERT(!the_lnet.ln_refcount);

drivers/staging/lustre/lnet/lnet/module.c

+7 −9
Original line number Diff line number Diff line
@@ -185,16 +185,15 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) 


static DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);



static int __init

init_lnet(void)

static int __init lnet_init(void)

{

	int rc;



	mutex_init(&lnet_config_mutex);



	rc = lnet_init();

	rc = lnet_lib_init();

	if (rc) {

		CERROR("lnet_init: error %d\n", rc);

		CERROR("lnet_lib_init: error %d\n", rc);

		return rc;

	}
@@ -212,15 +211,14 @@ init_lnet(void) 
	return 0;

}



static void __exit

fini_lnet(void)

static void __exit lnet_exit(void)

{

	int rc;



	rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);

	LASSERT(!rc);



	lnet_fini();

	lnet_lib_exit();

}



MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
@@ -228,5 +226,5 @@ MODULE_DESCRIPTION("Lustre Networking layer"); 
MODULE_VERSION(LNET_VERSION);

MODULE_LICENSE("GPL");



module_init(init_lnet);

module_exit(fini_lnet);
 
module_init(lnet_init);

module_exit(lnet_exit);

CRA Git | Maintained and supported by SUSTech CRA and CCSE