summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:47 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:47 -0500
commit707fb4b324371f1b4bea5eb29e39d265c66086ae (patch)
treefdd11b731073e0eda3966390c263e31af9ef5a5d /fs/nfs/nfs4state.c
parent515d86117724abe39d7d57d7ccc7cc5c44480529 (diff)
downloadlinux-707fb4b324371f1b4bea5eb29e39d265c66086ae.tar.gz
linux-707fb4b324371f1b4bea5eb29e39d265c66086ae.tar.bz2
linux-707fb4b324371f1b4bea5eb29e39d265c66086ae.zip
NFSv4: Clean up NFS4ERR_CB_PATH_DOWN error management...
Add a delegation cleanup phase to the state management loop, and do the NFS4ERR_CB_PATH_DOWN recovery there. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 3d78706b3efb..2894502b94dc 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1027,7 +1027,7 @@ static void nfs4_recovery_handle_error(struct nfs_client *clp, int error)
{
switch (error) {
case -NFS4ERR_CB_PATH_DOWN:
- set_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state);
+ nfs_handle_cb_pathdown(clp);
break;
case -NFS4ERR_STALE_CLIENTID:
case -NFS4ERR_LEASE_MOVED:
@@ -1156,11 +1156,14 @@ static int reclaimer(void *ptr)
nfs4_state_end_reclaim_nograce(clp);
continue;
}
+
+ if (test_and_clear_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state)) {
+ nfs_client_return_marked_delegations(clp);
+ continue;
+ }
break;
}
out:
- if (test_and_clear_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state))
- nfs_handle_cb_pathdown(clp);
nfs4_clear_recover_bit(clp);
nfs_put_client(clp);
module_put_and_exit(0);