Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
+2
-6
fs/nfs/nfs4proc.c
+2
-6
fs/nfs/nfs4proc.c
···
256
256
ret = nfs4_wait_clnt_recover(clp);
257
257
if (ret == 0)
258
258
exception->retry = 1;
259
-
#if !defined(CONFIG_NFS_V4_1)
260
259
break;
261
-
#else /* !defined(CONFIG_NFS_V4_1) */
262
-
if (!nfs4_has_session(server->nfs_client))
263
-
break;
264
-
/* FALLTHROUGH */
260
+
#if defined(CONFIG_NFS_V4_1)
265
261
case -NFS4ERR_BADSESSION:
266
262
case -NFS4ERR_BADSLOT:
267
263
case -NFS4ERR_BAD_HIGH_SLOT:
···
270
274
nfs4_schedule_state_recovery(clp);
271
275
exception->retry = 1;
272
276
break;
273
-
#endif /* !defined(CONFIG_NFS_V4_1) */
277
+
#endif /* defined(CONFIG_NFS_V4_1) */
274
278
case -NFS4ERR_FILE_OPEN:
275
279
if (exception->timeout > HZ) {
276
280
/* We have retried a decent amount, time to