Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18496e80 authored by Adrian Bunk's avatar Adrian Bunk Committed by Mark Fasheh
Browse files

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



Commit 0f475b2a (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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent d3ee1b40

fs/ocfs2/cluster/tcp.c

+37 −7
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); 
static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);



#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)

{

	INIT_LIST_HEAD(&nst->st_net_debug_item);
@@ -153,31 +153,61 @@ void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, 
	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);

}



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);

}



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);

}



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)

{

	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;

}



#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 */



static inline int o2net_reconnect_delay(void)

fs/ocfs2/cluster/tcp_internal.h

+0 −32
Original line number Diff line number Diff line
@@ -224,42 +224,10 @@ struct o2net_send_tracking { 
	struct timeval			st_send_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

struct o2net_send_tracking {

	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 /* O2CLUSTER_TCP_INTERNAL_H */