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

Commit b78800ba authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Revert "nfsd: remove_stid can be incorporated into nfs4_put_delegation" 



This reverts commit 7ebe40f2.  We forgot
the nfs4_put_delegation call in fs/nfsd/nfs4callback.c which should not
be unhashing the stateid.  This lead to warnings from the idr code when
we tried to removed id's twice.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 3378b7f4

fs/nfsd/nfs4state.c

+3 −1
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ static void nfs4_free_stid(struct kmem_cache *slab, struct nfs4_stid *s) 
void

nfs4_put_delegation(struct nfs4_delegation *dp)

{

	remove_stid(&dp->dl_stid);

	if (atomic_dec_and_test(&dp->dl_count)) {

		nfs4_free_stid(deleg_slab, &dp->dl_stid);

		num_delegations--;
@@ -451,12 +450,14 @@ unhash_delegation(struct nfs4_delegation *dp) 
static void destroy_revoked_delegation(struct nfs4_delegation *dp)

{

	list_del_init(&dp->dl_recall_lru);

	remove_stid(&dp->dl_stid);

	nfs4_put_delegation(dp);

}



static void destroy_delegation(struct nfs4_delegation *dp)

{

	unhash_delegation(dp);

	remove_stid(&dp->dl_stid);

	nfs4_put_delegation(dp);

}
@@ -3161,6 +3162,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, 
	open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;

	return;

out_free:

	remove_stid(&dp->dl_stid);

	nfs4_put_delegation(dp);

out_no_deleg:

	open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE;