[PATCH] NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN

[PATCH] NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN

[Chuck Lever]

The server's callback client should stop trying to connect to the
client's callback server as soon as it gets ECONNREFUSED.

The NFS server's callback client does not call rpc_ping(), but appears
to have it's own "ping" procedure, so it wasn't covered by commit
caabea8a.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

Hi Bruce-

Noticed at Connectathon.  I think this is appropriate for 2.6.34, which opened
today.

 fs/nfsd/nfs4callback.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c6eed2a..5ab598d 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -542,7 +542,8 @@ void do_probe_callback(struct nfs4_client *clp)
 	};
 	int status;
 
-	status = rpc_call_async(cb->cb_client, &msg, RPC_TASK_SOFT,
+	status = rpc_call_async(cb->cb_client, &msg,
+				RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
 				&nfsd4_cb_probe_ops, (void *)clp);
 	if (status) {
 		warn_no_callback_path(clp, status);

Re: [PATCH] NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN

[J. Bruce Fields]

On Wed, Feb 24, 2010 at 01:48:06PM -0800, Chuck Lever wrote:
> The server's callback client should stop trying to connect to the
> client's callback server as soon as it gets ECONNREFUSED.
> 
> The NFS server's callback client does not call rpc_ping(), but appears
> to have it's own "ping" procedure, so it wasn't covered by commit
> caabea8a.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> 
> Hi Bruce-
> 
> Noticed at Connectathon.  I think this is appropriate for 2.6.34, which opened
> today.

Thanks, applied for 2.6.34.

--b.

> 
>  fs/nfsd/nfs4callback.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index c6eed2a..5ab598d 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -542,7 +542,8 @@ void do_probe_callback(struct nfs4_client *clp)
>  	};
>  	int status;
>  
> -	status = rpc_call_async(cb->cb_client, &msg, RPC_TASK_SOFT,
> +	status = rpc_call_async(cb->cb_client, &msg,
> +				RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
>  				&nfsd4_cb_probe_ops, (void *)clp);
>  	if (status) {
>  		warn_no_callback_path(clp, status);
>