lkml.org 
[lkml]   [2020]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.8 104/132] nfsd: rename delegation related tracepoints to make them less confusing
    Date
    From: Hou Tao <houtao1@huawei.com>

    [ Upstream commit 3caf91757ced158e6c4a44d8b105bd7b3e1767d8 ]

    Now when a read delegation is given, two delegation related traces
    will be printed:

    nfsd_deleg_open: client 5f45b854:e6058001 stateid 00000030:00000001
    nfsd_deleg_none: client 5f45b854:e6058001 stateid 0000002f:00000001

    Although the intention is to let developers know two stateid are
    returned, the traces are confusing about whether or not a read delegation
    is handled out. So renaming trace_nfsd_deleg_none() to trace_nfsd_open()
    and trace_nfsd_deleg_open() to trace_nfsd_deleg_read() to make
    the intension clearer.

    The patched traces will be:

    nfsd_deleg_read: client 5f48a967:b55b21cd stateid 00000003:00000001
    nfsd_open: client 5f48a967:b55b21cd stateid 00000002:00000001

    Suggested-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Hou Tao <houtao1@huawei.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfs4state.c | 4 ++--
    fs/nfsd/trace.h | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
    index cea682ce8aa12..2d568d0e55f78 100644
    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -5100,7 +5100,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open,

    memcpy(&open->op_delegate_stateid, &dp->dl_stid.sc_stateid, sizeof(dp->dl_stid.sc_stateid));

    - trace_nfsd_deleg_open(&dp->dl_stid.sc_stateid);
    + trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
    open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
    nfs4_put_stid(&dp->dl_stid);
    return;
    @@ -5217,7 +5217,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
    nfs4_open_delegation(current_fh, open, stp);
    nodeleg:
    status = nfs_ok;
    - trace_nfsd_deleg_none(&stp->st_stid.sc_stateid);
    + trace_nfsd_open(&stp->st_stid.sc_stateid);
    out:
    /* 4.1 client trying to upgrade/downgrade delegation? */
    if (open->op_delegate_type == NFS4_OPEN_DELEGATE_NONE && dp &&
    diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
    index 1861db1bdc670..99bf07800cd09 100644
    --- a/fs/nfsd/trace.h
    +++ b/fs/nfsd/trace.h
    @@ -289,8 +289,8 @@ DEFINE_STATEID_EVENT(layout_recall_done);
    DEFINE_STATEID_EVENT(layout_recall_fail);
    DEFINE_STATEID_EVENT(layout_recall_release);

    -DEFINE_STATEID_EVENT(deleg_open);
    -DEFINE_STATEID_EVENT(deleg_none);
    +DEFINE_STATEID_EVENT(open);
    +DEFINE_STATEID_EVENT(deleg_read);
    DEFINE_STATEID_EVENT(deleg_break);
    DEFINE_STATEID_EVENT(deleg_recall);

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-10-27 01:22    [W:4.032 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site