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

Commit 01a87d91 authored by Benny Halevy's avatar Benny Halevy Committed by J. Bruce Fields
Browse files

nfsd: no need to unhash_stid before free 



idr_remove is about to be called before kmem_cache_free so unhashing it
is redundant

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

fs/nfsd/nfs4state.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -672,7 +672,6 @@ static void unhash_open_stateid(struct nfs4_ol_stateid *stp) 
static void release_open_stateid(struct nfs4_ol_stateid *stp)

static void release_open_stateid(struct nfs4_ol_stateid *stp)

{

{

	unhash_open_stateid(stp);

	unhash_open_stateid(stp);

	unhash_stid(&stp->st_stid);

	free_generic_stateid(stp);

	free_generic_stateid(stp);

}

}
@@ -694,7 +693,6 @@ static void release_last_closed_stateid(struct nfs4_openowner *oo) 
	struct nfs4_ol_stateid *s = oo->oo_last_closed_stid;

	struct nfs4_ol_stateid *s = oo->oo_last_closed_stid;





	if (s) {

	if (s) {

		unhash_stid(&s->st_stid);

		free_generic_stateid(s);

		free_generic_stateid(s);

		oo->oo_last_closed_stid = NULL;

		oo->oo_last_closed_stid = NULL;

	}

	}
@@ -3998,10 +3996,9 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 




	nfsd4_close_open_stateid(stp);

	nfsd4_close_open_stateid(stp);





	if (cstate->minorversion) {

	if (cstate->minorversion)

		unhash_stid(&stp->st_stid);

		free_generic_stateid(stp);

		free_generic_stateid(stp);

	} else

	else

		oo->oo_last_closed_stid = stp;

		oo->oo_last_closed_stid = stp;





	if (list_empty(&oo->oo_owner.so_stateids)) {

	if (list_empty(&oo->oo_owner.so_stateids)) {