From 12e483e5f76be27014ce3dd86e41b1d4e14ed4ff Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Sat, 7 Dec 2019 12:56:24 +0000 Subject: [PATCH] vfs: clean up delmntque similarly to vdrop r355414 --- sys/kern/vfs_subr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 76804826c964..dedbff6bbecd 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1670,7 +1670,6 @@ static void delmntque(struct vnode *vp) { struct mount *mp; - int active; mp = vp->v_mount; if (mp == NULL) @@ -1680,9 +1679,8 @@ delmntque(struct vnode *vp) KASSERT(mp->mnt_activevnodelistsize <= mp->mnt_nvnodelistsize, ("Active vnode list size %d > Vnode list size %d", mp->mnt_activevnodelistsize, mp->mnt_nvnodelistsize)); - active = vp->v_iflag & VI_ACTIVE; - vp->v_iflag &= ~VI_ACTIVE; - if (active) { + if (vp->v_iflag & VI_ACTIVE) { + vp->v_iflag &= ~VI_ACTIVE; mtx_lock(&mp->mnt_listmtx); TAILQ_REMOVE(&mp->mnt_activevnodelist, vp, v_actfreelist); mp->mnt_activevnodelistsize--;