Skip to content

Commit

Permalink
NFSv4.1: Ensure state manager thread dies on last umount
Browse files Browse the repository at this point in the history
Currently, the state manager may continue to try recovering state forever
even after the last filesystem to reference that nfs_client has umounted.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Apr 15, 2011
1 parent e3b2854 commit 47c2199
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/nfs/nfs4state.c
Expand Up @@ -1607,7 +1607,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
int status = 0;

/* Ensure exclusive access to NFSv4 state */
for(;;) {
do {
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);
Expand Down Expand Up @@ -1691,7 +1691,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
break;
if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
break;
}
} while (atomic_read(&clp->cl_count) > 1);
return;
out_error:
printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
Expand Down

0 comments on commit 47c2199

Please sign in to comment.