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

Commit 4dfd4f7a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired 

NFSv4.0 does not have TEST_STATEID/FREE_STATEID functionality, so
unlike NFSv4.1, the recovery procedure when stateids have expired or
have been revoked requires us to just forget the delegation.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent e983120e

fs/nfs/nfs4proc.c

+23 −1
Original line number Diff line number Diff line
@@ -2109,6 +2109,28 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta 
	return ret;

}



static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state)

{

	nfs_remove_bad_delegation(state->inode);

	write_seqlock(&state->seqlock);

	nfs4_stateid_copy(&state->stateid, &state->open_stateid);

	write_sequnlock(&state->seqlock);

	clear_bit(NFS_DELEGATED_STATE, &state->flags);

}



static void nfs40_clear_delegation_stateid(struct nfs4_state *state)

{

	if (rcu_access_pointer(NFS_I(state->inode)->delegation) != NULL)

		nfs_finish_clear_delegation_stateid(state);

}



static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state)

{

	/* NFSv4.0 doesn't allow for delegation recovery on open expire */

	nfs40_clear_delegation_stateid(state);

	return nfs4_open_expired(sp, state);

}



#if defined(CONFIG_NFS_V4_1)

static void nfs41_clear_delegation_stateid(struct nfs4_state *state)

{
@@ -8330,7 +8352,7 @@ static const struct nfs4_state_recovery_ops nfs41_reboot_recovery_ops = { 
static const struct nfs4_state_recovery_ops nfs40_nograce_recovery_ops = {

	.owner_flag_bit = NFS_OWNER_RECLAIM_NOGRACE,

	.state_flag_bit	= NFS_STATE_RECLAIM_NOGRACE,

	.recover_open	= nfs4_open_expired,

	.recover_open	= nfs40_open_expired,

	.recover_lock	= nfs4_lock_expired,

	.establish_clid = nfs4_init_clientid,

};