aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
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/nfs
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/nfs')
-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 83f3dd39ac55..9e76712dcae9 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1112,7 +1112,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
1112 int status = 0; 1112 int status = 0;
1113 1113
1114 /* Ensure exclusive access to NFSv4 state */ 1114 /* Ensure exclusive access to NFSv4 state */
1115 while (!list_empty(&clp->cl_superblocks)) { 1115 for(;;) {
1116 if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) { 1116 if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
1117 /* We're going to have to re-establish a clientid */ 1117 /* We're going to have to re-establish a clientid */
1118 status = nfs4_reclaim_lease(clp); 1118 status = nfs4_reclaim_lease(clp);
@@ -1161,7 +1161,11 @@ static void nfs4_state_manager(struct nfs_client *clp)
1161 } 1161 }
1162 1162
1163 nfs4_clear_state_manager_bit(clp); 1163 nfs4_clear_state_manager_bit(clp);
1164 break; 1164 /* Did we race with an attempt to give us more work? */
1165 if (clp->cl_state == 0)
1166 break;
1167 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
1168 break;
1165 } 1169 }
1166 return; 1170 return;
1167out_error: 1171out_error: