evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: no need to unhash_stid before free

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

Signed-off-by: Benny Halevy <bhalevy@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Benny Halevy 2013-10-14 09:01:55 +03:00 • committed by J. Bruce Fields
parent 7ebe40f203
commit 01a87d91fc
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/nfsd/nfs4state.c
View file

@ -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)) {