Commit 1d2bf659 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Remove the nfsd_cb_work and nfsd_cb_done tracepoints 



Clean up: These are noise in properly working systems. If you really
need to observe the operation of the callback mechanism, use the
sunrpc:rpc\* tracepoints along with the workqueue tracepoints.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4ade892a

fs/nfsd/nfs4callback.c

+0 −5
Original line number Diff line number Diff line
@@ -970,7 +970,6 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata) 
{

	struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);



	trace_nfsd_cb_done(clp, task->tk_status);

	if (task->tk_status)

		nfsd4_mark_cb_down(clp, task->tk_status);

	else
@@ -1172,8 +1171,6 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) 
	struct nfsd4_callback *cb = calldata;

	struct nfs4_client *clp = cb->cb_clp;



	trace_nfsd_cb_done(clp, task->tk_status);



	if (!nfsd4_cb_sequence_done(task, cb))

		return;
@@ -1326,8 +1323,6 @@ nfsd4_run_cb_work(struct work_struct *work) 
	struct rpc_clnt *clnt;

	int flags;



	trace_nfsd_cb_work(clp, cb->cb_msg.rpc_proc->p_name);



	if (cb->cb_need_restart) {

		cb->cb_need_restart = false;

	} else {

fs/nfsd/trace.h

+0 −48
Original line number Diff line number Diff line
@@ -979,54 +979,6 @@ TRACE_EVENT(nfsd_cb_setup_err, 
		__entry->addr, __entry->cl_boot, __entry->cl_id, __entry->error)

);



TRACE_EVENT(nfsd_cb_work,

	TP_PROTO(

		const struct nfs4_client *clp,

		const char *procedure

	),

	TP_ARGS(clp, procedure),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__string(procedure, procedure)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		__assign_str(procedure, procedure)

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x procedure=%s",

		__entry->addr, __entry->cl_boot, __entry->cl_id,

		__get_str(procedure))

);



TRACE_EVENT(nfsd_cb_done,

	TP_PROTO(

		const struct nfs4_client *clp,

		int status

	),

	TP_ARGS(clp, status),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__field(int, status)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		__entry->status = status;

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x status=%d",

		__entry->addr, __entry->cl_boot, __entry->cl_id,

		__entry->status)

);



TRACE_EVENT(nfsd_cb_recall,

	TP_PROTO(

		const struct nfs4_stid *stid