summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-06-17 13:22:58 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-06-17 13:22:58 -0700
commitd5122201a7f90b2aa73092f158b84d1d74f1134d (patch)
tree7d2c55cd74dd31b5977861d0bc71b31424dc68ed /fs/nfs/nfs4proc.c
parent01c3f05228ce7fc19baa103e4e4bf6c1b5062a53 (diff)
downloadop-kernel-dev-d5122201a7f90b2aa73092f158b84d1d74f1134d.zip
op-kernel-dev-d5122201a7f90b2aa73092f158b84d1d74f1134d.tar.gz
NFSv4: Move error handling out of the delegation generic code
The NFSv4 delegation recovery code is required by the protocol to handle more errors. Rather than add NFSv4.0 specific errors into 'generic' delegation code, we should move the error handling into the NFSv4 layer. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4674f80..d326193 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3630,8 +3630,19 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
goto out;
do {
err = _nfs4_do_setlk(state, F_SETLK, fl, 0);
- if (err != -NFS4ERR_DELAY)
- break;
+ switch (err) {
+ default:
+ printk(KERN_ERR "%s: unhandled error %d.\n",
+ __func__, err);
+ case 0:
+ goto out;
+ case -NFS4ERR_EXPIRED:
+ case -NFS4ERR_STALE_CLIENTID:
+ nfs4_schedule_state_recovery(server->nfs_client);
+ goto out;
+ case -NFS4ERR_DELAY:
+ break;
+ }
err = nfs4_handle_exception(server, err, &exception);
} while (exception.retry);
out:
OpenPOWER on IntegriCloud