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

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

NFSv4: Don't start state recovery in nfs4_close_done() 



We might not even have any open files at this point...

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

fs/nfs/nfs4proc.c

+1 −5
Original line number Diff line number Diff line
@@ -1140,7 +1140,6 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
			break;

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_state_recovery(server->nfs_client);

			break;

		default:

			if (nfs4_async_handle_error(task, server) == -EAGAIN) {
@@ -2955,7 +2954,6 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4 
		switch (err) {

			case -NFS4ERR_STALE_STATEID:

			case -NFS4ERR_EXPIRED:

				nfs4_schedule_state_recovery(server->nfs_client);

			case 0:

				return 0;

		}
@@ -3109,14 +3107,12 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) 
			break;

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_EXPIRED:

			nfs4_schedule_state_recovery(calldata->server->nfs_client);

			break;

		default:

			if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN) {

			if (nfs4_async_handle_error(task, calldata->server) == -EAGAIN)

				rpc_restart_call(task);

	}

}

}



static void nfs4_locku_prepare(struct rpc_task *task, void *data)

{