lkml.org 
[lkml]   [2013]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 73/93] NFSv4.1: Handle NFS4ERR_DELAY when resetting the NFSv4.1 session
    Date
    3.5.7.5 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit c489ee290bdbbace6bb63ebe6ebd4dd605819495 upstream.

    NFS4ERR_DELAY is a legal reply when we call DESTROY_SESSION. It
    usually means that the server is busy handling an unfinished RPC
    request. Just sleep for a second and then retry.
    We also need to be able to handle the NFS4ERR_BACK_CHAN_BUSY return
    value. If the NFS server has outstanding callbacks, we just want to
    similarly sleep & retry.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    fs/nfs/nfs4state.c | 14 ++++++++++++--
    1 file changed, 12 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
    index f38300e..9bc63d3 100644
    --- a/fs/nfs/nfs4state.c
    +++ b/fs/nfs/nfs4state.c
    @@ -1767,8 +1767,18 @@ static int nfs4_reset_session(struct nfs_client *clp)
    nfs4_begin_drain_session(clp);
    cred = nfs4_get_exchange_id_cred(clp);
    status = nfs4_proc_destroy_session(clp->cl_session, cred);
    - if (status && status != -NFS4ERR_BADSESSION &&
    - status != -NFS4ERR_DEADSESSION) {
    + switch (status) {
    + case 0:
    + case -NFS4ERR_BADSESSION:
    + case -NFS4ERR_DEADSESSION:
    + break;
    + case -NFS4ERR_BACK_CHAN_BUSY:
    + case -NFS4ERR_DELAY:
    + set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);
    + status = 0;
    + ssleep(1);
    + goto out;
    + default:
    status = nfs4_recovery_handle_error(clp, status);
    goto out;
    }
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-02-06 00:22    [W:4.020 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site