mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-22 22:33:59 +00:00
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
This commit is contained in:
parent
e3b2854faa
commit
47c2199b6e
1 changed files with 2 additions and 2 deletions
|
@ -1607,7 +1607,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 */
|
||||||
for(;;) {
|
do {
|
||||||
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);
|
||||||
|
@ -1691,7 +1691,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
break;
|
break;
|
||||||
if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
|
if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
|
||||||
break;
|
break;
|
||||||
}
|
} while (atomic_read(&clp->cl_count) > 1);
|
||||||
return;
|
return;
|
||||||
out_error:
|
out_error:
|
||||||
printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
|
printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
|
||||||
|
|
Loading…
Add table
Reference in a new issue