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

Commit c606bb88 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked 

NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
revoked. We will currently fail to do this if the stateid is a delegation.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 869f9dfa

fs/nfs/filelayout/filelayout.c

+0 −3
Original line number Diff line number Diff line
@@ -145,9 +145,6 @@ static int filelayout_async_handle_error(struct rpc_task *task, 
	case -NFS4ERR_DELEG_REVOKED:

	case -NFS4ERR_ADMIN_REVOKED:

	case -NFS4ERR_BAD_STATEID:

		if (state == NULL)

			break;

		nfs_remove_bad_delegation(state->inode);

	case -NFS4ERR_OPENMODE:

		if (state == NULL)

			break;

fs/nfs/nfs4proc.c

+0 −8
Original line number Diff line number Diff line
@@ -370,11 +370,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc 
		case -NFS4ERR_DELEG_REVOKED:

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_BAD_STATEID:

			if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) {

				nfs_remove_bad_delegation(inode);

				exception->retry = 1;

				break;

			}

			if (state == NULL)

				break;

			ret = nfs4_schedule_stateid_recovery(server, state);
@@ -4844,9 +4839,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
		case -NFS4ERR_DELEG_REVOKED:

		case -NFS4ERR_ADMIN_REVOKED:

		case -NFS4ERR_BAD_STATEID:

			if (state == NULL)

				break;

			nfs_remove_bad_delegation(state->inode);

		case -NFS4ERR_OPENMODE:

			if (state == NULL)

				break;