From 33984c012883a7c714429d2c612cf6dcda191974 Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Sun, 7 Sep 2014 10:50:03 -0500 Subject: [PATCH] LU-5396 lnet: make some functions static Some functions and variables are only used in their C file, so reduce their scope. This reduces the code size, and fixes sparse warnings such as: warning: symbol 'proc_lnet_routes' was not declared. Should it be static? warning: symbol 'proc_lnet_routers' was not declared. Should it be static? Some prototypes were removed from C files and added to the proper header. Change-Id: I6b0c527d64ea9e3394cc686699d2e75eec5c16a2 Signed-off-by: Frank Zago Reviewed-on: http://review.whamcloud.com/12206 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Andreas Dilger --- libcfs/include/libcfs/libcfs_ioctl.h | 2 +- libcfs/libcfs/debug.c | 4 +- lnet/include/lnet/lib-lnet.h | 2 + lnet/klnds/o2iblnd/o2iblnd_modparams.c | 8 ++-- lnet/klnds/socklnd/socklnd.c | 80 +++++++++++++++++----------------- lnet/klnds/socklnd/socklnd_cb.c | 30 ++++++------- lnet/lnet/acceptor.c | 8 ++-- lnet/lnet/api-ni.c | 1 - lnet/lnet/config.c | 40 ++++++++--------- lnet/lnet/lib-eq.c | 2 +- lnet/lnet/lib-md.c | 2 +- lnet/lnet/lib-move.c | 32 +++++++------- lnet/lnet/lib-ptl.c | 4 +- lnet/lnet/lo.c | 18 ++++---- lnet/lnet/module.c | 16 +++---- lnet/lnet/router.c | 20 ++++----- lnet/lnet/router_proc.c | 2 - lnet/selftest/brw_test.c | 30 ++++++------- lnet/selftest/conctl.c | 44 +++++++++---------- lnet/selftest/conrpc.c | 22 +++++----- lnet/selftest/console.c | 28 ++++++------ lnet/selftest/console.h | 3 ++ lnet/selftest/framework.c | 69 ++++++++++++----------------- lnet/selftest/module.c | 8 ++-- lnet/selftest/ping_test.c | 2 +- lnet/selftest/rpc.c | 38 ++++++++-------- lnet/selftest/selftest.h | 10 +++++ lnet/selftest/timer.c | 16 +++---- lustre/obdclass/llog_cat.c | 6 +-- 29 files changed, 272 insertions(+), 275 deletions(-) diff --git a/libcfs/include/libcfs/libcfs_ioctl.h b/libcfs/include/libcfs/libcfs_ioctl.h index b5d650f..0b17167 100644 --- a/libcfs/include/libcfs/libcfs_ioctl.h +++ b/libcfs/include/libcfs/libcfs_ioctl.h @@ -110,7 +110,7 @@ struct libcfs_ioctl_handler { }; #define DECLARE_IOCTL_HANDLER(ident, func) \ - struct libcfs_ioctl_handler ident = { \ + static struct libcfs_ioctl_handler ident = { \ /* .item = */ LIST_HEAD_INIT(ident.item), \ /* .handle_ioctl = */ func \ } diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c index 6d6afcb..7b01e6f 100644 --- a/libcfs/libcfs/debug.c +++ b/libcfs/libcfs/debug.c @@ -57,7 +57,7 @@ CFS_MODULE_PARM(libcfs_debug, "i", int, 0644, "Lustre kernel debug mask"); EXPORT_SYMBOL(libcfs_debug); -static unsigned int libcfs_debug_mb; +unsigned int libcfs_debug_mb; CFS_MODULE_PARM(libcfs_debug_mb, "i", uint, 0644, "Total debug buffer size."); EXPORT_SYMBOL(libcfs_debug_mb); @@ -93,7 +93,7 @@ EXPORT_SYMBOL(libcfs_debug_binary); unsigned int libcfs_stack = 3 * THREAD_SIZE / 4; EXPORT_SYMBOL(libcfs_stack); -static unsigned int portal_enter_debugger; +unsigned int portal_enter_debugger; EXPORT_SYMBOL(portal_enter_debugger); unsigned int libcfs_catastrophe; diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 4d36f59..54f6ef2 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -731,6 +731,8 @@ extern lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt); extern lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt); extern lnet_ni_t *lnet_net2ni(__u32 net); +extern int portal_rotor; + int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, cfs_time_t when); void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when); int lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway_nid, diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c index 2e36334..fbaa7bb 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c +++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c @@ -371,7 +371,7 @@ kiblnd_initstrtunable(char *space, char *str, int size) space[size-1] = 0; } -void +static void kiblnd_sysctl_init (void) { kiblnd_initstrtunable(ipif_basename_space, ipif_name, @@ -384,7 +384,7 @@ kiblnd_sysctl_init (void) CWARN("Can't setup /proc tunables\n"); } -void +static void kiblnd_sysctl_fini (void) { if (kiblnd_tunables.kib_sysctl != NULL) @@ -393,12 +393,12 @@ kiblnd_sysctl_fini (void) #else -void +static void kiblnd_sysctl_init (void) { } -void +static void kiblnd_sysctl_fini (void) { } diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 748bfdb..04f79cc 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -43,10 +43,10 @@ #include "socklnd.h" -lnd_t the_ksocklnd; +static lnd_t the_ksocklnd; ksock_nal_data_t ksocknal_data; -ksock_interface_t * +static ksock_interface_t * ksocknal_ip2iface(lnet_ni_t *ni, __u32 ip) { ksock_net_t *net = ni->ni_data; @@ -64,7 +64,7 @@ ksocknal_ip2iface(lnet_ni_t *ni, __u32 ip) return (NULL); } -ksock_route_t * +static ksock_route_t * ksocknal_create_route (__u32 ipaddr, int port) { ksock_route_t *route; @@ -99,7 +99,7 @@ ksocknal_destroy_route (ksock_route_t *route) LIBCFS_FREE (route, sizeof (*route)); } -int +static int ksocknal_create_peer (ksock_peer_t **peerp, lnet_ni_t *ni, lnet_process_id_t id) { ksock_net_t *net = ni->ni_data; @@ -216,7 +216,7 @@ ksocknal_find_peer (lnet_ni_t *ni, lnet_process_id_t id) return (peer); } -void +static void ksocknal_unlink_peer_locked (ksock_peer_t *peer) { int i; @@ -246,7 +246,7 @@ ksocknal_unlink_peer_locked (ksock_peer_t *peer) ksocknal_peer_decref(peer); } -int +static int ksocknal_get_peer_info (lnet_ni_t *ni, int index, lnet_process_id_t *id, __u32 *myip, __u32 *peer_ip, int *port, int *conn_count, int *share_count) @@ -320,7 +320,7 @@ out: return rc; } -void +static void ksocknal_associate_route_conn_locked(ksock_route_t *route, ksock_conn_t *conn) { ksock_peer_t *peer = route->ksnr_peer; @@ -365,7 +365,7 @@ ksocknal_associate_route_conn_locked(ksock_route_t *route, ksock_conn_t *conn) route->ksnr_retry_interval = 0; } -void +static void ksocknal_add_route_locked (ksock_peer_t *peer, ksock_route_t *route) { struct list_head *tmp; @@ -406,7 +406,7 @@ ksocknal_add_route_locked (ksock_peer_t *peer, ksock_route_t *route) } } -void +static void ksocknal_del_route_locked (ksock_route_t *route) { ksock_peer_t *peer = route->ksnr_peer; @@ -508,7 +508,7 @@ ksocknal_add_peer(lnet_ni_t *ni, lnet_process_id_t id, __u32 ipaddr, int port) return 0; } -void +static void ksocknal_del_peer_locked (ksock_peer_t *peer, __u32 ip) { ksock_conn_t *conn; @@ -563,7 +563,7 @@ ksocknal_del_peer_locked (ksock_peer_t *peer, __u32 ip) /* NB peer unlinks itself when last conn/route is removed */ } -int +static int ksocknal_del_peer (lnet_ni_t *ni, lnet_process_id_t id, __u32 ip) { struct list_head zombies = LIST_HEAD_INIT(zombies); @@ -626,7 +626,7 @@ ksocknal_del_peer (lnet_ni_t *ni, lnet_process_id_t id, __u32 ip) return rc; } -ksock_conn_t * +static ksock_conn_t * ksocknal_get_conn_by_idx (lnet_ni_t *ni, int index) { ksock_peer_t *peer; @@ -664,7 +664,7 @@ ksocknal_get_conn_by_idx (lnet_ni_t *ni, int index) return NULL; } -ksock_sched_t * +static ksock_sched_t * ksocknal_choose_scheduler_locked(unsigned int cpt) { struct ksock_sched_info *info = ksocknal_data.ksnd_sched_info[cpt]; @@ -687,7 +687,7 @@ ksocknal_choose_scheduler_locked(unsigned int cpt) return sched; } -int +static int ksocknal_local_ipvec (lnet_ni_t *ni, __u32 *ipaddrs) { ksock_net_t *net = ni->ni_data; @@ -699,7 +699,7 @@ ksocknal_local_ipvec (lnet_ni_t *ni, __u32 *ipaddrs) nip = net->ksnn_ninterfaces; LASSERT (nip <= LNET_MAX_INTERFACES); - /* Only offer interfaces for additional connections if I have + /* Only offer interfaces for additional connections if I have * more than one. */ if (nip < 2) { read_unlock(&ksocknal_data.ksnd_global_lock); @@ -715,7 +715,7 @@ ksocknal_local_ipvec (lnet_ni_t *ni, __u32 *ipaddrs) return (nip); } -int +static int ksocknal_match_peerip (ksock_interface_t *iface, __u32 *ips, int nips) { int best_netmatch = 0; @@ -747,7 +747,7 @@ ksocknal_match_peerip (ksock_interface_t *iface, __u32 *ips, int nips) return (best); } -int +static int ksocknal_select_ips(ksock_peer_t *peer, __u32 *peerips, int n_peerips) { rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock; @@ -777,7 +777,7 @@ ksocknal_select_ips(ksock_peer_t *peer, __u32 *peerips, int n_peerips) LASSERT (n_peerips <= LNET_MAX_INTERFACES); LASSERT (net->ksnn_ninterfaces <= LNET_MAX_INTERFACES); - /* Only match interfaces for additional connections + /* Only match interfaces for additional connections * if I have > 1 interface */ n_ips = (net->ksnn_ninterfaces < 2) ? 0 : MIN(n_peerips, net->ksnn_ninterfaces); @@ -853,7 +853,7 @@ ksocknal_select_ips(ksock_peer_t *peer, __u32 *peerips, int n_peerips) return (n_ips); } -void +static void ksocknal_create_routes(ksock_peer_t *peer, int port, __u32 *peer_ipaddrs, int npeer_ipaddrs) { @@ -879,7 +879,7 @@ ksocknal_create_routes(ksock_peer_t *peer, int port, write_lock_bh(global_lock); if (net->ksnn_ninterfaces < 2) { - /* Only create additional connections + /* Only create additional connections * if I have > 1 interface */ write_unlock_bh(global_lock); return; @@ -1003,7 +1003,7 @@ ksocknal_accept (lnet_ni_t *ni, cfs_socket_t *sock) return 0; } -int +static int ksocknal_connecting (ksock_peer_t *peer, __u32 ipaddr) { ksock_route_t *route; @@ -1295,7 +1295,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route, /* We've now got a new connection. Any errors from here on are just * like "normal" comms errors and we close the connection normally. * NB (a) we still have to send the reply HELLO for passive - * connections, + * connections, * (b) normal I/O on the conn is blocked until I setup and call the * socket callbacks. */ @@ -1378,7 +1378,7 @@ failed_2: if (!active) { if (rc > 0) { - /* Request retry by replying with CONN_NONE + /* Request retry by replying with CONN_NONE * ksnc_proto has been set already */ conn->ksnc_type = SOCKLND_CONN_NONE; hello->kshm_nips = 0; @@ -1862,7 +1862,7 @@ ksocknal_query (lnet_ni_t *ni, lnet_nid_t nid, cfs_time_t *when) return; } -void +static void ksocknal_push_peer (ksock_peer_t *peer) { int index; @@ -1895,7 +1895,7 @@ ksocknal_push_peer (ksock_peer_t *peer) } } -int +static int ksocknal_push (lnet_ni_t *ni, lnet_process_id_t id) { ksock_peer_t *peer; @@ -1944,7 +1944,7 @@ ksocknal_push (lnet_ni_t *ni, lnet_process_id_t id) return (rc); } -int +static int ksocknal_add_interface(lnet_ni_t *ni, __u32 ipaddress, __u32 netmask) { ksock_net_t *net = ni->ni_data; @@ -2006,7 +2006,7 @@ ksocknal_add_interface(lnet_ni_t *ni, __u32 ipaddress, __u32 netmask) return (rc); } -void +static void ksocknal_peer_del_interface_locked(ksock_peer_t *peer, __u32 ipaddr) { struct list_head *tmp; @@ -2047,7 +2047,7 @@ ksocknal_peer_del_interface_locked(ksock_peer_t *peer, __u32 ipaddr) } } -int +static int ksocknal_del_interface(lnet_ni_t *ni, __u32 ipaddress) { ksock_net_t *net = ni->ni_data; @@ -2098,7 +2098,7 @@ ksocknal_del_interface(lnet_ni_t *ni, __u32 ipaddress) int ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - lnet_process_id_t id = {0}; + lnet_process_id_t id = {0}; struct libcfs_ioctl_data *data = arg; int rc; @@ -2222,7 +2222,7 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) /* not reached */ } -void +static void ksocknal_free_buffers (void) { LASSERT (atomic_read(&ksocknal_data.ksnd_nactive_txs) == 0); @@ -2265,7 +2265,7 @@ ksocknal_free_buffers (void) } } -void +static void ksocknal_base_shutdown(void) { struct ksock_sched_info *info; @@ -2357,7 +2357,7 @@ ksocknal_base_shutdown(void) module_put(THIS_MODULE); } -__u64 ksocknal_new_incarnation (void) +static __u64 ksocknal_new_incarnation(void) { struct timeval tv; @@ -2371,7 +2371,7 @@ __u64 ksocknal_new_incarnation (void) return (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec; } -int +static int ksocknal_base_startup(void) { struct ksock_sched_info *info; @@ -2503,7 +2503,7 @@ ksocknal_base_startup(void) return -ENETDOWN; } -void +static void ksocknal_debug_peerhash (lnet_ni_t *ni) { ksock_peer_t *peer = NULL; @@ -2608,7 +2608,7 @@ ksocknal_shutdown (lnet_ni_t *ni) ksocknal_base_shutdown(); } -int +static int ksocknal_enumerate_interfaces(ksock_net_t *net) { char **names; @@ -2665,7 +2665,7 @@ ksocknal_enumerate_interfaces(ksock_net_t *net) return j; } -int +static int ksocknal_search_new_ipif(ksock_net_t *net) { int new_ipif = 0; @@ -2707,7 +2707,7 @@ ksocknal_search_new_ipif(ksock_net_t *net) return new_ipif; } -int +static int ksocknal_start_schedulers(struct ksock_sched_info *info) { int nthrs; @@ -2753,7 +2753,7 @@ ksocknal_start_schedulers(struct ksock_sched_info *info) return rc; } -int +static int ksocknal_net_start_threads(ksock_net_t *net, __u32 *cpts, int ncpts) { int newif = ksocknal_search_new_ipif(net); @@ -2866,14 +2866,14 @@ ksocknal_startup (lnet_ni_t *ni) } -void __exit +static void __exit ksocknal_module_fini (void) { lnet_unregister_lnd(&the_ksocklnd); ksocknal_tunables_fini(); } -int __init +static int __init ksocknal_module_init (void) { int rc; diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 34241b9..e7f0e06 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -107,7 +107,7 @@ ksocknal_free_tx (ksock_tx_t *tx) } } -int +static int ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) { struct iovec *iov = tx->tx_iov; @@ -144,7 +144,7 @@ ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) return (rc); } -int +static int ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) { lnet_kiov_t *kiov = tx->tx_kiov; @@ -182,7 +182,7 @@ ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) return (rc); } -int +static int ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) { int rc; @@ -247,7 +247,7 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) return (rc); } -int +static int ksocknal_recv_iov (ksock_conn_t *conn) { struct iovec *iov = conn->ksnc_rx_iov; @@ -292,7 +292,7 @@ ksocknal_recv_iov (ksock_conn_t *conn) return (rc); } -int +static int ksocknal_recv_kiov (ksock_conn_t *conn) { lnet_kiov_t *kiov = conn->ksnc_rx_kiov; @@ -336,7 +336,7 @@ ksocknal_recv_kiov (ksock_conn_t *conn) return 1; } -int +static int ksocknal_receive (ksock_conn_t *conn) { /* Return 1 on success, 0 on EOF, < 0 on error. @@ -501,7 +501,7 @@ ksocknal_uncheck_zc_req(ksock_tx_t *tx) ksocknal_tx_decref(tx); } -int +static int ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx) { int rc; @@ -581,7 +581,7 @@ ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx) return (rc); } -void +static void ksocknal_launch_connection_locked (ksock_route_t *route) { @@ -1107,7 +1107,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip) return (0); } -int +static int ksocknal_process_receive (ksock_conn_t *conn) { lnet_hdr_t *lhdr; @@ -1611,7 +1611,7 @@ void ksocknal_write_callback(ksock_conn_t *conn) EXIT; } -ksock_proto_t * +static ksock_proto_t * ksocknal_parse_proto_version (ksock_hello_msg_t *hello) { __u32 version = 0; @@ -1675,7 +1675,7 @@ ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn, return conn->ksnc_proto->pro_send_hello(conn, hello); } -int +static int ksocknal_invert_type(int type) { switch (type) @@ -1840,7 +1840,7 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn, return 0; } -int +static int ksocknal_connect (ksock_route_t *route) { struct list_head zombies = LIST_HEAD_INIT(zombies); @@ -2247,7 +2247,7 @@ ksocknal_connd (void *arg) return 0; } -ksock_conn_t * +static ksock_conn_t * ksocknal_find_timed_out_conn (ksock_peer_t *peer) { /* We're called with a shared lock on ksnd_global_lock */ @@ -2355,7 +2355,7 @@ ksocknal_flush_stale_txs(ksock_peer_t *peer) ksocknal_txlist_done(peer->ksnp_ni, &stale_txs, 1); } -int +static int ksocknal_send_keepalive_locked(ksock_peer_t *peer) __must_hold(&ksocknal_data.ksnd_global_lock) { @@ -2419,7 +2419,7 @@ __must_hold(&ksocknal_data.ksnd_global_lock) } -void +static void ksocknal_check_peer_timeouts (int idx) { struct list_head *peers = &ksocknal_data.ksnd_peers[idx]; diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index c83843c..405c065 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -43,7 +43,7 @@ static int accept_port = 988; static int accept_backlog = 127; static int accept_timeout = 5; -struct { +static struct { int pta_shutdown; cfs_socket_t *pta_sock; struct completion pta_signal; @@ -79,7 +79,7 @@ CFS_MODULE_PARM(accept_timeout, "i", int, 0644, static char *accept_type = NULL; -int +static int lnet_acceptor_get_tunables(void) { /* Userland acceptor uses 'accept_type' instead of 'accept', due to @@ -259,7 +259,7 @@ lnet_acceptor_get_tunables() /* Below is the code common for both kernel and MT user-space */ -int +static int lnet_accept(cfs_socket_t *sock, __u32 magic) { lnet_acceptor_connreq_t cr; @@ -386,7 +386,7 @@ lnet_accept(cfs_socket_t *sock, __u32 magic) return rc; } -int +static int lnet_acceptor(void *arg) { cfs_socket_t *newsock; diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 7a3c8a3..c077e3f 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -68,7 +68,6 @@ static int rnet_htable_size = LNET_REMOTE_NETS_HASH_DEFAULT; CFS_MODULE_PARM(rnet_htable_size, "i", int, 0444, "size of remote network hash table"); -static void lnet_ping_target_fini(void); static int lnet_ping(lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_ids); diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index dd1e2d0..446eb8a 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -48,7 +48,7 @@ static int lnet_tbnob = 0; /* track text buf allocation */ #define LNET_MAX_TEXTBUF_NOB (64<<10) /* bound allocation */ #define LNET_SINGLE_TEXTBUF_NOB (4<<10) -void +static void lnet_syntax(char *name, char *str, int offset, int width) { static char dots[LNET_SINGLE_TEXTBUF_NOB]; @@ -65,7 +65,7 @@ lnet_syntax(char *name, char *str, int offset, int width) (width < 1) ? 0 : width - 1, dashes); } -int +static int lnet_issep (char c) { switch (c) { @@ -400,7 +400,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks) return -EINVAL; } -struct lnet_text_buf *lnet_new_text_buf(int str_len) +static struct lnet_text_buf *lnet_new_text_buf(int str_len) { struct lnet_text_buf *ltb; int nob; @@ -428,14 +428,14 @@ struct lnet_text_buf *lnet_new_text_buf(int str_len) return ltb; } -void +static void lnet_free_text_buf(struct lnet_text_buf *ltb) { lnet_tbnob -= ltb->ltb_size; LIBCFS_FREE(ltb, ltb->ltb_size); } -void +static void lnet_free_text_bufs(struct list_head *tbs) { struct lnet_text_buf *ltb; @@ -463,7 +463,7 @@ lnet_print_text_bufs(struct list_head *tbs) CDEBUG(D_WARNING, "%d allocated\n", lnet_tbnob); } -int +static int lnet_str2tbs_sep(struct list_head *tbs, char *str) { struct list_head pending; @@ -521,7 +521,7 @@ lnet_str2tbs_sep(struct list_head *tbs, char *str) return 0; } -int +static int lnet_expand1tb(struct list_head *list, char *str, char *sep1, char *sep2, char *item, int itemlen) @@ -546,7 +546,7 @@ lnet_expand1tb(struct list_head *list, return 0; } -int +static int lnet_str2tbs_expand(struct list_head *tbs, char *str) { char num[16]; @@ -626,7 +626,7 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str) return -1; } -int +static int lnet_parse_hops (char *str, unsigned int *hops) { int len = strlen(str); @@ -639,7 +639,7 @@ lnet_parse_hops (char *str, unsigned int *hops) #define LNET_PRIORITY_SEPARATOR (':') -int +static int lnet_parse_priority(char *str, unsigned int *priority, char **token) { int nob; @@ -669,7 +669,7 @@ lnet_parse_priority(char *str, unsigned int *priority, char **token) return 0; } -int +static int lnet_parse_route (char *str, int *im_a_router) { /* static scratch buffer OK (single threaded) */ @@ -813,7 +813,7 @@ out: return myrc; } -int +static int lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router) { struct lnet_text_buf *ltb; @@ -854,7 +854,7 @@ lnet_parse_routes (char *routes, int *im_a_router) return rc; } -int +static int lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) { struct list_head list = LIST_HEAD_INIT(list); @@ -873,7 +873,7 @@ lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) return rc; } -int +static int lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) { static char tokens[LNET_SINGLE_TEXTBUF_NOB]; @@ -930,7 +930,7 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) return 1; } -__u32 +static __u32 lnet_netspec2net(char *netspec) { char *bracket = strchr(netspec, '('); @@ -947,7 +947,7 @@ lnet_netspec2net(char *netspec) return net; } -int +static int lnet_splitnets(char *source, struct list_head *nets) { int offset = 0; @@ -1029,7 +1029,7 @@ lnet_splitnets(char *source, struct list_head *nets) } } -int +static int lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) { static char networks[LNET_SINGLE_TEXTBUF_NOB]; @@ -1150,13 +1150,13 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) } #ifdef __KERNEL__ -void +static void lnet_ipaddr_free_enumeration(__u32 *ipaddrs, int nip) { LIBCFS_FREE(ipaddrs, nip * sizeof(*ipaddrs)); } -int +static int lnet_ipaddr_enumerate (__u32 **ipaddrsp) { int up; @@ -1225,7 +1225,7 @@ lnet_ipaddr_enumerate (__u32 **ipaddrsp) int lnet_parse_ip2nets (char **networksp, char *ip2nets) { - __u32 *ipaddrs; + __u32 *ipaddrs = NULL; int nip = lnet_ipaddr_enumerate(&ipaddrs); int rc; diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 1e6b9af..50ac435 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -247,7 +247,7 @@ lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev) lnet_eq_wait_unlock(); } -int +static int lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) { int new_index = eq->eq_deq_seq & (eq->eq_size - 1); diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index bea7db6..a3a7204 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -219,7 +219,7 @@ lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd) lnet_eq2handle(&umd->eq_handle, lmd->md_eq); } -int +static int lnet_md_validate(lnet_md_t *umd) { if (umd->start == NULL && umd->length != 0) { diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 8973813..d938da9 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -641,7 +641,7 @@ lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed, lnet_finalize(ni, msg, rc); } -void +static void lnet_setpayloadbuffer(lnet_msg_t *msg) { lnet_libmd_t *md = msg->msg_md; @@ -662,7 +662,7 @@ lnet_setpayloadbuffer(lnet_msg_t *msg) void lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target, - unsigned int offset, unsigned int len) + unsigned int offset, unsigned int len) { msg->msg_type = type; msg->msg_target = target; @@ -681,7 +681,7 @@ lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target, msg->msg_hdr.payload_length = cpu_to_le32(len); } -void +static void lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg) { void *priv = msg->msg_private; @@ -696,7 +696,7 @@ lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg) lnet_finalize(ni, msg, rc); } -int +static int lnet_ni_eager_recv(lnet_ni_t *ni, lnet_msg_t *msg) { int rc; @@ -721,7 +721,7 @@ lnet_ni_eager_recv(lnet_ni_t *ni, lnet_msg_t *msg) } /* NB: caller shall hold a ref on 'lp' as I'd drop lnet_net_lock */ -void +static void lnet_ni_query_locked(lnet_ni_t *ni, lnet_peer_t *lp) { cfs_time_t last_alive = 0; @@ -773,7 +773,7 @@ lnet_peer_is_alive (lnet_peer_t *lp, cfs_time_t now) /* NB: returns 1 when alive, 0 when dead, negative when error; * may drop the lnet_net_lock */ -int +static int lnet_peer_alive_locked (lnet_peer_t *lp) { cfs_time_t now = cfs_time_current(); @@ -914,7 +914,7 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send) #ifdef __KERNEL__ -lnet_rtrbufpool_t * +static lnet_rtrbufpool_t * lnet_msg2bufpool(lnet_msg_t *msg) { lnet_rtrbufpool_t *rbp; @@ -934,7 +934,7 @@ lnet_msg2bufpool(lnet_msg_t *msg) return rbp; } -int +static int lnet_post_routed_recv_locked (lnet_msg_t *msg, int do_recv) { /* lnet_parse is going to lnet_net_unlock immediately after this, so it @@ -1664,7 +1664,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg) } CDEBUG(D_NET, "%s: Reply from %s of length %d/%d into md "LPX64"\n", - libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), + libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), mlength, rlength, hdr->msg.reply.dst_wmd.wh_object_cookie); lnet_msg_attach_md(msg, md, 0, mlength); @@ -1717,7 +1717,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg) } CDEBUG(D_NET, "%s: ACK from %s into md "LPX64"\n", - libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), + libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), hdr->msg.ack.dst_wmd.wh_object_cookie); lnet_msg_attach_md(msg, md, 0, 0); @@ -2285,14 +2285,14 @@ LNetPut(lnet_nid_t self, lnet_handle_md_t mdh, lnet_ack_req_t ack, /* NB handles only looked up by creator (no flips) */ if (ack == LNET_ACK_REQ) { - msg->msg_hdr.msg.put.ack_wmd.wh_interface_cookie = + msg->msg_hdr.msg.put.ack_wmd.wh_interface_cookie = the_lnet.ln_interface_cookie; - msg->msg_hdr.msg.put.ack_wmd.wh_object_cookie = + msg->msg_hdr.msg.put.ack_wmd.wh_object_cookie = md->md_lh.lh_cookie; } else { - msg->msg_hdr.msg.put.ack_wmd.wh_interface_cookie = + msg->msg_hdr.msg.put.ack_wmd.wh_interface_cookie = LNET_WIRE_HANDLE_COOKIE_NONE; - msg->msg_hdr.msg.put.ack_wmd.wh_object_cookie = + msg->msg_hdr.msg.put.ack_wmd.wh_object_cookie = LNET_WIRE_HANDLE_COOKIE_NONE; } @@ -2343,7 +2343,7 @@ lnet_create_reply_msg (lnet_ni_t *ni, lnet_msg_t *getmsg) if (getmd->md_threshold == 0) { CERROR ("%s: Dropping REPLY from %s for inactive MD %p\n", - libcfs_nid2str(ni->ni_nid), libcfs_id2str(peer_id), + libcfs_nid2str(ni->ni_nid), libcfs_id2str(peer_id), getmd); lnet_res_unlock(cpt); goto drop; @@ -2641,7 +2641,7 @@ LNetSetAsync(lnet_process_id_t id, int nasync) /* Target on a local network? */ ni = lnet_net2ni(LNET_NIDNET(id.nid)); if (ni != NULL) { - if (ni->ni_lnd->lnd_setasync != NULL) + if (ni->ni_lnd->lnd_setasync != NULL) rc = (ni->ni_lnd->lnd_setasync)(ni, id, nasync); lnet_ni_decref(ni); return rc; diff --git a/lnet/lnet/lib-ptl.c b/lnet/lnet/lib-ptl.c index dcbfa82..1352196 100644 --- a/lnet/lnet/lib-ptl.c +++ b/lnet/lnet/lib-ptl.c @@ -714,7 +714,7 @@ lnet_ptl_attach_md(lnet_me_t *me, lnet_libmd_t *md, lnet_ptl_unlock(ptl); } -void +static void lnet_ptl_cleanup(struct lnet_portal *ptl) { struct lnet_match_table *mtable; @@ -757,7 +757,7 @@ lnet_ptl_cleanup(struct lnet_portal *ptl) ptl->ptl_mtables = NULL; } -int +static int lnet_ptl_setup(struct lnet_portal *ptl, int index) { struct lnet_match_table *mtable; diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c index e1cc2e2..679d7bb 100644 --- a/lnet/lnet/lo.c +++ b/lnet/lnet/lo.c @@ -35,18 +35,18 @@ #define DEBUG_SUBSYSTEM S_LNET #include -int +static int lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) { LASSERT (!lntmsg->msg_routing); LASSERT (!lntmsg->msg_target_is_router); - + return lnet_parse(ni, &lntmsg->msg_hdr, ni->ni_nid, lntmsg, 0); } -int +static int lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, - int delayed, unsigned int niov, + int delayed, unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov, unsigned int offset, unsigned int mlen, unsigned int rlen) { @@ -79,23 +79,23 @@ lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, lnet_finalize(ni, lntmsg, 0); } - + lnet_finalize(ni, sendmsg, 0); return 0; } static int lolnd_instanced; -void +static void lolnd_shutdown(lnet_ni_t *ni) { CDEBUG (D_NET, "shutdown\n"); LASSERT (lolnd_instanced); - + lolnd_instanced = 0; } -int +static int lolnd_startup (lnet_ni_t *ni) { LASSERT (ni->ni_lnd == &the_lolnd); @@ -111,7 +111,7 @@ lnd_t the_lolnd = { /* .lnd_type = */ LOLND, /* .lnd_startup = */ lolnd_startup, /* .lnd_shutdown = */ lolnd_shutdown, - /* .lnt_ctl = */ NULL, + /* .lnt_ctl = */ NULL, /* .lnd_send = */ lolnd_send, /* .lnd_recv = */ lolnd_recv, /* .lnd_eager_recv = */ NULL, diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index 31503b7..c055650 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -44,7 +44,7 @@ CFS_MODULE_PARM(config_on_load, "i", int, 0444, static struct mutex lnet_config_mutex; -int +static int lnet_configure(void *arg) { /* 'arg' only there so I can be passed to cfs_create_thread() */ @@ -64,11 +64,11 @@ lnet_configure(void *arg) return rc; } -int +static int lnet_unconfigure (void) { int refcount; - + LNET_MUTEX_LOCK(&lnet_config_mutex); if (the_lnet.ln_niinit_self) { @@ -84,7 +84,7 @@ lnet_unconfigure (void) return (refcount == 0) ? 0 : -EBUSY; } -int +static int lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr) { struct lnet_ioctl_config_data *conf = @@ -109,7 +109,7 @@ lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr) return rc; } -int +static int lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr) { struct lnet_ioctl_config_data *conf = @@ -126,7 +126,7 @@ lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr) return rc; } -int +static int lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) { int rc; @@ -163,7 +163,7 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl); -int +static int init_lnet(void) { int rc; @@ -189,7 +189,7 @@ init_lnet(void) RETURN(0); } -void +static void fini_lnet(void) { int rc; diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 45219a6..edfa384 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -138,7 +138,7 @@ lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when) CDEBUG(D_NET, "set %s %d\n", libcfs_nid2str(lp->lp_nid), alive); } -void +static void lnet_ni_notify_locked(lnet_ni_t *ni, lnet_peer_t *lp) { int alive; @@ -276,8 +276,8 @@ static void lnet_shuffle_seed(void) } /* NB expects LNET_LOCK held */ -void -lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route) +static void +lnet_add_route_to_rnet(lnet_remotenet_t *rnet, lnet_route_t *route) { unsigned int len = 0; unsigned int offset = 0; @@ -792,7 +792,7 @@ lnet_router_checker_event(lnet_event_t *event) lnet_net_unlock(lp->lp_cpt); } -void +static void lnet_wait_known_routerstate(void) { lnet_peer_t *rtr; @@ -841,7 +841,7 @@ lnet_router_ni_update_locked(lnet_peer_t *gw, __u32 net) } } -void +static void lnet_update_ni_status_locked(void) { lnet_ni_t *ni; @@ -881,7 +881,7 @@ lnet_update_ni_status_locked(void) } } -void +static void lnet_destroy_rc_data(lnet_rc_data_t *rcd) { LASSERT(list_empty(&rcd->rcd_list)); @@ -902,7 +902,7 @@ lnet_destroy_rc_data(lnet_rc_data_t *rcd) LIBCFS_FREE(rcd, sizeof(*rcd)); } -lnet_rc_data_t * +static lnet_rc_data_t * lnet_create_rc_data_locked(lnet_peer_t *gateway) { lnet_rc_data_t *rcd = NULL; @@ -1360,7 +1360,7 @@ lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages) LIBCFS_FREE(rb, sz); } -lnet_rtrbuf_t * +static lnet_rtrbuf_t * lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) { int npages = rbp->rbp_npages; @@ -1394,7 +1394,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) return rb; } -void +static void lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) { int npages = rbp->rbp_npages; @@ -1487,7 +1487,7 @@ failed: return -ENOMEM; } -void +static void lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages) { INIT_LIST_HEAD(&rbp->rbp_msgs); diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index e39e1ee..cc87c28 100644 --- a/lnet/lnet/router_proc.c +++ b/lnet/lnet/router_proc.c @@ -790,8 +790,6 @@ static struct lnet_portal_rotors portal_rotors[] = { }, }; -extern int portal_rotor; - static int __proc_lnet_portal_rotor(void *data, int write, loff_t pos, void __user *buffer, int nob) { diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c index 18d0037..856bf95 100644 --- a/lnet/selftest/brw_test.c +++ b/lnet/selftest/brw_test.c @@ -65,7 +65,7 @@ brw_client_fini (sfw_test_instance_t *tsi) } } -int +static int brw_client_init (sfw_test_instance_t *tsi) { sfw_session_t *sn = tsi->tsi_batch->bat_session; @@ -130,7 +130,7 @@ brw_client_init (sfw_test_instance_t *tsi) #define BRW_MAGIC 0xeeb0eeb1eeb2eeb3ULL #define BRW_MSIZE sizeof(__u64) -int brw_inject_one_error (void) +static int brw_inject_one_error(void) { struct timeval tv; @@ -147,8 +147,8 @@ int brw_inject_one_error (void) return brw_inject_errors--; } -void -brw_fill_page (struct page *pg, int pattern, __u64 magic) +static void +brw_fill_page(struct page *pg, int pattern, __u64 magic) { char *addr = page_address(pg); int i; @@ -177,8 +177,8 @@ brw_fill_page (struct page *pg, int pattern, __u64 magic) return; } -int -brw_check_page (struct page *pg, int pattern, __u64 magic) +static int +brw_check_page(struct page *pg, int pattern, __u64 magic) { char *addr = page_address(pg); __u64 data = 0; /* make compiler happy */ @@ -217,8 +217,8 @@ bad_data: return 1; } -void -brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) +static void +brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic) { int i; struct page *pg; @@ -234,8 +234,8 @@ brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) } } -int -brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) +static int +brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic) { int i; struct page *pg; @@ -366,8 +366,8 @@ out: return; } -void -brw_server_rpc_done (srpc_server_rpc_t *rpc) +static void +brw_server_rpc_done(srpc_server_rpc_t *rpc) { srpc_bulk_t *blk = rpc->srpc_bulk; @@ -385,8 +385,8 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc) sfw_free_pages(rpc); } -int -brw_bulk_ready (srpc_server_rpc_t *rpc, int status) +static int +brw_bulk_ready(srpc_server_rpc_t *rpc, int status) { __u64 magic = BRW_MAGIC; srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply; @@ -421,7 +421,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status) return 0; } -int +static int brw_server_handle(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; diff --git a/lnet/selftest/conctl.c b/lnet/selftest/conctl.c index 0cc5151..b3adca0 100644 --- a/lnet/selftest/conctl.c +++ b/lnet/selftest/conctl.c @@ -46,7 +46,7 @@ #include #include "console.h" -int +static int lst_session_new_ioctl(lstio_session_new_args_t *args) { char *name; @@ -82,7 +82,7 @@ lst_session_new_ioctl(lstio_session_new_args_t *args) return rc; } -int +static int lst_session_end_ioctl(lstio_session_end_args_t *args) { if (args->lstio_ses_key != console_session.ses_key) @@ -91,7 +91,7 @@ lst_session_end_ioctl(lstio_session_end_args_t *args) return lstcon_session_end(); } -int +static int lst_session_info_ioctl(lstio_session_info_args_t *args) { /* no checking of key */ @@ -113,7 +113,7 @@ lst_session_info_ioctl(lstio_session_info_args_t *args) args->lstio_ses_nmlen); } -int +static int lst_debug_ioctl(lstio_debug_args_t *args) { char *name = NULL; @@ -194,7 +194,7 @@ out: return rc; } -int +static int lst_group_add_ioctl(lstio_group_add_args_t *args) { char *name; @@ -204,7 +204,7 @@ lst_group_add_ioctl(lstio_group_add_args_t *args) return -EACCES; if (args->lstio_grp_namep == NULL|| - args->lstio_grp_nmlen <= 0 || + args->lstio_grp_nmlen <= 0 || args->lstio_grp_nmlen > LST_NAME_SIZE) return -EINVAL; @@ -227,7 +227,7 @@ lst_group_add_ioctl(lstio_group_add_args_t *args) return rc; } -int +static int lst_group_del_ioctl(lstio_group_del_args_t *args) { int rc; @@ -260,7 +260,7 @@ lst_group_del_ioctl(lstio_group_del_args_t *args) return rc; } -int +static int lst_group_update_ioctl(lstio_group_update_args_t *args) { int rc; @@ -271,7 +271,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args) if (args->lstio_grp_resultp == NULL || args->lstio_grp_namep == NULL || - args->lstio_grp_nmlen <= 0 || + args->lstio_grp_nmlen <= 0 || args->lstio_grp_nmlen > LST_NAME_SIZE) return -EINVAL; @@ -317,7 +317,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args) return rc; } -int +static int lst_nodes_add_ioctl(lstio_group_nodes_args_t *args) { unsigned feats; @@ -362,10 +362,10 @@ lst_nodes_add_ioctl(lstio_group_nodes_args_t *args) return rc; } -int +static int lst_group_list_ioctl(lstio_group_list_args_t *args) { - if (args->lstio_grp_key != console_session.ses_key) + if (args->lstio_grp_key != console_session.ses_key) return -EACCES; if (args->lstio_grp_idx < 0 || @@ -379,7 +379,7 @@ lst_group_list_ioctl(lstio_group_list_args_t *args) args->lstio_grp_namep); } -int +static int lst_group_info_ioctl(lstio_group_info_args_t *args) { char *name; @@ -431,7 +431,7 @@ lst_group_info_ioctl(lstio_group_info_args_t *args) LIBCFS_FREE(name, args->lstio_grp_nmlen + 1); - if (rc != 0) + if (rc != 0) return rc; if (args->lstio_grp_dentsp != NULL && @@ -442,7 +442,7 @@ lst_group_info_ioctl(lstio_group_info_args_t *args) return 0; } -int +static int lst_batch_add_ioctl(lstio_batch_add_args_t *args) { int rc; @@ -475,7 +475,7 @@ lst_batch_add_ioctl(lstio_batch_add_args_t *args) return rc; } -int +static int lst_batch_run_ioctl(lstio_batch_run_args_t *args) { int rc; @@ -509,7 +509,7 @@ lst_batch_run_ioctl(lstio_batch_run_args_t *args) return rc; } -int +static int lst_batch_stop_ioctl(lstio_batch_stop_args_t *args) { int rc; @@ -544,7 +544,7 @@ lst_batch_stop_ioctl(lstio_batch_stop_args_t *args) return rc; } -int +static int lst_batch_query_ioctl(lstio_batch_query_args_t *args) { char *name; @@ -585,7 +585,7 @@ lst_batch_query_ioctl(lstio_batch_query_args_t *args) return rc; } -int +static int lst_batch_list_ioctl(lstio_batch_list_args_t *args) { if (args->lstio_bat_key != console_session.ses_key) @@ -602,7 +602,7 @@ lst_batch_list_ioctl(lstio_batch_list_args_t *args) args->lstio_bat_namep); } -int +static int lst_batch_info_ioctl(lstio_batch_info_args_t *args) { char *name; @@ -667,7 +667,7 @@ lst_batch_info_ioctl(lstio_batch_info_args_t *args) return rc; } -int +static int lst_stat_query_ioctl(lstio_stat_args_t *args) { int rc; @@ -714,7 +714,7 @@ lst_stat_query_ioctl(lstio_stat_args_t *args) return rc; } -int lst_test_add_ioctl(lstio_test_args_t *args) +static int lst_test_add_ioctl(lstio_test_args_t *args) { char *batch_name; char *src_name = NULL; diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c index f6f00e4..de80dd9 100644 --- a/lnet/selftest/conrpc.c +++ b/lnet/selftest/conrpc.c @@ -89,7 +89,7 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc) spin_unlock(&rpc->crpc_lock); } -int +static int lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats, int bulk_npg, int bulk_len, int embedded, lstcon_rpc_t *crpc) { @@ -114,7 +114,7 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats, return 0; } -int +static int lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats, int bulk_npg, int bulk_len, lstcon_rpc_t **crpcpp) { @@ -183,7 +183,7 @@ lstcon_rpc_put(lstcon_rpc_t *crpc) atomic_dec(&console_session.ses_rpc_counter); } -void +static void lstcon_rpc_post(lstcon_rpc_t *crpc) { lstcon_rpc_trans_t *trans = crpc->crp_trans; @@ -385,7 +385,7 @@ lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout) return rc; } -int +static int lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp) { lstcon_node_t *nd = crpc->crp_node; @@ -704,7 +704,7 @@ lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc) return 0; } -lnet_process_id_packed_t * +static lnet_process_id_packed_t * lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov) { lnet_process_id_packed_t *pid; @@ -719,7 +719,7 @@ lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov) return &pid[idx % SFW_ID_PER_PAGE]; } -int +static int lstcon_dstnodes_prep(lstcon_group_t *grp, int idx, int dist, int span, int nkiov, lnet_kiov_t *kiov) { @@ -773,7 +773,7 @@ lstcon_dstnodes_prep(lstcon_group_t *grp, int idx, return 0; } -int +static int lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) { test_ping_req_t *prq = &req->tsr_u.ping; @@ -784,7 +784,7 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) return 0; } -int +static int lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) { test_bulk_req_t *brq = &req->tsr_u.bulk_v0; @@ -797,7 +797,7 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) return 0; } -int +static int lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) { test_bulk_req_v1_t *brq = &req->tsr_u.bulk_v1; @@ -917,7 +917,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, return rc; } -int +static int lstcon_sesnew_stat_reply(lstcon_rpc_trans_t *trans, lstcon_node_t *nd, srpc_msg_t *reply) { @@ -1169,7 +1169,7 @@ lstcon_rpc_trans_ndlist(struct list_head *ndlist, return rc; } -void +static void lstcon_rpc_pinger(void *arg) { stt_timer_t *ptimer = (stt_timer_t *)arg; diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c index 0be173d..e6df2ee 100644 --- a/lnet/selftest/console.c +++ b/lnet/selftest/console.c @@ -62,7 +62,7 @@ do { \ lstcon_session_t console_session; -void +static void lstcon_node_get(lstcon_node_t *nd) { LASSERT (nd->nd_ref >= 1); @@ -116,7 +116,7 @@ lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create) return 0; } -void +static void lstcon_node_put(lstcon_node_t *nd) { lstcon_ndlink_t *ndl; @@ -351,7 +351,7 @@ lstcon_group_move(lstcon_group_t *old, lstcon_group_t *new) } } -int +static int lstcon_sesrpc_condition(int transop, lstcon_node_t *nd, void *arg) { lstcon_group_t *grp = (lstcon_group_t *)arg; @@ -380,7 +380,7 @@ lstcon_sesrpc_condition(int transop, lstcon_node_t *nd, void *arg) return 1; } -int +static int lstcon_sesrpc_readent(int transop, srpc_msg_t *msg, lstcon_rpc_ent_t __user *ent_up) { @@ -1013,7 +1013,7 @@ lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up, return rc; } -int +static int lstcon_batrpc_condition(int transop, lstcon_node_t *nd, void *arg) { switch (transop) { @@ -1156,7 +1156,7 @@ lstcon_batch_destroy(lstcon_batch_t *bat) LIBCFS_FREE(bat, sizeof(lstcon_batch_t)); } -int +static int lstcon_testrpc_condition(int transop, lstcon_node_t *nd, void *arg) { lstcon_test_t *test; @@ -1386,7 +1386,7 @@ out: return rc; } -int +static int lstcon_test_find(lstcon_batch_t *batch, int idx, lstcon_test_t **testpp) { lstcon_test_t *test; @@ -1401,7 +1401,7 @@ lstcon_test_find(lstcon_batch_t *batch, int idx, lstcon_test_t **testpp) return -ENOENT; } -int +static int lstcon_tsbrpc_readent(int transop, srpc_msg_t *msg, lstcon_rpc_ent_t __user *ent_up) { @@ -1480,7 +1480,7 @@ lstcon_test_batch_query(char *name, int testidx, int client, return rc; } -int +static int lstcon_statrpc_readent(int transop, srpc_msg_t *msg, lstcon_rpc_ent_t __user *ent_up) { @@ -1506,7 +1506,7 @@ lstcon_statrpc_readent(int transop, srpc_msg_t *msg, return 0; } -int +static int lstcon_ndlist_stat(struct list_head *ndlist, int timeout, struct list_head __user *result_up) { @@ -1596,7 +1596,7 @@ lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up, return rc; } -int +static int lstcon_debug_ndlist(struct list_head *ndlist, struct list_head *translist, int timeout, struct list_head __user *result_up) @@ -1726,8 +1726,6 @@ lstcon_new_session_id(lst_sid_t *sid) sid->ses_stamp = cfs_time_current(); } -extern srpc_service_t lstcon_acceptor_service; - int lstcon_session_new(char *name, int key, unsigned feats, int timeout, int force, lst_sid_t __user *sid_up) @@ -2012,8 +2010,8 @@ out: return rc; } -srpc_service_t lstcon_acceptor_service; -void lstcon_init_acceptor_service(void) +static srpc_service_t lstcon_acceptor_service; +static void lstcon_init_acceptor_service(void) { /* initialize selftest console acceptor service table */ lstcon_acceptor_service.sv_name = "join session"; diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h index d6bfaa4..1912254 100644 --- a/lnet/selftest/console.h +++ b/lnet/selftest/console.h @@ -255,4 +255,7 @@ extern int lstcon_test_add(char *batch_name, int type, int loop, struct list_head __user *result_up); #endif +int lstcon_console_init(void); +int lstcon_console_fini(void); + #endif diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index 9296c8bb..ac041de 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.c @@ -103,7 +103,7 @@ do { \ #define sfw_test_active(t) (atomic_read(&(t)->tsi_nactive) != 0) #define sfw_batch_active(b) (atomic_read(&(b)->bat_nactive) != 0) -struct smoketest_framework { +static struct smoketest_framework { /* RPCs to be recycled */ struct list_head fw_zombie_rpcs; /* stopping sessions */ @@ -165,7 +165,7 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) return 0; } -void +static void sfw_add_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -185,7 +185,7 @@ sfw_add_session_timer (void) return; } -int +static int sfw_del_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -261,7 +261,7 @@ sfw_session_removed (void) #endif -void +static void sfw_session_expired (void *data) { sfw_session_t *sn = data; @@ -307,7 +307,7 @@ sfw_init_session(sfw_session_t *sn, lst_sid_t sid, } /* completion handler for incoming framework RPCs */ -void +static void sfw_server_rpc_done(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -325,7 +325,7 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc) return; } -void +static void sfw_client_rpc_fini (srpc_client_rpc_t *rpc) { LASSERT(rpc->crpc_bulk.bk_niov == 0); @@ -350,7 +350,7 @@ sfw_client_rpc_fini (srpc_client_rpc_t *rpc) spin_unlock(&sfw_data.fw_lock); } -sfw_batch_t * +static sfw_batch_t * sfw_find_batch (lst_bid_t bid) { sfw_session_t *sn = sfw_data.fw_session; @@ -366,7 +366,7 @@ sfw_find_batch (lst_bid_t bid) return NULL; } -sfw_batch_t * +static sfw_batch_t * sfw_bid2batch (lst_bid_t bid) { sfw_session_t *sn = sfw_data.fw_session; @@ -379,7 +379,7 @@ sfw_bid2batch (lst_bid_t bid) return bat; LIBCFS_ALLOC(bat, sizeof(sfw_batch_t)); - if (bat == NULL) + if (bat == NULL) return NULL; bat->bat_error = 0; @@ -392,7 +392,7 @@ sfw_bid2batch (lst_bid_t bid) return bat; } -int +static int sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -504,7 +504,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) return 0; } -int +static int sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -536,7 +536,7 @@ sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) return 0; } -int +static int sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -545,7 +545,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) reply->dbg_status = ESRCH; reply->dbg_sid = LST_INVALID_SID; return 0; - } + } reply->dbg_status = 0; reply->dbg_sid = sn->sn_id; @@ -557,7 +557,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) return 0; } -void +static void sfw_test_rpc_fini (srpc_client_rpc_t *rpc) { sfw_test_unit_t *tsu = rpc->crpc_priv; @@ -585,7 +585,7 @@ sfw_test_buffers(sfw_test_instance_t *tsi) return max(SFW_TEST_WI_MIN, nbuf + SFW_TEST_WI_EXTRA); } -int +static int sfw_load_test(struct sfw_test_instance *tsi) { struct sfw_test_case *tsc; @@ -622,7 +622,7 @@ sfw_load_test(struct sfw_test_instance *tsi) return 0; } -void +static void sfw_unload_test(struct sfw_test_instance *tsi) { struct sfw_test_case *tsc; @@ -642,7 +642,7 @@ sfw_unload_test(struct sfw_test_instance *tsi) return; } -void +static void sfw_destroy_test_instance (sfw_test_instance_t *tsi) { srpc_client_rpc_t *rpc; @@ -676,7 +676,7 @@ clean: return; } -void +static void sfw_destroy_batch (sfw_batch_t *tsb) { sfw_test_instance_t *tsi; @@ -715,7 +715,7 @@ sfw_destroy_session (sfw_session_t *sn) return; } -void +static void sfw_unpack_addtest_req(srpc_msg_t *msg) { srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; @@ -760,7 +760,7 @@ sfw_unpack_addtest_req(srpc_msg_t *msg) return; } -int +static int sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) { srpc_msg_t *msg = &rpc->srpc_reqstbuf->buf_msg; @@ -906,7 +906,7 @@ sfw_test_unit_done (sfw_test_unit_t *tsu) return; } -void +static void sfw_test_rpc_done (srpc_client_rpc_t *rpc) { sfw_test_unit_t *tsu = rpc->crpc_priv; @@ -985,7 +985,7 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer, return 0; } -int +static int sfw_run_test (swi_workitem_t *wi) { sfw_test_unit_t *tsu = wi->swi_workitem.wi_data; @@ -1034,7 +1034,7 @@ test_done: return 1; } -int +static int sfw_run_batch (sfw_batch_t *tsb) { swi_workitem_t *wi; @@ -1112,7 +1112,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) return 0; } -int +static int sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply) { sfw_test_instance_t *tsi; @@ -1157,7 +1157,7 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len, return 0; } -int +static int sfw_add_test (srpc_server_rpc_t *rpc) { sfw_session_t *sn = sfw_data.fw_session; @@ -1227,7 +1227,7 @@ sfw_add_test (srpc_server_rpc_t *rpc) return 0; } -int +static int sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -1268,7 +1268,7 @@ sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) return 0; } -int +static int sfw_handle_server_rpc(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -1379,7 +1379,7 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) return rc; } -int +static int sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -1642,7 +1642,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc) return; } -static srpc_service_t sfw_services[] = +static srpc_service_t sfw_services[] = { { /* sv_id */ SRPC_SERVICE_DEBUG, @@ -1681,17 +1681,6 @@ static srpc_service_t sfw_services[] = } }; -extern sfw_test_client_ops_t ping_test_client; -extern srpc_service_t ping_test_service; -extern void ping_init_test_client(void); -extern void ping_init_test_service(void); - -extern sfw_test_client_ops_t brw_test_client; -extern srpc_service_t brw_test_service; -extern void brw_init_test_client(void); -extern void brw_init_test_service(void); - - int sfw_startup (void) { diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c index 61b7d27..215ba07 100644 --- a/lnet/selftest/module.c +++ b/lnet/selftest/module.c @@ -37,6 +37,7 @@ #define DEBUG_SUBSYSTEM S_LNET #include "selftest.h" +#include "console.h" enum { LST_INIT_NONE = 0, @@ -47,15 +48,12 @@ enum { LST_INIT_CONSOLE }; -extern int lstcon_console_init(void); -extern int lstcon_console_fini(void); - static int lst_init_step = LST_INIT_NONE; struct cfs_wi_sched *lst_sched_serial; struct cfs_wi_sched **lst_sched_test; -void +static void lnet_selftest_fini(void) { int i; @@ -103,7 +101,7 @@ lnet_selftest_structure_assertion(void) CLASSERT(sizeof(srpc_stat_reqst_t) == 28); } -int +static int lnet_selftest_init(void) { int nscheds; diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c index f512036..18dcf5a 100644 --- a/lnet/selftest/ping_test.c +++ b/lnet/selftest/ping_test.c @@ -44,7 +44,7 @@ #define LST_PING_TEST_MAGIC 0xbabeface -int ping_srv_workitems = SFW_TEST_WI_MAX; +static int ping_srv_workitems = SFW_TEST_WI_MAX; CFS_MODULE_PARM(ping_srv_workitems, "i", int, 0644, "# PING server workitems"); typedef struct { diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c index d3f7e98..4119bde 100644 --- a/lnet/selftest/rpc.c +++ b/lnet/selftest/rpc.c @@ -54,7 +54,7 @@ typedef enum { SRPC_STATE_STOPPING, } srpc_state_t; -struct smoketest_rpc { +static struct smoketest_rpc { spinlock_t rpc_glock; /* global lock */ srpc_service_t *rpc_services[SRPC_SERVICE_MAX_ID + 1]; lnet_handle_eq_t rpc_lnet_eq; /* _the_ LNet event queue */ @@ -87,7 +87,7 @@ void srpc_set_counters (const srpc_counters_t *cnt) spin_unlock(&srpc_data.rpc_glock); } -int +static int srpc_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i, int nob) { nob = min(nob, (int)PAGE_CACHE_SIZE); @@ -205,7 +205,7 @@ srpc_next_id (void) return id; } -void +static void srpc_init_server_rpc(struct srpc_server_rpc *rpc, struct srpc_service_cd *scd, struct srpc_buffer *buffer) @@ -386,7 +386,7 @@ srpc_remove_service (srpc_service_t *sv) return 0; } -int +static int srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf, int len, int options, lnet_process_id_t peer, lnet_handle_md_t *mdh, srpc_event_t *ev) @@ -426,7 +426,7 @@ srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf, return 0; } -int +static int srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, int options, lnet_process_id_t peer, lnet_nid_t self, lnet_handle_md_t *mdh, srpc_event_t *ev) @@ -478,7 +478,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, return 0; } -int +static int srpc_post_active_rqtbuf(lnet_process_id_t peer, int service, void *buf, int len, lnet_handle_md_t *mdh, srpc_event_t *ev) { @@ -487,7 +487,7 @@ srpc_post_active_rqtbuf(lnet_process_id_t peer, int service, void *buf, LNET_NID_ANY, mdh, ev); } -int +static int srpc_post_passive_rqtbuf(int service, int local, void *buf, int len, lnet_handle_md_t *mdh, srpc_event_t *ev) { @@ -501,7 +501,7 @@ srpc_post_passive_rqtbuf(int service, int local, void *buf, int len, LNET_MD_OP_PUT, any, mdh, ev); } -int +static int srpc_service_post_buffer(struct srpc_service_cd *scd, struct srpc_buffer *buf) __must_hold(&scd->scd_lock) { @@ -733,7 +733,7 @@ srpc_finish_service(struct srpc_service *sv) } /* called with sv->sv_lock held */ -void +static void srpc_service_recycle_buffer(struct srpc_service_cd *scd, srpc_buffer_t *buf) __must_hold(&scd->scd_lock) { @@ -824,7 +824,7 @@ srpc_shutdown_service(srpc_service_t *sv) } } -int +static int srpc_send_request (srpc_client_rpc_t *rpc) { srpc_event_t *ev = &rpc->crpc_reqstev; @@ -844,7 +844,7 @@ srpc_send_request (srpc_client_rpc_t *rpc) return rc; } -int +static int srpc_prepare_reply (srpc_client_rpc_t *rpc) { srpc_event_t *ev = &rpc->crpc_replyev; @@ -868,7 +868,7 @@ srpc_prepare_reply (srpc_client_rpc_t *rpc) return rc; } -int +static int srpc_prepare_bulk (srpc_client_rpc_t *rpc) { srpc_bulk_t *bk = &rpc->crpc_bulk; @@ -904,7 +904,7 @@ srpc_prepare_bulk (srpc_client_rpc_t *rpc) return rc; } -int +static int srpc_do_bulk (srpc_server_rpc_t *rpc) { srpc_event_t *ev = &rpc->srpc_ev; @@ -936,7 +936,7 @@ srpc_do_bulk (srpc_server_rpc_t *rpc) } /* only called from srpc_handle_rpc */ -void +static void srpc_server_rpc_done(srpc_server_rpc_t *rpc, int status) { struct srpc_service_cd *scd = rpc->srpc_scd; @@ -1111,7 +1111,7 @@ srpc_handle_rpc(swi_workitem_t *wi) return 0; } -void +static void srpc_client_rpc_expired (void *data) { srpc_client_rpc_t *rpc = data; @@ -1132,7 +1132,7 @@ srpc_client_rpc_expired (void *data) spin_unlock(&srpc_data.rpc_glock); } -inline void +static void srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc) { stt_timer_t *timer = &rpc->crpc_timer; @@ -1154,7 +1154,7 @@ srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc) * * Upon exit the RPC expiry timer is not queued and the handler is not * running on any CPU. */ -void +static void srpc_del_client_rpc_timer (srpc_client_rpc_t *rpc) { /* timer not planted or already exploded */ @@ -1179,7 +1179,7 @@ srpc_del_client_rpc_timer (srpc_client_rpc_t *rpc) #endif } -void +static void srpc_client_rpc_done (srpc_client_rpc_t *rpc, int status) { swi_workitem_t *wi = &rpc->crpc_wi; @@ -1443,7 +1443,7 @@ srpc_send_reply(struct srpc_server_rpc *rpc) } /* when in kernel always called with LNET_LOCK() held, and in thread context */ -void +static void srpc_lnet_ev_handler(lnet_event_t *ev) { struct srpc_service_cd *scd; diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h index 94b0a35..061d766 100644 --- a/lnet/selftest/selftest.h +++ b/lnet/selftest/selftest.h @@ -646,4 +646,14 @@ srpc_wait_service_shutdown(srpc_service_t *sv) } } +extern sfw_test_client_ops_t ping_test_client; +extern srpc_service_t ping_test_service; +void ping_init_test_client(void); +void ping_init_test_service(void); + +extern sfw_test_client_ops_t brw_test_client; +extern srpc_service_t brw_test_service; +void brw_init_test_client(void); +void brw_init_test_service(void); + #endif /* __SELFTEST_SELFTEST_H__ */ diff --git a/lnet/selftest/timer.c b/lnet/selftest/timer.c index 39fcc46..84ce098 100644 --- a/lnet/selftest/timer.c +++ b/lnet/selftest/timer.c @@ -44,9 +44,9 @@ /* - * Timers are implemented as a sorted queue of expiry times. The queue - * is slotted, with each slot holding timers which expire in a - * 2**STTIMER_MINPOLL (8) second period. The timers in each slot are + * Timers are implemented as a sorted queue of expiry times. The queue + * is slotted, with each slot holding timers which expire in a + * 2**STTIMER_MINPOLL (8) second period. The timers in each slot are * sorted by increasing expiry time. The number of slots is 2**7 (128), * to cover a time period of 1024 seconds into the future before wrapping. */ @@ -57,7 +57,7 @@ #define STTIMER_SLOT(t) (&stt_data.stt_hash[(((t) >> STTIMER_MINPOLL) & \ (STTIMER_NSLOTS - 1))]) -struct st_timer_data { +static struct st_timer_data { spinlock_t stt_lock; /* start time of the slot processed previously */ cfs_time_t stt_prev_slot; @@ -127,7 +127,7 @@ stt_del_timer(stt_timer_t *timer) } /* called with stt_data.stt_lock held */ -int +static int stt_expire_list(struct list_head *slot, cfs_time_t now) { int expired = 0; @@ -151,7 +151,7 @@ stt_expire_list(struct list_head *slot, cfs_time_t now) return expired; } -int +static int stt_check_timers (cfs_time_t *last) { int expired = 0; @@ -175,7 +175,7 @@ stt_check_timers (cfs_time_t *last) #ifdef __KERNEL__ -int +static int stt_timer_main (void *arg) { int rc = 0; @@ -196,7 +196,7 @@ stt_timer_main (void *arg) return rc; } -int +static int stt_start_timer_thread (void) { struct task_struct *task; diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c index 39f2c6a..853b17e 100644 --- a/lustre/obdclass/llog_cat.c +++ b/lustre/obdclass/llog_cat.c @@ -801,9 +801,9 @@ int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle, return rc; } -static int cat_cancel_cb(const struct lu_env *env, - struct llog_handle *cathandle, - struct llog_rec_hdr *rec, void *data) +int cat_cancel_cb(const struct lu_env *env, + struct llog_handle *cathandle, + struct llog_rec_hdr *rec, void *data) { struct llog_logid_rec *lir = (struct llog_logid_rec *)rec; struct llog_handle *loghandle; -- 1.8.3.1