lkml.org 
[lkml]   [2014]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 25/83] SUNRPC: Ensure that call_connect times out correctly
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Trond Myklebust <trond.myklebust@primarydata.com>

    commit 485f2251782f7c44299c491d4676a8a01428d191 upstream.

    When the server is unavailable due to a networking error, etc, we want
    the RPC client to respect the timeout delays when attempting to reconnect.

    Reported-by: Neil Brown <neilb@suse.de>
    Fixes: 561ec1603171 (SUNRPC: call_connect_status should recheck bind..)
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/clnt.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    --- a/net/sunrpc/clnt.c
    +++ b/net/sunrpc/clnt.c
    @@ -1798,10 +1798,6 @@ call_connect_status(struct rpc_task *tas
    trace_rpc_connect_status(task, status);
    task->tk_status = 0;
    switch (status) {
    - /* if soft mounted, test if we've timed out */
    - case -ETIMEDOUT:
    - task->tk_action = call_timeout;
    - return;
    case -ECONNREFUSED:
    case -ECONNRESET:
    case -ECONNABORTED:
    @@ -1812,7 +1808,9 @@ call_connect_status(struct rpc_task *tas
    if (RPC_IS_SOFTCONN(task))
    break;
    case -EAGAIN:
    - task->tk_action = call_bind;
    + /* Check for timeouts before looping back to call_bind */
    + case -ETIMEDOUT:
    + task->tk_action = call_timeout;
    return;
    case 0:
    clnt->cl_stats->netreconn++;



    \
     
     \ /
      Last update: 2014-05-11 22:41    [W:4.582 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site