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

Commit 29aaf496 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove ENTRY macro 



We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20fbff1d

drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h

+0 −5
Original line number Diff line number Diff line
@@ -309,11 +309,6 @@ do { \ 
# error "Unkown compiler"

#endif /* __GNUC__ */



#define ENTRY							   \

do {								    \

	CDEBUG(D_TRACE, "Process entered\n");			   \

} while (0)



#define EXIT							    \

do {								    \

	CDEBUG(D_TRACE, "Process leaving\n");			   \

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+0 −4
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ ksocknal_receive (ksock_conn_t *conn) 
	 * Caller checks ksnc_rx_nob_wanted to determine

	 * progress/completion. */

	int     rc;

	ENTRY;



	if (ksocknal_data.ksnd_stall_rx != 0) {

		cfs_pause(cfs_time_seconds (ksocknal_data.ksnd_stall_rx));
@@ -389,7 +388,6 @@ ksocknal_tx_done (lnet_ni_t *ni, ksock_tx_t *tx) 
{

	lnet_msg_t  *lnetmsg = tx->tx_lnetmsg;

	int	  rc = (tx->tx_resid == 0 && !tx->tx_zc_aborted) ? 0 : -EIO;

	ENTRY;



	LASSERT(ni != NULL || tx->tx_conn != NULL);
@@ -1562,7 +1560,6 @@ int ksocknal_scheduler(void *arg) 
void ksocknal_read_callback (ksock_conn_t *conn)

{

	ksock_sched_t *sched;

	ENTRY;



	sched = conn->ksnc_scheduler;
@@ -1591,7 +1588,6 @@ void ksocknal_read_callback (ksock_conn_t *conn) 
void ksocknal_write_callback (ksock_conn_t *conn)

{

	ksock_sched_t *sched;

	ENTRY;



	sched = conn->ksnc_scheduler;

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c

+0 −1
Original line number Diff line number Diff line
@@ -964,7 +964,6 @@ static void 
ksocknal_data_ready (struct sock *sk, int n)

{

	ksock_conn_t  *conn;

	ENTRY;



	/* interleave correctly with closing sockets... */

	LASSERT(!in_irq());

drivers/staging/lustre/lnet/lnet/lib-eq.c

+0 −2
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) 
	int		new_index = eq->eq_deq_seq & (eq->eq_size - 1);

	lnet_event_t	*new_event = &eq->eq_events[new_index];

	int		rc;

	ENTRY;



	/* must called with lnet_eq_wait_lock hold */

	if (LNET_SEQ_GT(eq->eq_deq_seq, new_event->sequence))
@@ -400,7 +399,6 @@ LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, 
	int	wait = 1;

	int	rc;

	int	i;

	ENTRY;



	LASSERT (the_lnet.ln_init);

	LASSERT (the_lnet.ln_refcount > 0);

drivers/staging/lustre/lnet/lnet/lib-msg.c

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
void

lnet_build_unlink_event (lnet_libmd_t *md, lnet_event_t *ev)

{

	ENTRY;



	memset(ev, 0, sizeof(*ev));



	ev->status   = 0;