Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFSv4: Don't exit the state management if there are still tasks to do

Browse Source 
Fix up a potential race...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2008-12-23 15:21:48 -05:00
parent e005e8041c
commit f3c76491e7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/nfs4state.c
View File

@ -1112,7 +1112,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
int status = 0; int status = 0;
/* Ensure exclusive access to NFSv4 state */ /* Ensure exclusive access to NFSv4 state */
while (!list_empty(&clp->cl_superblocks)) { for(;;) {
if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) { if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
/* We're going to have to re-establish a clientid */ /* We're going to have to re-establish a clientid */
status = nfs4_reclaim_lease(clp); status = nfs4_reclaim_lease(clp);
@ -1161,7 +1161,11 @@ static void nfs4_state_manager(struct nfs_client *clp)
} }
nfs4_clear_state_manager_bit(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; return;
out_error: out_error: