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

Commit 0f475b2a authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

[PATCH 3/3] ocfs2/net: Silence build warnings 



This patch silences the build warnings concerning o2net_init_nst()
and friends when building without CONFIG_DEBUG_FS enabled.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 959040c3

fs/ocfs2/cluster/tcp.c

+9 −19
Original line number Original line Diff line number Diff line
@@ -142,53 +142,43 @@ static void o2net_idle_timer(unsigned long data); 
static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);

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





static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype,

#ifdef CONFIG_DEBUG_FS

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)

{

{

#ifdef CONFIG_DEBUG_FS

	INIT_LIST_HEAD(&nst->st_net_debug_item);

	INIT_LIST_HEAD(&nst->st_net_debug_item);

	nst->st_task = task;

	nst->st_task = task;

	nst->st_msg_type = msgtype;

	nst->st_msg_type = msgtype;

	nst->st_msg_key = msgkey;

	nst->st_msg_key = msgkey;

	nst->st_node = node;

	nst->st_node = node;

#endif

}

}





static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)

void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)

{

{

#ifdef CONFIG_DEBUG_FS

	do_gettimeofday(&nst->st_sock_time);

	do_gettimeofday(&nst->st_sock_time);

#endif

}

}





static void o2net_set_nst_send_time(struct o2net_send_tracking *nst)

void o2net_set_nst_send_time(struct o2net_send_tracking *nst)

{

{

#ifdef CONFIG_DEBUG_FS

	do_gettimeofday(&nst->st_send_time);

	do_gettimeofday(&nst->st_send_time);

#endif

}

}





static void o2net_set_nst_status_time(struct o2net_send_tracking *nst)

void o2net_set_nst_status_time(struct o2net_send_tracking *nst)

{

{

#ifdef CONFIG_DEBUG_FS

	do_gettimeofday(&nst->st_status_time);

	do_gettimeofday(&nst->st_status_time);

#endif

}

}





static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,

void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,

					 struct o2net_sock_container *sc)

					 struct o2net_sock_container *sc)

{

{

#ifdef CONFIG_DEBUG_FS

	nst->st_sc = sc;

	nst->st_sc = sc;

#endif

}

}





static void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id)

void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id)

{

{

#ifdef CONFIG_DEBUG_FS

	nst->st_id = msg_id;

	nst->st_id = msg_id;

#endif

}

}

#endif /* CONFIG_DEBUG_FS */





static inline int o2net_reconnect_delay(void)

static inline int o2net_reconnect_delay(void)

{

{

fs/ocfs2/cluster/tcp_internal.h

+32 −0
Original line number Original line Diff line number Diff line
@@ -224,10 +224,42 @@ 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 */