diff mbox

NFSv4: Don't retry server trunking discovery on timeouts

Message ID 1394204563-1166-2-git-send-email-steved@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Dickson March 7, 2014, 3:02 p.m. UTC 
To allow background mounts to process into background,
server trunking discovery needs to return the -ETIMEDOUT
error to the mount command instead of endless retrying in
the kernel.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 fs/nfs/nfs4state.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Trond Myklebust March 7, 2014, 3:26 p.m. UTC | #1 
On Mar 7, 2014, at 10:02, Steve Dickson <steved@redhat.com> wrote:

> To allow background mounts to process into background,
> server trunking discovery needs to return the -ETIMEDOUT
> error to the mount command instead of endless retrying in
> the kernel.
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
> ---
> fs/nfs/nfs4state.c |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index e1a4721..be4b33f 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -2085,6 +2085,7 @@ again:
> 		break;
> 	case -NFS4ERR_DELAY:
> 	case -ETIMEDOUT:
> +		break;
> 	case -EAGAIN:
> 		ssleep(1);
> 	case -NFS4ERR_STALE_CLIENTID:
> -- 
> 1.7.1
> 

This will cause NFS4ERR_DELAY to interrupt the mount as well. We don’t want that...
diff mbox

Patch

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index e1a4721..be4b33f 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2085,6 +2085,7 @@  again:
 		break;
 	case -NFS4ERR_DELAY:
 	case -ETIMEDOUT:
+		break;
 	case -EAGAIN:
 		ssleep(1);
 	case -NFS4ERR_STALE_CLIENTID: