Re: [PATCH 2/2] SUNRPC: Ensure that call_bind times out correctly

[Steve Dickson <SteveD@redhat.com>]

On 03/17/2014 02:40 PM, Trond Myklebust wrote:
> If the rpcbind server is unavailable, we still want the RPC client
> to respect the timeout.
> 
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Tested-by: Steve Dickson <steved@redhat.com>

steved.

> ---
>  net/sunrpc/clnt.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index f22d3a115fda..53a13835b90f 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -1728,9 +1728,7 @@ call_bind_status(struct rpc_task *task)
>  	case -EPROTONOSUPPORT:
>  		dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n",
>  				task->tk_pid);
> -		task->tk_status = 0;
> -		task->tk_action = call_bind;
> -		return;
> +		goto retry_timeout;
>  	case -ECONNREFUSED:		/* connection problems */
>  	case -ECONNRESET:
>  	case -ECONNABORTED:
> @@ -1756,6 +1754,7 @@ call_bind_status(struct rpc_task *task)
>  	return;
>  
>  retry_timeout:
> +	task->tk_status = 0;
>  	task->tk_action = call_timeout;
>  }
>  
>