Merge tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux.git] / fs / nfsd / nfs4layouts.c

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);