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

Commit 23f14e79 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove EXIT 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 e05e02e4

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

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

# error "Unkown compiler"

#endif /* __GNUC__ */

#endif /* __GNUC__ */





#define EXIT							    \

do {								    \

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

} while(0)



extern int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,

extern int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,

			    const char *format1, ...)

			    const char *format1, ...)

	__attribute__ ((format (printf, 2, 3)));

	__attribute__ ((format (printf, 2, 3)));

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -400,8 +400,6 @@ ksocknal_tx_done (lnet_ni_t *ni, ksock_tx_t *tx) 
	ksocknal_free_tx (tx);

	ksocknal_free_tx (tx);

	if (lnetmsg != NULL) /* KSOCK_MSG_NOOP go without lnetmsg */

	if (lnetmsg != NULL) /* KSOCK_MSG_NOOP go without lnetmsg */

		lnet_finalize (ni, lnetmsg, rc);

		lnet_finalize (ni, lnetmsg, rc);



	EXIT;

}

}





void

void
@@ -1577,8 +1575,6 @@ void ksocknal_read_callback (ksock_conn_t *conn) 
		wake_up (&sched->kss_waitq);

		wake_up (&sched->kss_waitq);

	}

	}

	spin_unlock_bh(&sched->kss_lock);

	spin_unlock_bh(&sched->kss_lock);



	EXIT;

}

}





/*

/*
@@ -1607,8 +1603,6 @@ void ksocknal_write_callback (ksock_conn_t *conn) 
	}

	}





	spin_unlock_bh(&sched->kss_lock);

	spin_unlock_bh(&sched->kss_lock);



	EXIT;

}

}





ksock_proto_t *

ksock_proto_t *

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -977,8 +977,6 @@ ksocknal_data_ready (struct sock *sk, int n) 
		ksocknal_read_callback(conn);

		ksocknal_read_callback(conn);





	read_unlock(&ksocknal_data.ksnd_global_lock);

	read_unlock(&ksocknal_data.ksnd_global_lock);



	EXIT;

}

}





static void

static void

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ lnet_build_unlink_event (lnet_libmd_t *md, lnet_event_t *ev) 
	ev->type     = LNET_EVENT_UNLINK;

	ev->type     = LNET_EVENT_UNLINK;

	lnet_md_deconstruct(md, &ev->md);

	lnet_md_deconstruct(md, &ev->md);

	lnet_md2handle(&ev->md_handle, md);

	lnet_md2handle(&ev->md_handle, md);

	EXIT;

}

}





/*

/*

drivers/staging/lustre/lustre/fid/fid_request.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -133,7 +133,6 @@ static int seq_client_rpc(struct lu_client_seq *seq, 
	CDEBUG_LIMIT(debug_mask, "%s: Allocated %s-sequence "DRANGE"]\n",

	CDEBUG_LIMIT(debug_mask, "%s: Allocated %s-sequence "DRANGE"]\n",

		     seq->lcs_name, opcname, PRANGE(output));

		     seq->lcs_name, opcname, PRANGE(output));





	EXIT;

out_req:

out_req:

	ptlrpc_req_finished(req);

	ptlrpc_req_finished(req);

	return rc;

	return rc;
@@ -407,7 +406,6 @@ static void seq_client_proc_fini(struct lu_client_seq *seq) 
			lprocfs_remove(&seq->lcs_proc_dir);

			lprocfs_remove(&seq->lcs_proc_dir);

		seq->lcs_proc_dir = NULL;

		seq->lcs_proc_dir = NULL;

	}

	}

	EXIT;

#endif /* LPROCFS */

#endif /* LPROCFS */

}

}
@@ -495,7 +493,6 @@ void seq_client_fini(struct lu_client_seq *seq) 
	}

	}





	seq->lcs_srv = NULL;

	seq->lcs_srv = NULL;

	EXIT;

}

}

EXPORT_SYMBOL(seq_client_fini);

EXPORT_SYMBOL(seq_client_fini);