[PATCH] ocfs2/cluster/tcp.c: make some functions static

Commit 0f475b2abe (ocfs2/net: Silence build
warnings) made sense as far as it fixed compile warnings, but it was not
required that it made the functions global.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Adrian Bunk 2008-08-07 00:11:12 +03:00 committed by Mark Fasheh
parent d3ee1b4058
commit 18496e80f7
2 changed files with 37 additions and 39 deletions

View File

@ -143,8 +143,8 @@ static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);
static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
u32 msgkey, struct task_struct *task, u8 node) u32 msgkey, struct task_struct *task, u8 node)
{ {
INIT_LIST_HEAD(&nst->st_net_debug_item); INIT_LIST_HEAD(&nst->st_net_debug_item);
nst->st_task = task; nst->st_task = task;
@ -153,31 +153,61 @@ void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
nst->st_node = node; nst->st_node = node;
} }
void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
{ {
do_gettimeofday(&nst->st_sock_time); do_gettimeofday(&nst->st_sock_time);
} }
void o2net_set_nst_send_time(struct o2net_send_tracking *nst) static void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
{ {
do_gettimeofday(&nst->st_send_time); do_gettimeofday(&nst->st_send_time);
} }
void o2net_set_nst_status_time(struct o2net_send_tracking *nst) static void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
{ {
do_gettimeofday(&nst->st_status_time); do_gettimeofday(&nst->st_status_time);
} }
void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
struct o2net_sock_container *sc) struct o2net_sock_container *sc)
{ {
nst->st_sc = sc; nst->st_sc = sc;
} }
void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id) static void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id)
{ {
nst->st_id = msg_id; nst->st_id = msg_id;
} }
#else /* CONFIG_DEBUG_FS */
static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
u32 msgkey, struct task_struct *task, u8 node)
{
}
static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
struct o2net_sock_container *sc)
{
}
static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst,
u32 msg_id)
{
}
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
static inline int o2net_reconnect_delay(void) static inline int o2net_reconnect_delay(void)

View File

@ -224,42 +224,10 @@ struct o2net_send_tracking {
struct timeval st_send_time; struct timeval st_send_time;
struct timeval st_status_time; struct timeval st_status_time;
}; };
void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
u32 msgkey, struct task_struct *task, u8 node);
void o2net_set_nst_sock_time(struct o2net_send_tracking *nst);
void o2net_set_nst_send_time(struct o2net_send_tracking *nst);
void o2net_set_nst_status_time(struct o2net_send_tracking *nst);
void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
struct o2net_sock_container *sc);
void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id);
#else #else
struct o2net_send_tracking { struct o2net_send_tracking {
u32 dummy; u32 dummy;
}; };
static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,
u32 msgkey, struct task_struct *task, u8 node)
{
}
static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst)
{
}
static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,
struct o2net_sock_container *sc)
{
}
static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst,
u32 msg_id)
{
}
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
#endif /* O2CLUSTER_TCP_INTERNAL_H */ #endif /* O2CLUSTER_TCP_INTERNAL_H */