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

Commit 7cab89b2 authored by Ricardo Labiaga's avatar Ricardo Labiaga Committed by Trond Myklebust
Browse files

nfs41: Invoke RECLAIM_COMPLETE on all new client ids 



The NFSv4.1 spec indicates RECLAIM_COMPLETE is to be issued
whenever a client establishes a new client id, not only after
detecting the server has rebooted.

Set the NFS4CLNT_RECLAIM_REBOOT bit after every new client id has
been established.  This enables us to issue RECLAIM_COMPLETE
during the wrap up of the NFS4CLNT_RECLAIM_REBOOT state.

Signed-off-by: default avatarRicardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 88069f77

fs/nfs/nfs4state.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1095,12 +1095,12 @@ static void nfs4_state_end_reclaim_reboot(struct nfs_client *clp) 
	struct rb_node *pos;

	struct rb_node *pos;

	struct nfs4_state *state;

	struct nfs4_state *state;





	nfs4_reclaim_complete(clp,

		nfs4_reboot_recovery_ops[clp->cl_minorversion]);



	if (!test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))

	if (!test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))

		return;

		return;





	nfs4_reclaim_complete(clp,

		nfs4_reboot_recovery_ops[clp->cl_minorversion]);



	for (pos = rb_first(&clp->cl_state_owners); pos != NULL; pos = rb_next(pos)) {

	for (pos = rb_first(&clp->cl_state_owners); pos != NULL; pos = rb_next(pos)) {

		sp = rb_entry(pos, struct nfs4_state_owner, so_client_node);

		sp = rb_entry(pos, struct nfs4_state_owner, so_client_node);

		spin_lock(&sp->so_lock);

		spin_lock(&sp->so_lock);
@@ -1335,6 +1335,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
				goto out_error;

				goto out_error;

			}

			}

			clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);

			clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);

			set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state);

		}

		}





		if (test_and_clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state)) {

		if (test_and_clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state)) {