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

Commit 41f54a55 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset 



Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bae0ac0e

fs/nfs/nfs4state.c

+8 −8
Original line number Diff line number Diff line
@@ -1291,17 +1291,17 @@ static int nfs4_reset_session(struct nfs_client *clp) 


	memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);

	status = nfs4_proc_create_session(clp);

	if (status)

	if (status) {

		status = nfs4_recovery_handle_error(clp, status);

		goto out;

	}

	/* create_session negotiated new slot table */

	clear_bit(NFS4CLNT_RECALL_SLOT, &clp->cl_state);



out:

	/*

	 * Let the state manager reestablish state

	 */

	if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&

	    status == 0)

	 /* Let the state manager reestablish state */

	if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))

		nfs41_setup_state_renewal(clp);



out:

	return status;

}