summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-15 17:34:18 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-15 18:28:22 -0400
commit47c2199b6eb5fbe38ddb844db7cdbd914d304f9c (patch)
treebdb4afa93c3236ec79374da9b4f47b1eb9c72548 /fs
parente3b2854faabd10438f5e7e34e078b099c3375577 (diff)
downloadop-kernel-dev-47c2199b6eb5fbe38ddb844db7cdbd914d304f9c.zip
op-kernel-dev-47c2199b6eb5fbe38ddb844db7cdbd914d304f9c.tar.gz
NFSv4.1: Ensure state manager thread dies on last umount
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
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index a6804f7..4dfb34b 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -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);
@@ -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"
OpenPOWER on IntegriCloud