nfsd: Add "nfsd_" to trace point names

Follow naming convention used in client and in sunrpc layers.

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

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 7d888369f85a4194b0ddf0c2202bb693fe9cac99..228faf00a5945397f79c2e97f0566394d6830987 100644 (file)
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -165,7 +165,7 @@ nfsd4_free_layout_stateid(struct nfs4_stid *stid)
        struct nfs4_client *clp = ls->ls_stid.sc_client;
        struct nfs4_file *fp = ls->ls_stid.sc_file;
 
-       trace_layoutstate_free(&ls->ls_stid.sc_stateid);
+       trace_nfsd_layoutstate_free(&ls->ls_stid.sc_stateid);
 
        spin_lock(&clp->cl_lock);
        list_del_init(&ls->ls_perclnt);
@@ -264,7 +264,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,
        list_add(&ls->ls_perfile, &fp->fi_lo_states);
        spin_unlock(&fp->fi_lock);
 
-       trace_layoutstate_alloc(&ls->ls_stid.sc_stateid);
+       trace_nfsd_layoutstate_alloc(&ls->ls_stid.sc_stateid);
        return ls;
 }
 
@@ -334,7 +334,7 @@ nfsd4_recall_file_layout(struct nfs4_layout_stateid *ls)
        if (list_empty(&ls->ls_layouts))
                goto out_unlock;
 
-       trace_layout_recall(&ls->ls_stid.sc_stateid);
+       trace_nfsd_layout_recall(&ls->ls_stid.sc_stateid);
 
        refcount_inc(&ls->ls_stid.sc_count);
        nfsd4_run_cb(&ls->ls_recall);
@@ -507,7 +507,7 @@ nfsd4_return_file_layouts(struct svc_rqst *rqstp,
                                                false, lrp->lr_layout_type,
                                                &ls);
        if (nfserr) {
-               trace_layout_return_lookup_fail(&lrp->lr_sid);
+               trace_nfsd_layout_return_lookup_fail(&lrp->lr_sid);
                return nfserr;
        }
 
@@ -523,7 +523,7 @@ nfsd4_return_file_layouts(struct svc_rqst *rqstp,
                        nfs4_inc_and_copy_stateid(&lrp->lr_sid, &ls->ls_stid);
                lrp->lrs_present = 1;
        } else {
-               trace_layoutstate_unhash(&ls->ls_stid.sc_stateid);
+               trace_nfsd_layoutstate_unhash(&ls->ls_stid.sc_stateid);
                nfs4_unhash_stid(&ls->ls_stid);
                lrp->lrs_present = 0;
        }
@@ -694,7 +694,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task)
                /*
                 * Unknown error or non-responding client, we'll need to fence.
                 */
-               trace_layout_recall_fail(&ls->ls_stid.sc_stateid);
+               trace_nfsd_layout_recall_fail(&ls->ls_stid.sc_stateid);
 
                ops = nfsd4_layout_ops[ls->ls_layout_type];
                if (ops->fence_client)
@@ -703,7 +703,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task)
                        nfsd4_cb_layout_fail(ls);
                return -1;
        case -NFS4ERR_NOMATCHING_LAYOUT:
-               trace_layout_recall_done(&ls->ls_stid.sc_stateid);
+               trace_nfsd_layout_recall_done(&ls->ls_stid.sc_stateid);
                task->tk_status = 0;
                return 1;
        }
@@ -716,7 +716,7 @@ nfsd4_cb_layout_release(struct nfsd4_callback *cb)
                container_of(cb, struct nfs4_layout_stateid, ls_recall);
        LIST_HEAD(reaplist);
 
-       trace_layout_recall_release(&ls->ls_stid.sc_stateid);
+       trace_nfsd_layout_recall_release(&ls->ls_stid.sc_stateid);
 
        nfsd4_return_all_layouts(ls, &reaplist);
        nfsd4_free_layouts(&reaplist);

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 40dfb759d38dece41129a91a4689a4545b42adce..792fbb8510469c5f4fab9d8e5da60186dd4be8d8 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1411,7 +1411,7 @@ nfsd4_layoutget(struct svc_rqst *rqstp,
        nfserr = nfsd4_preprocess_layout_stateid(rqstp, cstate, &lgp->lg_sid,
                                                true, lgp->lg_layout_type, &ls);
        if (nfserr) {
-               trace_layout_get_lookup_fail(&lgp->lg_sid);
+               trace_nfsd_layout_get_lookup_fail(&lgp->lg_sid);
                goto out;
        }
 
@@ -1480,7 +1480,7 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp,
                                                false, lcp->lc_layout_type,
                                                &ls);
        if (nfserr) {
-               trace_layout_commit_lookup_fail(&lcp->lc_sid);
+               trace_nfsd_layout_commit_lookup_fail(&lcp->lc_sid);
                /* fixup error code as per RFC5661 */
                if (nfserr == nfserr_bad_stateid)
                        nfserr = nfserr_badlayout;

diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 9b7950602fad67d04ac2df0d2ce934c170ee3dab..30e04852a4e03aa5e6b03696aa5c72aab6297cb1 100644 (file)
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -35,7 +35,7 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
 )
 
 #define DEFINE_NFSD_IO_EVENT(name)             \
-DEFINE_EVENT(nfsd_io_class, name,              \
+DEFINE_EVENT(nfsd_io_class, nfsd_##name,       \
        TP_PROTO(struct svc_rqst *rqstp,        \
                 struct svc_fh  *fhp,           \
                 loff_t         offset,         \
@@ -76,7 +76,7 @@ DECLARE_EVENT_CLASS(nfsd_stateid_class,
 )
 
 #define DEFINE_STATEID_EVENT(name) \
-DEFINE_EVENT(nfsd_stateid_class, name, \
+DEFINE_EVENT(nfsd_stateid_class, nfsd_##name, \
        TP_PROTO(stateid_t *stp), \
        TP_ARGS(stp))
 DEFINE_STATEID_EVENT(layoutstate_alloc);

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index e2eab4c37030d6e835ef120434cfd2cf2168cbd4..857031952970d03c1f186bef1b4a0c4226f03c79 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1024,27 +1024,27 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
        struct raparms  *ra;
        __be32 err;
 
-       trace_read_start(rqstp, fhp, offset, *count);
+       trace_nfsd_read_start(rqstp, fhp, offset, *count);
        err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
        if (err)
                return err;
 
        ra = nfsd_init_raparms(file);
 
-       trace_read_opened(rqstp, fhp, offset, *count);
+       trace_nfsd_read_opened(rqstp, fhp, offset, *count);
 
        if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags))
                err = nfsd_splice_read(rqstp, file, offset, count);
        else
                err = nfsd_readv(file, offset, vec, vlen, count);
 
-       trace_read_io_done(rqstp, fhp, offset, *count);
+       trace_nfsd_read_io_done(rqstp, fhp, offset, *count);
 
        if (ra)
                nfsd_put_raparams(file, ra);
        fput(file);
 
-       trace_read_done(rqstp, fhp, offset, *count);
+       trace_nfsd_read_done(rqstp, fhp, offset, *count);
 
        return err;
 }
@@ -1061,18 +1061,18 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
        struct file *file = NULL;
        __be32 err = 0;
 
-       trace_write_start(rqstp, fhp, offset, *cnt);
+       trace_nfsd_write_start(rqstp, fhp, offset, *cnt);
 
        err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file);
        if (err)
                goto out;
 
-       trace_write_opened(rqstp, fhp, offset, *cnt);
+       trace_nfsd_write_opened(rqstp, fhp, offset, *cnt);
        err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable);
-       trace_write_io_done(rqstp, fhp, offset, *cnt);
+       trace_nfsd_write_io_done(rqstp, fhp, offset, *cnt);
        fput(file);
 out:
-       trace_write_done(rqstp, fhp, offset, *cnt);
+       trace_nfsd_write_done(rqstp, fhp, offset, *cnt);
        return err;
 }