Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c76491 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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



Fix up a potential race...

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e005e804

fs/nfs/nfs4state.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -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,6 +1161,10 @@ static void nfs4_state_manager(struct nfs_client *clp) 
		}

		}





		nfs4_clear_state_manager_bit(clp);

		nfs4_clear_state_manager_bit(clp);

		/* 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;

			break;

	}

	}

	return;

	return;