--- fs/nfs/nfs4state.c

+++ fs/nfs/nfs4state.c

@@ -1228,7 +1228,7 @@ static void nfs4_state_manager(struct nf

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);

@@ -1304,7 +1304,7 @@ static void nfs4_state_manager(struct nf

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"