Commit 2d6a194f authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Refactor trace_nfs4_offload_cancel 



Add a trace_nfs4_offload_status trace point that looks just like
trace_nfs4_offload_cancel. Promote that event to an event class to
avoid duplicating code.

An alternative approach would be to expand trace_nfs4_offload_status
to report more of the actual OFFLOAD_STATUS result.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Link: https://lore.kernel.org/r/20250113153235.48706-16-cel@kernel.org


Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent adcc0aef

fs/nfs/nfs42proc.c

+1 −0
Original line number Diff line number Diff line
@@ -648,6 +648,7 @@ _nfs42_proc_offload_status(struct nfs_server *server, struct file *file, 
	status = nfs4_call_sync(server->client, server, &msg,

				&data->args.osa_seq_args,

				&data->res.osr_seq_res, 1);

	trace_nfs4_offload_status(&data->args, status);

	switch (status) {

	case 0:

		break;

fs/nfs/nfs4trace.h

+10 −1
Original line number Diff line number Diff line
@@ -2608,7 +2608,7 @@ TRACE_EVENT(nfs4_copy_notify, 
		)

);



TRACE_EVENT(nfs4_offload_cancel,

DECLARE_EVENT_CLASS(nfs4_offload_class,

		TP_PROTO(

			const struct nfs42_offload_status_args *args,

			int error
@@ -2640,6 +2640,15 @@ TRACE_EVENT(nfs4_offload_cancel, 
			__entry->stateid_seq, __entry->stateid_hash

		)

);

#define DEFINE_NFS4_OFFLOAD_EVENT(name) \

	DEFINE_EVENT(nfs4_offload_class, name,  \

			TP_PROTO( \

				const struct nfs42_offload_status_args *args, \

				int error \

			), \

			TP_ARGS(args, error))

DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_cancel);

DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_status);



DECLARE_EVENT_CLASS(nfs4_xattr_event,

		TP_PROTO(