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

Commit 404ea356 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case 



If the server tells us our stateid has expired, then handle that as if
it was revoked.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Tested-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6c2d8f8d

fs/nfs/nfs4proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1919,7 +1919,6 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct 
		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_STATEID:

			set_bit(NFS_DELEGATED_STATE, &state->flags);

			set_bit(NFS_DELEGATED_STATE, &state->flags);

		case -NFS4ERR_EXPIRED:

			/* Don't recall a delegation if it was lost */

			/* Don't recall a delegation if it was lost */

			nfs4_schedule_lease_recovery(server->nfs_client);

			nfs4_schedule_lease_recovery(server->nfs_client);

			return -EAGAIN;

			return -EAGAIN;
@@ -1931,6 +1930,7 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct 
			return -EAGAIN;

			return -EAGAIN;

		case -NFS4ERR_DELEG_REVOKED:

		case -NFS4ERR_DELEG_REVOKED:

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_EXPIRED:

		case -NFS4ERR_BAD_STATEID:

		case -NFS4ERR_BAD_STATEID:

		case -NFS4ERR_OPENMODE:

		case -NFS4ERR_OPENMODE:

			nfs_inode_find_state_and_recover(state->inode,

			nfs_inode_find_state_and_recover(state->inode,