mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
NFSv4.1: Don't call nfs4_schedule_state_recovery() unnecessarily
Currently, nfs4_handle_exception() will call it twice if called with an error of -NFS4ERR_STALE_CLIENTID, -NFS4ERR_STALE_STATEID or -NFS4ERR_EXPIRED. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
parent
8e469ebd6d
commit
03391693a9
1 changed files with 2 additions and 6 deletions
|
@ -256,12 +256,8 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode,
|
|||
ret = nfs4_wait_clnt_recover(clp);
|
||||
if (ret == 0)
|
||||
exception->retry = 1;
|
||||
#if !defined(CONFIG_NFS_V4_1)
|
||||
break;
|
||||
#else /* !defined(CONFIG_NFS_V4_1) */
|
||||
if (!nfs4_has_session(server->nfs_client))
|
||||
break;
|
||||
/* FALLTHROUGH */
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
case -NFS4ERR_BADSESSION:
|
||||
case -NFS4ERR_BADSLOT:
|
||||
case -NFS4ERR_BAD_HIGH_SLOT:
|
||||
|
@ -274,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode,
|
|||
nfs4_schedule_state_recovery(clp);
|
||||
exception->retry = 1;
|
||||
break;
|
||||
#endif /* !defined(CONFIG_NFS_V4_1) */
|
||||
#endif /* defined(CONFIG_NFS_V4_1) */
|
||||
case -NFS4ERR_FILE_OPEN:
|
||||
if (exception->timeout > HZ) {
|
||||
/* We have retried a decent amount, time to
|
||||
|
|
Loading…
Reference in a new issue