aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2013-10-17 14:13:13 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-10-28 15:25:10 -0400
commit9f51a78e3a637a5923c661d2abe958c63441696f (patch)
treecfe0fcdd5691dbcb5aeab7b165002b968e9c8cc6 /fs/nfs
parentf1478c13c0a606b960becaa70e82065835b16fbf (diff)
NFS: Rename "stateid_invalid" label
I'm going to use this exit label also for migration recovery failures. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2614b46a0cc5..fa87f81527b3 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4728,12 +4728,12 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
4728 if (state == NULL) 4728 if (state == NULL)
4729 break; 4729 break;
4730 if (nfs4_schedule_stateid_recovery(server, state) < 0) 4730 if (nfs4_schedule_stateid_recovery(server, state) < 0)
4731 goto stateid_invalid; 4731 goto recovery_failed;
4732 goto wait_on_recovery; 4732 goto wait_on_recovery;
4733 case -NFS4ERR_EXPIRED: 4733 case -NFS4ERR_EXPIRED:
4734 if (state != NULL) { 4734 if (state != NULL) {
4735 if (nfs4_schedule_stateid_recovery(server, state) < 0) 4735 if (nfs4_schedule_stateid_recovery(server, state) < 0)
4736 goto stateid_invalid; 4736 goto recovery_failed;
4737 } 4737 }
4738 case -NFS4ERR_STALE_STATEID: 4738 case -NFS4ERR_STALE_STATEID:
4739 case -NFS4ERR_STALE_CLIENTID: 4739 case -NFS4ERR_STALE_CLIENTID:
@@ -4762,7 +4762,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
4762 } 4762 }
4763 task->tk_status = nfs4_map_errors(task->tk_status); 4763 task->tk_status = nfs4_map_errors(task->tk_status);
4764 return 0; 4764 return 0;
4765stateid_invalid: 4765recovery_failed:
4766 task->tk_status = -EIO; 4766 task->tk_status = -EIO;
4767 return 0; 4767 return 0;
4768wait_on_recovery: 4768wait_on_recovery: