aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:48 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:48 -0500
commitf3c76491e7ecacbb7942633f3b2a3514b7476ef9 (patch)
tree1b09c70b850639790b1d4cb908a574f549729617 /fs
parente005e8041c132af9f70862e1387a222198f95e7f (diff)
NFSv4: Don't exit the state management if there are still tasks to do
Fix up a potential race... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4state.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 83f3dd39ac5..9e76712dcae 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1112,7 +1112,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
int status = 0;
/* Ensure exclusive access to NFSv4 state */
- while (!list_empty(&clp->cl_superblocks)) {
+ for(;;) {
if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
/* We're going to have to re-establish a clientid */
status = nfs4_reclaim_lease(clp);
@@ -1161,7 +1161,11 @@ static void nfs4_state_manager(struct nfs_client *clp)
}
nfs4_clear_state_manager_bit(clp);
- break;
+ /* Did we race with an attempt to give us more work? */
+ if (clp->cl_state == 0)
+ break;
+ if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
+ break;
}
return;
out_error: