Commit 333ac786 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix delegation handling in update_open_stateid() 



If the delegation is marked as being revoked, then don't use it in
the open state structure.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent e6237b6f

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ static int update_open_stateid(struct nfs4_state *state, 
		ret = 1;

	}



	deleg_cur = rcu_dereference(nfsi->delegation);

	deleg_cur = nfs4_get_valid_delegation(state->inode);

	if (deleg_cur == NULL)

		goto no_delegation;
@@ -1749,7 +1749,7 @@ static int update_open_stateid(struct nfs4_state *state, 


	if (delegation == NULL)

		delegation = &deleg_cur->stateid;

	else if (!nfs4_stateid_match(&deleg_cur->stateid, delegation))

	else if (!nfs4_stateid_match_other(&deleg_cur->stateid, delegation))

		goto no_delegation_unlock;



	nfs_mark_delegation_referenced(deleg_cur);