Commit a9cf72b6 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging:lustre: fix camel case for LNetInit and LNetFini

For the functions LNetInit and LNetFini move away from
camel case to lnet_init and lnet_fini.
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db18b8e9
...@@ -52,9 +52,6 @@ ...@@ -52,9 +52,6 @@
/** \defgroup lnet_init_fini Initialization and cleanup /** \defgroup lnet_init_fini Initialization and cleanup
* The LNet must be properly initialized before any LNet calls can be made. * The LNet must be properly initialized before any LNet calls can be made.
* @{ */ * @{ */
int LNetInit(void);
void LNetFini(void);
int LNetNIInit(lnet_pid_t requested_pid); int LNetNIInit(lnet_pid_t requested_pid);
int LNetNIFini(void); int LNetNIFini(void);
/** @} lnet_init_fini */ /** @} lnet_init_fini */
......
...@@ -434,6 +434,9 @@ lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt); ...@@ -434,6 +434,9 @@ lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);
lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt); lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt);
lnet_ni_t *lnet_net2ni(__u32 net); lnet_ni_t *lnet_net2ni(__u32 net);
int lnet_init(void);
void lnet_fini(void);
int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, unsigned long when); 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, void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive,
unsigned long when); unsigned long when);
......
...@@ -575,7 +575,7 @@ typedef struct { ...@@ -575,7 +575,7 @@ typedef struct {
struct mutex ln_api_mutex; struct mutex ln_api_mutex;
struct mutex ln_lnd_mutex; struct mutex ln_lnd_mutex;
int ln_init; /* LNetInit() called? */ int ln_init; /* lnet_init() called? */
/* Have I called LNetNIInit myself? */ /* Have I called LNetNIInit myself? */
int ln_niinit_self; int ln_niinit_self;
/* LNetNIInit/LNetNIFini counter */ /* LNetNIInit/LNetNIFini counter */
......
...@@ -1101,14 +1101,14 @@ lnet_startup_lndnis(void) ...@@ -1101,14 +1101,14 @@ lnet_startup_lndnis(void)
* Initialize LNet library. * Initialize LNet library.
* *
* Only userspace program needs to call this function - it's automatically * Only userspace program needs to call this function - it's automatically
* called in the kernel at module loading time. Caller has to call LNetFini() * called in the kernel at module loading time. Caller has to call lnet_fini()
* after a call to LNetInit(), if and only if the latter returned 0. It must * after a call to lnet_init(), if and only if the latter returned 0. It must
* be called exactly once. * be called exactly once.
* *
* \return 0 on success, and -ve on failures. * \return 0 on success, and -ve on failures.
*/ */
int int
LNetInit(void) lnet_init(void)
{ {
int rc; int rc;
...@@ -1161,7 +1161,7 @@ LNetInit(void) ...@@ -1161,7 +1161,7 @@ LNetInit(void)
lnet_register_lnd(&the_lolnd); lnet_register_lnd(&the_lolnd);
return 0; return 0;
} }
EXPORT_SYMBOL(LNetInit); EXPORT_SYMBOL(lnet_init);
/** /**
* Finalize LNet library. * Finalize LNet library.
...@@ -1169,11 +1169,11 @@ EXPORT_SYMBOL(LNetInit); ...@@ -1169,11 +1169,11 @@ EXPORT_SYMBOL(LNetInit);
* Only userspace program needs to call this function. It can be called * Only userspace program needs to call this function. It can be called
* at most once. * at most once.
* *
* \pre LNetInit() called with success. * \pre lnet_init() called with success.
* \pre All LNet users called LNetNIFini() for matching LNetNIInit() calls. * \pre All LNet users called LNetNIFini() for matching LNetNIInit() calls.
*/ */
void void
LNetFini(void) lnet_fini(void)
{ {
LASSERT(the_lnet.ln_init); LASSERT(the_lnet.ln_init);
LASSERT(the_lnet.ln_refcount == 0); LASSERT(the_lnet.ln_refcount == 0);
...@@ -1185,12 +1185,12 @@ LNetFini(void) ...@@ -1185,12 +1185,12 @@ LNetFini(void)
the_lnet.ln_init = 0; the_lnet.ln_init = 0;
} }
EXPORT_SYMBOL(LNetFini); EXPORT_SYMBOL(lnet_fini);
/** /**
* Set LNet PID and start LNet interfaces, routing, and forwarding. * Set LNet PID and start LNet interfaces, routing, and forwarding.
* *
* Userspace program should call this after a successful call to LNetInit(). * Userspace program should call this after a successful call to lnet_init().
* Users must call this function at least once before any other functions. * Users must call this function at least once before any other functions.
* For each successful call there must be a corresponding call to * For each successful call there must be a corresponding call to
* LNetNIFini(). For subsequent calls to LNetNIInit(), \a requested_pid is * LNetNIFini(). For subsequent calls to LNetNIInit(), \a requested_pid is
......
...@@ -117,9 +117,9 @@ init_lnet(void) ...@@ -117,9 +117,9 @@ init_lnet(void)
mutex_init(&lnet_config_mutex); mutex_init(&lnet_config_mutex);
rc = LNetInit(); rc = lnet_init();
if (rc != 0) { if (rc != 0) {
CERROR("LNetInit: error %d\n", rc); CERROR("lnet_init: error %d\n", rc);
return rc; return rc;
} }
...@@ -143,7 +143,7 @@ fini_lnet(void) ...@@ -143,7 +143,7 @@ fini_lnet(void)
rc = libcfs_deregister_ioctl(&lnet_ioctl_handler); rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
LASSERT(rc == 0); LASSERT(rc == 0);
LNetFini(); lnet_fini();
} }
MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>"); MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment