svn commit: r355484 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Sat Dec  7 12:56:24 2019
New Revision: 355484
URL: https://svnweb.freebsd.org/changeset/base/355484

Log:
  vfs: clean up delmntque similarly to vdrop r355414

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Sat Dec  7 12:55:58 2019	(r355483)
+++ head/sys/kern/vfs_subr.c	Sat Dec  7 12:56:24 2019	(r355484)
@@ -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--;