Commit 505510fd authored by Frank Zago's avatar Frank Zago Committed by Greg Kroah-Hartman

staging: lustre: make some lnet 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.
Signed-off-by: default avatarFrank Zago <fzago@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5396
Reviewed-on: http://review.whamcloud.com/12206Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be8240ac
...@@ -448,6 +448,8 @@ lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt); ...@@ -448,6 +448,8 @@ 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);
extern int portal_rotor;
int lnet_init(void); int lnet_init(void);
void lnet_fini(void); void lnet_fini(void);
......
...@@ -800,8 +800,6 @@ static struct lnet_portal_rotors portal_rotors[] = { ...@@ -800,8 +800,6 @@ static struct lnet_portal_rotors portal_rotors[] = {
}, },
}; };
extern int portal_rotor;
static int __proc_lnet_portal_rotor(void *data, int write, static int __proc_lnet_portal_rotor(void *data, int write,
loff_t pos, void __user *buffer, int nob) loff_t pos, void __user *buffer, int nob)
{ {
......
...@@ -1693,8 +1693,6 @@ lstcon_new_session_id(lst_sid_t *sid) ...@@ -1693,8 +1693,6 @@ lstcon_new_session_id(lst_sid_t *sid)
sid->ses_stamp = cfs_time_current(); sid->ses_stamp = cfs_time_current();
} }
extern srpc_service_t lstcon_acceptor_service;
int int
lstcon_session_new(char *name, int key, unsigned feats, lstcon_session_new(char *name, int key, unsigned feats,
int timeout, int force, lst_sid_t __user *sid_up) int timeout, int force, lst_sid_t __user *sid_up)
...@@ -1973,7 +1971,7 @@ lstcon_acceptor_handle(struct srpc_server_rpc *rpc) ...@@ -1973,7 +1971,7 @@ lstcon_acceptor_handle(struct srpc_server_rpc *rpc)
return rc; return rc;
} }
srpc_service_t lstcon_acceptor_service; static srpc_service_t lstcon_acceptor_service;
static void lstcon_init_acceptor_service(void) static void lstcon_init_acceptor_service(void)
{ {
/* initialize selftest console acceptor service table */ /* initialize selftest console acceptor service table */
......
...@@ -1629,16 +1629,6 @@ static srpc_service_t sfw_services[] = { ...@@ -1629,16 +1629,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 int
sfw_startup(void) sfw_startup(void)
{ {
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#define DEBUG_SUBSYSTEM S_LNET #define DEBUG_SUBSYSTEM S_LNET
#include "selftest.h" #include "selftest.h"
#include "console.h"
enum { enum {
LST_INIT_NONE = 0, LST_INIT_NONE = 0,
...@@ -47,9 +48,6 @@ enum { ...@@ -47,9 +48,6 @@ enum {
LST_INIT_CONSOLE LST_INIT_CONSOLE
}; };
extern int lstcon_console_init(void);
extern int lstcon_console_fini(void);
static int lst_init_step = LST_INIT_NONE; static int lst_init_step = LST_INIT_NONE;
struct cfs_wi_sched *lst_sched_serial; struct cfs_wi_sched *lst_sched_serial;
......
...@@ -1097,7 +1097,7 @@ srpc_client_rpc_expired(void *data) ...@@ -1097,7 +1097,7 @@ srpc_client_rpc_expired(void *data)
spin_unlock(&srpc_data.rpc_glock); spin_unlock(&srpc_data.rpc_glock);
} }
inline void static void
srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc) srpc_add_client_rpc_timer(srpc_client_rpc_t *rpc)
{ {
stt_timer_t *timer = &rpc->crpc_timer; stt_timer_t *timer = &rpc->crpc_timer;
......
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