Commit 8ca017c8 authored by Scott Mayhew's avatar Scott Mayhew Committed by Anna Schumaker
Browse files

NFSv4: don't mark all open state for recovery when handling recallable state revoked flag 



Only delegations and layouts can be recalled, so it shouldn't be
necessary to recover all opens when handling the status bit
SEQ4_STATUS_RECALLABLE_STATE_REVOKED.  We'll still wind up calling
nfs41_open_expired() when a TEST_STATEID returns NFS4ERR_DELEG_REVOKED.

Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
Reviewed-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent fe31ce83

fs/nfs/delegation.c

+12 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,18 @@ void nfs_mark_test_expired_all_delegations(struct nfs_client *clp) 
	rcu_read_unlock();

}



/**

 * nfs_test_expired_all_delegations - test all delegations for a client

 * @clp: nfs_client to process

 *

 * Helper for handling "recallable state revoked" status from server.

 */

void nfs_test_expired_all_delegations(struct nfs_client *clp)

{

	nfs_mark_test_expired_all_delegations(clp);

	nfs4_schedule_state_manager(clp);

}



/**

 * nfs_reap_expired_delegations - reap expired delegations

 * @clp: nfs_client to process

fs/nfs/delegation.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ void nfs_delegation_mark_reclaim(struct nfs_client *clp); 
void nfs_delegation_reap_unclaimed(struct nfs_client *clp);



void nfs_mark_test_expired_all_delegations(struct nfs_client *clp);

void nfs_test_expired_all_delegations(struct nfs_client *clp);

void nfs_reap_expired_delegations(struct nfs_client *clp);



/* NFSv4 delegation-related procedures */

fs/nfs/nfs4state.c

+1 −2
Original line number Diff line number Diff line
@@ -2350,8 +2350,7 @@ static void nfs41_handle_recallable_state_revoked(struct nfs_client *clp) 
{

	/* FIXME: For now, we destroy all layouts. */

	pnfs_destroy_all_layouts(clp);

	/* FIXME: For now, we test all delegations+open state+locks. */

	nfs41_handle_some_state_revoked(clp);

	nfs_test_expired_all_delegations(clp);

	dprintk("%s: Recallable state revoked on server %s!\n", __func__,

			clp->cl_hostname);

}