NFSv4.2 add tracepoint to OFFLOAD_CANCEL

Add tracepoint to OFFLOAD_CANCEL operation.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 7c7399b10050bfac55ac671a837665fcc6052f4b..08355b66e7cb812b19b3e0d29b3ec5f8d355a479 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -509,6 +509,7 @@ static void nfs42_offload_cancel_done(struct rpc_task *task, void *calldata)
 {
        struct nfs42_offloadcancel_data *data = calldata;
 
+       trace_nfs4_offload_cancel(&data->args, task->tk_status);
        nfs41_sequence_done(task, &data->res.osr_seq_res);
        if (task->tk_status &&
                nfs4_async_handle_error(task, data->seq_server, NULL,

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index f337a25c67b340044d8db2428b7fe465ec1ea3ce..6ee6ad3674a29734bdb7b3bcda5134684634acc8 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -2463,6 +2463,39 @@ TRACE_EVENT(nfs4_copy_notify,
                        __entry->res_stateid_seq, __entry->res_stateid_hash
                )
 );
+
+TRACE_EVENT(nfs4_offload_cancel,
+               TP_PROTO(
+                       const struct nfs42_offload_status_args *args,
+                       int error
+               ),
+
+               TP_ARGS(args, error),
+
+               TP_STRUCT__entry(
+                       __field(unsigned long, error)
+                       __field(u32, fhandle)
+                       __field(int, stateid_seq)
+                       __field(u32, stateid_hash)
+               ),
+
+               TP_fast_assign(
+                       __entry->fhandle = nfs_fhandle_hash(args->osa_src_fh);
+                       __entry->error = error < 0 ? -error : 0;
+                       __entry->stateid_seq =
+                               be32_to_cpu(args->osa_stateid.seqid);
+                       __entry->stateid_hash =
+                               nfs_stateid_hash(&args->osa_stateid);
+               ),
+
+               TP_printk(
+                       "error=%ld (%s) fhandle=0x%08x stateid=%d:0x%08x",
+                       -__entry->error,
+                       show_nfs4_status(__entry->error),
+                       __entry->fhandle,
+                       __entry->stateid_seq, __entry->stateid_hash
+               )
+);
 #endif /* CONFIG_NFS_V4_2 */
 
 #endif /* CONFIG_NFS_V4_1 */