d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache: stop null checking in cache_free

Browse Source
This commit is contained in:
Mateusz Guzik 2020-08-26 12:53:16 +00:00
parent 66fa11c898
commit 075f58f231
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/vfs_cache.c
View File

@ -388,8 +388,7 @@ cache_free(struct namecache *ncp)
{ {
struct namecache_ts *ncp_ts; struct namecache_ts *ncp_ts;
if (ncp == NULL) MPASS(ncp != NULL);
return;
if ((ncp->nc_flag & NCF_DVDROP) != 0) if ((ncp->nc_flag & NCF_DVDROP) != 0)
vdrop(ncp->nc_dvp); vdrop(ncp->nc_dvp);
if (__predict_false(ncp->nc_flag & NCF_TS)) { if (__predict_false(ncp->nc_flag & NCF_TS)) {
@ -980,7 +979,8 @@ cache_negative_zap_one(void)
} }
mtx_unlock(blp); mtx_unlock(blp);
mtx_unlock(dvlp); mtx_unlock(dvlp);
cache_free(ncp); if (ncp != NULL)
cache_free(ncp);
} }
/* /*
@ -1962,7 +1962,8 @@ cache_enter_dotdot_prep(struct vnode *dvp, struct vnode *vp,
dvp->v_cache_dd = NULL; dvp->v_cache_dd = NULL;
vn_seqc_write_end(dvp); vn_seqc_write_end(dvp);
cache_enter_unlock(&cel); cache_enter_unlock(&cel);
cache_free(ncp); if (ncp != NULL)
cache_free(ncp);
} }
/* /*
@ -2158,7 +2159,8 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp,
cache_enter_unlock(&cel); cache_enter_unlock(&cel);
if (numneg * ncnegfactor > lnumcache) if (numneg * ncnegfactor > lnumcache)
cache_negative_zap_one(); cache_negative_zap_one();
cache_free(ndd); if (ndd != NULL)
cache_free(ndd);
return; return;
out_unlock_free: out_unlock_free:
cache_enter_unlock(&cel); cache_enter_unlock(&cel);