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

Commit 9f51a78e authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Rename "stateid_invalid" label 



I'm going to use this exit label also for migration recovery
failures.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f1478c13

fs/nfs/nfs4proc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -4728,12 +4728,12 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
			if (state == NULL)

			if (state == NULL)

				break;

				break;

			if (nfs4_schedule_stateid_recovery(server, state) < 0)

			if (nfs4_schedule_stateid_recovery(server, state) < 0)

				goto stateid_invalid;

				goto recovery_failed;

			goto wait_on_recovery;

			goto wait_on_recovery;

		case -NFS4ERR_EXPIRED:

		case -NFS4ERR_EXPIRED:

			if (state != NULL) {

			if (state != NULL) {

				if (nfs4_schedule_stateid_recovery(server, state) < 0)

				if (nfs4_schedule_stateid_recovery(server, state) < 0)

					goto stateid_invalid;

					goto recovery_failed;

			}

			}

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_STATEID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_STALE_CLIENTID:
@@ -4762,7 +4762,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
	}

	}

	task->tk_status = nfs4_map_errors(task->tk_status);

	task->tk_status = nfs4_map_errors(task->tk_status);

	return 0;

	return 0;

stateid_invalid:

recovery_failed:

	task->tk_status = -EIO;

	task->tk_status = -EIO;

	return 0;

	return 0;

wait_on_recovery:

wait_on_recovery: