NFSv4.2 add tracepoint to COPY_NOTIFY

Add a tracepoint to COPY_NOTIFY 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 d3d9ea71702f49a8f5084d88e7d86e077a384d68..7c7399b10050bfac55ac671a837665fcc6052f4b 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -603,6 +603,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,
 
        status = nfs4_call_sync(src_server->client, src_server, &msg,
                                &args->cna_seq_args, &res->cnr_seq_res, 0);
+       trace_nfs4_copy_notify(file_inode(src), args, res, status);
        if (status == -ENOTSUPP)
                src_server->caps &= ~NFS_CAP_COPY_NOTIFY;
 

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index f971e38a6e3a7dfc1ef42caf08398cb80d057603..f337a25c67b340044d8db2428b7fe465ec1ea3ce 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -243,7 +243,6 @@ TRACE_EVENT(nfs4_cb_offload,
                        show_nfs_stable_how(__entry->cb_how)
                )
 );
-
 #endif /* CONFIG_NFS_V4_1 */
 
 TRACE_EVENT(nfs4_setup_sequence,
@@ -2407,6 +2406,63 @@ TRACE_EVENT(nfs4_clone,
                        __entry->len
                )
 );
+
+TRACE_EVENT(nfs4_copy_notify,
+               TP_PROTO(
+                       const struct inode *inode,
+                       const struct nfs42_copy_notify_args *args,
+                       const struct nfs42_copy_notify_res *res,
+                       int error
+               ),
+
+               TP_ARGS(inode, args, res, error),
+
+               TP_STRUCT__entry(
+                       __field(unsigned long, error)
+                       __field(u32, fhandle)
+                       __field(u32, fileid)
+                       __field(dev_t, dev)
+                       __field(int, stateid_seq)
+                       __field(u32, stateid_hash)
+                       __field(int, res_stateid_seq)
+                       __field(u32, res_stateid_hash)
+               ),
+
+               TP_fast_assign(
+                       const struct nfs_inode *nfsi = NFS_I(inode);
+
+                       __entry->fileid = nfsi->fileid;
+                       __entry->dev = inode->i_sb->s_dev;
+                       __entry->fhandle = nfs_fhandle_hash(args->cna_src_fh);
+                       __entry->stateid_seq =
+                               be32_to_cpu(args->cna_src_stateid.seqid);
+                       __entry->stateid_hash =
+                               nfs_stateid_hash(&args->cna_src_stateid);
+                       if (error) {
+                               __entry->error = -error;
+                               __entry->res_stateid_seq = 0;
+                               __entry->res_stateid_hash = 0;
+                       } else {
+                               __entry->error = 0;
+                               __entry->res_stateid_seq =
+                                       be32_to_cpu(res->cnr_stateid.seqid);
+                               __entry->res_stateid_hash =
+                                       nfs_stateid_hash(&res->cnr_stateid);
+                       }
+               ),
+
+               TP_printk(
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "stateid=%d:0x%08x res_stateid=%d:0x%08x",
+                       -__entry->error,
+                       show_nfs4_status(__entry->error),
+                       MAJOR(__entry->dev), MINOR(__entry->dev),
+                       (unsigned long long)__entry->fileid,
+                       __entry->fhandle,
+                       __entry->stateid_seq, __entry->stateid_hash,
+                       __entry->res_stateid_seq, __entry->res_stateid_hash
+               )
+);
 #endif /* CONFIG_NFS_V4_2 */
 
 #endif /* CONFIG_NFS_V4_1 */