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

Commit 3fb87d13 authored by Benny Halevy's avatar Benny Halevy Committed by J. Bruce Fields
Browse files

nfsd4: hash deleg stateid only on successful nfs4_set_delegation 



We don't want the stateid to be found in the hash table before the delegation
is granted.

Currently this is protected by the client_mutex, but we want to break that
up and this is a necessary step toward that goal.

Signed-off-by: default avatarBenny Halevy <bhalevy@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent cdc97505

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv 
	dp = delegstateid(nfs4_alloc_stid(clp, deleg_slab));

	if (dp == NULL)

		return dp;

	dp->dl_stid.sc_type = NFS4_DELEG_STID;

	/*

	 * delegation seqid's are never incremented.  The 4.1 special

	 * meaning of seqid 0 isn't meaningful, really, but let's avoid
@@ -438,6 +437,7 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) 
{

	lockdep_assert_held(&state_lock);



	dp->dl_stid.sc_type = NFS4_DELEG_STID;

	list_add(&dp->dl_perfile, &fp->fi_delegations);

	list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations);

}