lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 221/334] nfsd4: Fix forced-expiry locking
    Date
    From: J. Bruce Fields <bfields@redhat.com>

    [ Upstream commit f7104cc1a9159cd0d3e8526cb638ae0301de4b61 ]

    This should use the network-namespace-wide client_lock, not the
    per-client cl_lock.

    You shouldn't see any bugs unless you're actually using the
    forced-expiry interface introduced by 89c905beccbb.

    Fixes: 89c905beccbb "nfsd: allow forced expiration of NFSv4 clients"
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfs4state.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
    index fa67ecd5fe63..2bedc7839ec5 100644
    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -2687,9 +2687,9 @@ static void force_expire_client(struct nfs4_client *clp)

    trace_nfsd_clid_admin_expired(&clp->cl_clientid);

    - spin_lock(&clp->cl_lock);
    + spin_lock(&nn->client_lock);
    clp->cl_time = 0;
    - spin_unlock(&clp->cl_lock);
    + spin_unlock(&nn->client_lock);

    wait_event(expiry_wq, atomic_read(&clp->cl_rpc_users) == 0);
    spin_lock(&nn->client_lock);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:42    [W:4.108 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site