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

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

NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e59d27e0

fs/nfs/nfs4proc.c

+5 −5
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc 
		case 0:

			return 0;

		case -NFS4ERR_OPENMODE:

			if (nfs_have_delegation(inode, FMODE_READ)) {

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

				nfs_inode_return_delegation(inode);

				exception->retry = 1;

				return 0;
@@ -282,10 +282,9 @@ 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 (state != NULL)

				nfs_remove_bad_delegation(state->inode);

			if (state == NULL)

				break;

			nfs_remove_bad_delegation(state->inode);

			nfs4_schedule_stateid_recovery(server, state);

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:
@@ -3825,7 +3824,8 @@ 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)

			if (state == NULL)

				break;

			nfs_remove_bad_delegation(state->inode);

		case -NFS4ERR_OPENMODE:

			if (state == NULL)