From: Liu Xuezhao Date: Tue, 10 Jul 2012 13:09:29 +0000 (+0800) Subject: LU-1347 lnet: makes EXPORT_SYMBOL follows function body X-Git-Tag: 2.2.91~29 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=dd62978b709aebf3dda536f2230f1b79c5361d9c LU-1347 lnet: makes EXPORT_SYMBOL follows function body Makes EXPORT_SYMBOL macros immediately follow the function body, to follow normal Linux kernel coding style. Signed-off-by: Liu Xuezhao Change-Id: Ief3cc2a8e6bf6ad851287278a354fe542d330865 Reviewed-on: http://review.whamcloud.com/2836 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Liang Zhen Reviewed-by: Andreas Dilger --- diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 9e344d4..0a0b8a9 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -44,6 +44,7 @@ #endif lnet_t the_lnet; /* THE state of the network */ +EXPORT_SYMBOL(the_lnet); #ifdef __KERNEL__ @@ -368,6 +369,7 @@ lnet_register_lnd (lnd_t *lnd) LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex); } +EXPORT_SYMBOL(lnet_register_lnd); void lnet_unregister_lnd (lnd_t *lnd) @@ -383,6 +385,7 @@ lnet_unregister_lnd (lnd_t *lnd) LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex); } +EXPORT_SYMBOL(lnet_unregister_lnd); void lnet_counters_get(lnet_counters_t *counters) @@ -1358,6 +1361,7 @@ LNetInit(void) lnet_register_lnd(&the_lolnd); return 0; } +EXPORT_SYMBOL(LNetInit); /** * Finalize LNet library. @@ -1381,6 +1385,7 @@ LNetFini(void) the_lnet.ln_init = 0; } +EXPORT_SYMBOL(LNetFini); /** * Set LNet PID and start LNet interfaces, routing, and forwarding. @@ -1478,6 +1483,7 @@ LNetNIInit(lnet_pid_t requested_pid) LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex); return rc; } +EXPORT_SYMBOL(LNetNIInit); /** * Stop LNet interfaces, routing, and forwarding. @@ -1517,6 +1523,7 @@ LNetNIFini() LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex); return 0; } +EXPORT_SYMBOL(LNetNIFini); /** * This is an ugly hack to export IOC_LIBCFS_DEBUG_PEER and @@ -1636,6 +1643,7 @@ LNetCtl(unsigned int cmd, void *arg) } /* not reached */ } +EXPORT_SYMBOL(LNetCtl); /** * Retrieve the lnet_process_id_t ID of LNet interface at \a index. Note that @@ -1676,6 +1684,7 @@ LNetGetId(unsigned int index, lnet_process_id_t *id) lnet_net_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetGetId); /** * Print a string representation of handle \a h into buffer \a str of @@ -1686,6 +1695,7 @@ LNetSnprintHandle(char *str, int len, lnet_handle_any_t h) { snprintf(str, len, LPX64, h.cookie); } +EXPORT_SYMBOL(LNetSnprintHandle); static int lnet_create_ping_info(void) diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 1e5011c..fec269a 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -138,6 +138,7 @@ failed: lnet_eq_free(eq); return -ENOMEM; } +EXPORT_SYMBOL(LNetEQAlloc); /** * Release the resources associated with an event queue if it's idle; @@ -204,6 +205,7 @@ LNetEQFree(lnet_handle_eq_t eqh) return rc; } +EXPORT_SYMBOL(LNetEQFree); void lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev) @@ -300,6 +302,7 @@ LNetEQGet (lnet_handle_eq_t eventq, lnet_event_t *event) return LNetEQPoll(&eventq, 1, 0, event, &which); } +EXPORT_SYMBOL(LNetEQGet); /** * Block the calling process until there is an event in the EQ. @@ -325,6 +328,7 @@ LNetEQWait (lnet_handle_eq_t eventq, lnet_event_t *event) return LNetEQPoll(&eventq, 1, LNET_TIME_FOREVER, event, &which); } +EXPORT_SYMBOL(LNetEQWait); #ifdef __KERNEL__ diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index 5970963..6c10ccf 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -324,6 +324,7 @@ LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, lnet_res_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetMDAttach); /** * Create a "free floating" memory descriptor - a MD that is not associated @@ -384,6 +385,7 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) lnet_res_unlock(cpt); return rc; } +EXPORT_SYMBOL(LNetMDBind); /** * Unlink the memory descriptor from any ME it may be linked to and release @@ -448,3 +450,4 @@ LNetMDUnlink (lnet_handle_md_t mdh) lnet_res_unlock(cpt); return 0; } +EXPORT_SYMBOL(LNetMDUnlink); diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index df33c83..f203e30 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -119,6 +119,7 @@ LNetMEAttach(unsigned int portal, lnet_res_unlock(mtable->mt_cpt); return 0; } +EXPORT_SYMBOL(LNetMEAttach); /** * Create and a match entry and insert it before or after the ME pointed to by @@ -201,6 +202,7 @@ LNetMEInsert(lnet_handle_me_t current_meh, return 0; } +EXPORT_SYMBOL(LNetMEInsert); /** * Unlink a match entry from its match list. @@ -249,6 +251,7 @@ LNetMEUnlink(lnet_handle_me_t meh) lnet_res_unlock(cpt); return 0; } +EXPORT_SYMBOL(LNetMEUnlink); /* call with lnet_res_lock please */ void diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 7fb3592..e8dc8a0 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -166,6 +166,7 @@ lnet_iov_nob (unsigned int niov, struct iovec *iov) return (nob); } +EXPORT_SYMBOL(lnet_iov_nob); void lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, unsigned int doffset, @@ -224,6 +225,7 @@ lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, unsigned int doffset, } } while (nob > 0); } +EXPORT_SYMBOL(lnet_copy_iov2iov); int lnet_extract_iov (int dst_niov, struct iovec *dst, @@ -270,6 +272,7 @@ lnet_extract_iov (int dst_niov, struct iovec *dst, offset = 0; } } +EXPORT_SYMBOL(lnet_extract_iov); #ifndef __KERNEL__ unsigned int @@ -323,6 +326,7 @@ lnet_kiov_nob (unsigned int niov, lnet_kiov_t *kiov) return (nob); } +EXPORT_SYMBOL(lnet_kiov_nob); void lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset, @@ -404,6 +408,7 @@ lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset if (saddr != NULL) cfs_kunmap(siov->kiov_page); } +EXPORT_SYMBOL(lnet_copy_kiov2kiov); void lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset, @@ -473,6 +478,7 @@ lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset if (addr != NULL) cfs_kunmap(kiov->kiov_page); } +EXPORT_SYMBOL(lnet_copy_kiov2iov); void lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset, @@ -541,6 +547,7 @@ lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffs if (addr != NULL) cfs_kunmap(kiov->kiov_page); } +EXPORT_SYMBOL(lnet_copy_iov2kiov); int lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst, @@ -590,6 +597,7 @@ lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst, offset = 0; } } +EXPORT_SYMBOL(lnet_extract_kiov); #endif void @@ -1693,6 +1701,7 @@ lnet_msgtyp2str (int type) return (""); } } +EXPORT_SYMBOL(lnet_msgtyp2str); void lnet_print_hdr(lnet_hdr_t * hdr) @@ -1977,6 +1986,7 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid, lnet_drop_message(ni, cpt, private, payload_length); return 0; } +EXPORT_SYMBOL(lnet_parse); void lnet_drop_delayed_msg_list(cfs_list_t *head, char *reason) @@ -2178,6 +2188,7 @@ LNetPut(lnet_nid_t self, lnet_handle_md_t mdh, lnet_ack_req_t ack, /* completion will be signalled by an event */ return 0; } +EXPORT_SYMBOL(LNetPut); lnet_msg_t * lnet_create_reply_msg (lnet_ni_t *ni, lnet_msg_t *getmsg) @@ -2254,6 +2265,7 @@ lnet_create_reply_msg (lnet_ni_t *ni, lnet_msg_t *getmsg) return NULL; } +EXPORT_SYMBOL(lnet_create_reply_msg); void lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *reply, unsigned int len) @@ -2270,6 +2282,7 @@ lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *reply, unsigned int len) reply->msg_ev.mlength = len; } +EXPORT_SYMBOL(lnet_set_reply_msg_len); /** * Initiate an asynchronous GET operation. @@ -2292,9 +2305,9 @@ lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *reply, unsigned int len) * \retval -ENOENT Invalid MD object. */ int -LNetGet(lnet_nid_t self, lnet_handle_md_t mdh, - lnet_process_id_t target, unsigned int portal, - __u64 match_bits, unsigned int offset) +LNetGet(lnet_nid_t self, lnet_handle_md_t mdh, + lnet_process_id_t target, unsigned int portal, + __u64 match_bits, unsigned int offset) { struct lnet_msg *msg; struct lnet_libmd *md; @@ -2369,6 +2382,7 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh, /* completion will be signalled by an event */ return 0; } +EXPORT_SYMBOL(LNetGet); /** * Calculate distance to node at \a dstnid. @@ -2465,6 +2479,7 @@ LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp) lnet_net_unlock(cpt); return -EHOSTUNREACH; } +EXPORT_SYMBOL(LNetDist); /** * Set the number of asynchronous messages expected from a target process. @@ -2555,3 +2570,4 @@ LNetSetAsync(lnet_process_id_t id, int nasync) return rc; #endif } +EXPORT_SYMBOL(LNetSetAsync); diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index cc889b3..fa12deb 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -541,6 +541,7 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) if (rc != 0) goto again; } +EXPORT_SYMBOL(lnet_finalize); void lnet_msg_container_cleanup(struct lnet_msg_container *container) diff --git a/lnet/lnet/lib-ptl.c b/lnet/lnet/lib-ptl.c index 9882e5f..d68c4fc 100644 --- a/lnet/lnet/lib-ptl.c +++ b/lnet/lnet/lib-ptl.c @@ -843,6 +843,7 @@ LNetSetLazyPortal(int portal) return 0; } +EXPORT_SYMBOL(LNetSetLazyPortal); /** * Turn off the lazy portal attribute. Delayed requests on the portal, @@ -890,3 +891,4 @@ LNetClearLazyPortal(int portal) return 0; } +EXPORT_SYMBOL(LNetClearLazyPortal); diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index 8f7ec08..589bade 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -145,47 +145,6 @@ fini_lnet(void) LNetFini(); } -EXPORT_SYMBOL(lnet_register_lnd); -EXPORT_SYMBOL(lnet_unregister_lnd); - -EXPORT_SYMBOL(LNetMEAttach); -EXPORT_SYMBOL(LNetMEInsert); -EXPORT_SYMBOL(LNetMEUnlink); -EXPORT_SYMBOL(LNetEQAlloc); -EXPORT_SYMBOL(LNetMDAttach); -EXPORT_SYMBOL(LNetMDUnlink); -EXPORT_SYMBOL(LNetNIInit); -EXPORT_SYMBOL(LNetNIFini); -EXPORT_SYMBOL(LNetInit); -EXPORT_SYMBOL(LNetFini); -EXPORT_SYMBOL(LNetSnprintHandle); -EXPORT_SYMBOL(LNetPut); -EXPORT_SYMBOL(LNetGet); -EXPORT_SYMBOL(LNetEQWait); -EXPORT_SYMBOL(LNetEQFree); -EXPORT_SYMBOL(LNetEQGet); -EXPORT_SYMBOL(LNetGetId); -EXPORT_SYMBOL(LNetMDBind); -EXPORT_SYMBOL(LNetDist); -EXPORT_SYMBOL(LNetSetAsync); -EXPORT_SYMBOL(LNetCtl); -EXPORT_SYMBOL(LNetSetLazyPortal); -EXPORT_SYMBOL(LNetClearLazyPortal); -EXPORT_SYMBOL(the_lnet); -EXPORT_SYMBOL(lnet_iov_nob); -EXPORT_SYMBOL(lnet_extract_iov); -EXPORT_SYMBOL(lnet_kiov_nob); -EXPORT_SYMBOL(lnet_extract_kiov); -EXPORT_SYMBOL(lnet_copy_iov2iov); -EXPORT_SYMBOL(lnet_copy_iov2kiov); -EXPORT_SYMBOL(lnet_copy_kiov2iov); -EXPORT_SYMBOL(lnet_copy_kiov2kiov); -EXPORT_SYMBOL(lnet_finalize); -EXPORT_SYMBOL(lnet_parse); -EXPORT_SYMBOL(lnet_create_reply_msg); -EXPORT_SYMBOL(lnet_set_reply_msg_len); -EXPORT_SYMBOL(lnet_msgtyp2str); - MODULE_AUTHOR("Peter J. Braam "); MODULE_DESCRIPTION("Portals v3.1"); MODULE_LICENSE("GPL");