Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ced63d1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Handle expired stateids when the lease is still valid 



Currently, if the server returns NFS4ERR_EXPIRED in reply to a READ or
WRITE, but the RENEW test determines that the lease is still active, we
fail to recover and end up looping forever in a READ/WRITE + RENEW death
spiral.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
parent fe19a96b

fs/nfs/nfs4proc.c

+7 −2
Original line number Diff line number Diff line
@@ -267,9 +267,11 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc 
				break;

			nfs4_schedule_stateid_recovery(server, state);

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:

			if (state != NULL)

				nfs4_schedule_stateid_recovery(server, state);

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_lease_recovery(clp);

			goto wait_on_recovery;

#if defined(CONFIG_NFS_V4_1)
@@ -3670,9 +3672,11 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
				break;

			nfs4_schedule_stateid_recovery(server, state);

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:

			if (state != NULL)

				nfs4_schedule_stateid_recovery(server, state);

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_lease_recovery(clp);

			goto wait_on_recovery;

#if defined(CONFIG_NFS_V4_1)
@@ -4543,6 +4547,7 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 
			case -ESTALE:

				goto out;

			case -NFS4ERR_EXPIRED:

				nfs4_schedule_stateid_recovery(server, state);

			case -NFS4ERR_STALE_CLIENTID:

			case -NFS4ERR_STALE_STATEID:

				nfs4_schedule_lease_recovery(server->nfs_client);