[PATCH 1/2] NFSv4: Schedule recovery if nfs40_walk_client_list() is interrupted

[PATCH 1/2] NFSv4: Schedule recovery if nfs40_walk_client_list() is interrupted

[Trond Myklebust]

If a timeout or a signal interrupts the NFSv4 trunking discovery
SETCLIENTID_CONFIRM call, then we don't know whether or not the
server has changed the callback identifier on us.
Assume that it did, and schedule a 'path down' recovery...

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4client.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 0e46d3d1b6cc..aa9ef4876046 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -531,6 +531,13 @@ int nfs40_walk_client_list(struct nfs_client *new,
 			*result = pos;
 			dprintk("NFS: <-- %s using nfs_client = %p ({%d})\n",
 				__func__, pos, atomic_read(&pos->cl_count));
+			goto out;
+		case -ERESTARTSYS:
+		case -ETIMEDOUT:
+			/* The callback path may have been inadvertently
+			 * changed. Schedule recovery!
+			 */
+			nfs4_schedule_path_down_recovery(pos);
 		default:
 			goto out;
 		}
-- 
1.8.5.3

[PATCH 2/2] NFSv4: Ensure we respect soft mount timeouts during trunking discovery

[Trond Myklebust]

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4state.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index f544a1560c83..2349518eef2c 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2075,8 +2075,10 @@ again:
 	switch (status) {
 	case 0:
 		break;
-	case -NFS4ERR_DELAY:
 	case -ETIMEDOUT:
+		if (clnt->cl_softrtry)
+			break;
+	case -NFS4ERR_DELAY:
 	case -EAGAIN:
 		ssleep(1);
 	case -NFS4ERR_STALE_CLIENTID:
-- 
1.8.5.3

Re: [PATCH 2/2] NFSv4: Ensure we respect soft mount timeouts during trunking discovery

[Steve Dickson]

On 03/18/2014 04:03 PM, Trond Myklebust wrote:
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Tested-by: Steve Dickson <steved@redhat.com>

steved.
> ---
>  fs/nfs/nfs4state.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index f544a1560c83..2349518eef2c 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -2075,8 +2075,10 @@ again:
>  	switch (status) {
>  	case 0:
>  		break;
> -	case -NFS4ERR_DELAY:
>  	case -ETIMEDOUT:
> +		if (clnt->cl_softrtry)
> +			break;
> +	case -NFS4ERR_DELAY:
>  	case -EAGAIN:
>  		ssleep(1);
>  	case -NFS4ERR_STALE_CLIENTID:
> 

Re: [PATCH 1/2] NFSv4: Schedule recovery if nfs40_walk_client_list() is interrupted

[Steve Dickson]

On 03/18/2014 04:03 PM, Trond Myklebust wrote:
> If a timeout or a signal interrupts the NFSv4 trunking discovery
> SETCLIENTID_CONFIRM call, then we don't know whether or not the
> server has changed the callback identifier on us.
> Assume that it did, and schedule a 'path down' recovery...
> 
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Tested-by: Steve Dickson <steved@redhat.com>

steved.
> ---
>  fs/nfs/nfs4client.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
> index 0e46d3d1b6cc..aa9ef4876046 100644
> --- a/fs/nfs/nfs4client.c
> +++ b/fs/nfs/nfs4client.c
> @@ -531,6 +531,13 @@ int nfs40_walk_client_list(struct nfs_client *new,
>  			*result = pos;
>  			dprintk("NFS: <-- %s using nfs_client = %p ({%d})\n",
>  				__func__, pos, atomic_read(&pos->cl_count));
> +			goto out;
> +		case -ERESTARTSYS:
> +		case -ETIMEDOUT:
> +			/* The callback path may have been inadvertently
> +			 * changed. Schedule recovery!
> +			 */
> +			nfs4_schedule_path_down_recovery(pos);
>  		default:
>  			goto out;
>  		}
>