nfsd: Trace NFSv4 COMPOUND execution

This helps record the identity and timing of the ops in each NFSv4
COMPOUND, replacing dprintk calls that did much the same thing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 250e0c550fd8..c6157ece46b1 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1721,12 +1721,10 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)
                 goto encode_op;
         }
 
+        trace_nfsd_compound(rqstp, args->opcnt);
         while (!status && resp->opcnt < args->opcnt) {
                 op = &args->ops[resp->opcnt++];
 
-                dprintk("nfsv4 compound op #%d/%d: %d (%s)\n",
-                        resp->opcnt, args->opcnt, op->opnum,
-                        nfsd4_op_name(op->opnum));
                 /*
                  * The XDR decode routines may have pre-set op->status;
                  * for example, if there is a miscellaneous XDR error
@@ -1800,9 +1798,8 @@ encode_op:
                         status = op->status;
                 }
 
-                dprintk("nfsv4 compound op %p opcnt %d #%d: %d: status %d\n",
-                        args->ops, args->opcnt, resp->opcnt, op->opnum,
-                        be32_to_cpu(status));
+                trace_nfsd_compound_status(args->opcnt, resp->opcnt, status,
+                                           nfsd4_op_name(op->opnum));
 
                 nfsd4_cstate_clear_replay(cstate);
                 nfsd4_increment_op_stats(op->opnum);