Commit 17d76ddf authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Replace the nfsd_deleg_break tracepoint 



Renamed so it can be enabled as a set with the other nfsd_cb_
tracepoints. And, consistent with those tracepoints, report the
address of the client, the client ID the server has given it, and
the state ID being recalled.

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

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -4641,7 +4641,7 @@ nfsd_break_deleg_cb(struct file_lock *fl) 
	struct nfs4_delegation *dp = (struct nfs4_delegation *)fl->fl_owner;

	struct nfs4_file *fp = dp->dl_stid.sc_file;



	trace_nfsd_deleg_break(&dp->dl_stid.sc_stateid);

	trace_nfsd_cb_recall(&dp->dl_stid);



	/*

	 * We don't want the locks code to timeout the lease for us;

fs/nfsd/trace.h

+31 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ DEFINE_STATEID_EVENT(layout_recall_release); 


DEFINE_STATEID_EVENT(open);

DEFINE_STATEID_EVENT(deleg_read);

DEFINE_STATEID_EVENT(deleg_break);

DEFINE_STATEID_EVENT(deleg_recall);



DECLARE_EVENT_CLASS(nfsd_stateseqid_class,
@@ -1027,6 +1026,37 @@ TRACE_EVENT(nfsd_cb_done, 
		__entry->status)

);



TRACE_EVENT(nfsd_cb_recall,

	TP_PROTO(

		const struct nfs4_stid *stid

	),

	TP_ARGS(stid),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__field(u32, si_id)

		__field(u32, si_generation)

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

	),

	TP_fast_assign(

		const stateid_t *stp = &stid->sc_stateid;

		const struct nfs4_client *clp = stid->sc_client;



		__entry->cl_boot = stp->si_opaque.so_clid.cl_boot;

		__entry->cl_id = stp->si_opaque.so_clid.cl_id;

		__entry->si_id = stp->si_opaque.so_id;

		__entry->si_generation = stp->si_generation;

		if (clp)

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

				sizeof(struct sockaddr_in6));

		else

			memset(__entry->addr, 0, sizeof(struct sockaddr_in6));

	),

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

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

		__entry->si_id, __entry->si_generation)

);



TRACE_EVENT(nfsd_cb_notify_lock,

	TP_PROTO(

		const struct nfs4_lockowner *lo,