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

Commit 5ba12443 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix stateid recovery on revoked delegations 



Ensure that we fix the non-NULL stateid case as well.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ae2ffef3

fs/nfs/nfs4proc.c

+3 −15
Original line number Diff line number Diff line
@@ -356,28 +356,16 @@ int nfs4_handle_exception(struct nfs_server *server, int errorcode, struct nfs4_ 
		case 0:

			return 0;

		case -NFS4ERR_OPENMODE:

			if (inode && nfs4_have_delegation(inode, FMODE_READ)) {

				nfs4_inode_return_delegation(inode);

				exception->retry = 1;

				return 0;

			}

			if (state == NULL)

				break;

			ret = nfs4_schedule_stateid_recovery(server, state);

			if (ret < 0)

				break;

			goto wait_on_recovery;

		case -NFS4ERR_DELEG_REVOKED:

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_BAD_STATEID:

			if (state == NULL) {

				if (inode && nfs4_have_delegation(inode,

						FMODE_READ)) {

			if (inode && nfs4_have_delegation(inode, FMODE_READ)) {

				nfs4_inode_return_delegation(inode);

				exception->retry = 1;

				return 0;

			}

			if (state == NULL)

				break;

			}

			ret = nfs4_schedule_stateid_recovery(server, state);

			if (ret < 0)

				break;