Skip to content

Commit 2d6a194

Browse files
chuckleverTrond Myklebust
authored andcommitted
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: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]> Reviewed-by: Benjamin Coddington <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Trond Myklebust <[email protected]>
1 parent adcc0ae commit 2d6a194

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

fs/nfs/nfs42proc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,7 @@ _nfs42_proc_offload_status(struct nfs_server *server, struct file *file,
648648
status = nfs4_call_sync(server->client, server, &msg,
649649
&data->args.osa_seq_args,
650650
&data->res.osr_seq_res, 1);
651+
trace_nfs4_offload_status(&data->args, status);
651652
switch (status) {
652653
case 0:
653654
break;

fs/nfs/nfs4trace.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,7 @@ TRACE_EVENT(nfs4_copy_notify,
26082608
)
26092609
);
26102610

2611-
TRACE_EVENT(nfs4_offload_cancel,
2611+
DECLARE_EVENT_CLASS(nfs4_offload_class,
26122612
TP_PROTO(
26132613
const struct nfs42_offload_status_args *args,
26142614
int error
@@ -2640,6 +2640,15 @@ TRACE_EVENT(nfs4_offload_cancel,
26402640
__entry->stateid_seq, __entry->stateid_hash
26412641
)
26422642
);
2643+
#define DEFINE_NFS4_OFFLOAD_EVENT(name) \
2644+
DEFINE_EVENT(nfs4_offload_class, name, \
2645+
TP_PROTO( \
2646+
const struct nfs42_offload_status_args *args, \
2647+
int error \
2648+
), \
2649+
TP_ARGS(args, error))
2650+
DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_cancel);
2651+
DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_status);
26432652

26442653
DECLARE_EVENT_CLASS(nfs4_xattr_event,
26452654
TP_PROTO(

0 commit comments

Comments
 (0)