diff options
| -rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index be044b58e811..afbfe673489b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -256,12 +256,8 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
| 256 | ret = nfs4_wait_clnt_recover(clp); | 256 | ret = nfs4_wait_clnt_recover(clp); |
| 257 | if (ret == 0) | 257 | if (ret == 0) |
| 258 | exception->retry = 1; | 258 | exception->retry = 1; |
| 259 | #if !defined(CONFIG_NFS_V4_1) | ||
| 260 | break; | 259 | break; |
| 261 | #else /* !defined(CONFIG_NFS_V4_1) */ | 260 | #if defined(CONFIG_NFS_V4_1) |
| 262 | if (!nfs4_has_session(server->nfs_client)) | ||
| 263 | break; | ||
| 264 | /* FALLTHROUGH */ | ||
| 265 | case -NFS4ERR_BADSESSION: | 261 | case -NFS4ERR_BADSESSION: |
| 266 | case -NFS4ERR_BADSLOT: | 262 | case -NFS4ERR_BADSLOT: |
| 267 | case -NFS4ERR_BAD_HIGH_SLOT: | 263 | case -NFS4ERR_BAD_HIGH_SLOT: |
| @@ -274,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
| 274 | nfs4_schedule_state_recovery(clp); | 270 | nfs4_schedule_state_recovery(clp); |
| 275 | exception->retry = 1; | 271 | exception->retry = 1; |
| 276 | break; | 272 | break; |
| 277 | #endif /* !defined(CONFIG_NFS_V4_1) */ | 273 | #endif /* defined(CONFIG_NFS_V4_1) */ |
| 278 | case -NFS4ERR_FILE_OPEN: | 274 | case -NFS4ERR_FILE_OPEN: |
| 279 | if (exception->timeout > HZ) { | 275 | if (exception->timeout > HZ) { |
| 280 | /* We have retried a decent amount, time to | 276 | /* We have retried a decent amount, time to |
