[src/trunk]: src/sys Remove VI_INACTPEND. Last consumer was vcount() which go...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65b5bc0cad48
branches:  trunk
changeset: 790269:65b5bc0cad48
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Sep 30 15:24:14 2013 +0000

description:
Remove VI_INACTPEND. Last consumer was vcount() which got removed 2010-01-08.

Reviewed by: David Holland <dholland%netbsd.org@localhost>

diffstat:

 sys/kern/vfs_vnode.c |  8 ++------
 sys/sys/vnode.h      |  7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r a99af7964e3b -r 65b5bc0cad48 sys/kern/vfs_vnode.c
--- a/sys/kern/vfs_vnode.c      Mon Sep 30 13:38:16 2013 +0000
+++ b/sys/kern/vfs_vnode.c      Mon Sep 30 15:24:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnode.c,v 1.20 2013/09/21 19:51:33 dholland Exp $  */
+/*     $NetBSD: vfs_vnode.c,v 1.21 2013/09/30 15:24:14 hannken Exp $   */
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -126,7 +126,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.20 2013/09/21 19:51:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.21 2013/09/30 15:24:14 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -744,9 +744,7 @@
                         * clean it here.  We donate it our last reference.
                         */
                        KASSERT(mutex_owned(vp->v_interlock));
-                       KASSERT((vp->v_iflag & VI_INACTPEND) == 0);
                        vp->v_iflag &= ~VI_INACTNOW;
-                       vp->v_iflag |= VI_INACTPEND;
                        mutex_enter(&vrele_lock);
                        TAILQ_INSERT_TAIL(&vrele_list, vp, v_freelist);
                        if (++vrele_pending > (desiredvnodes >> 8))
@@ -894,8 +892,6 @@
                 * and look for more work.
                 */
                mutex_enter(vp->v_interlock);
-               KASSERT((vp->v_iflag & VI_INACTPEND) != 0);
-               vp->v_iflag &= ~VI_INACTPEND;
                vrelel(vp, 0);
        }
 }
diff -r a99af7964e3b -r 65b5bc0cad48 sys/sys/vnode.h
--- a/sys/sys/vnode.h   Mon Sep 30 13:38:16 2013 +0000
+++ b/sys/sys/vnode.h   Mon Sep 30 15:24:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnode.h,v 1.237 2012/11/18 18:39:24 pooka Exp $        */
+/*     $NetBSD: vnode.h,v 1.238 2013/09/30 15:24:14 hannken Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -122,7 +122,7 @@
  * lock.  Field markings and the corresponding locks:
  *
  *     :       stable, reference to the vnode is required
- *     f       vnode_free_list_lock, or vrele_lock if VI_INACTPEND
+ *     f       vnode_free_list_lock, or vrele_lock for vrele_list
  *     i       v_interlock
  *     m       mntvnode_lock
  *     n       namecache_lock
@@ -205,7 +205,6 @@
 #define        VI_LAYER        0x00020000      /* vnode is on a layer filesystem */
 #define        VI_LOCKSHARE    0x00040000      /* v_interlock is shared */
 #define        VI_CLEAN        0x00080000      /* has been reclaimed */
-#define        VI_INACTPEND    0x00100000      /* inactivation is pending */
 #define        VI_INACTREDO    0x00200000      /* need to redo VOP_INACTIVE() */
 #define        VI_INACTNOW     0x00800000      /* VOP_INACTIVE() in progress */
 
@@ -217,7 +216,7 @@
 #define        VNODE_FLAGBITS \
     "\20\1ROOT\2SYSTEM\3ISTTY\4MAPPED\5MPSAFE\6LOCKSWORK\11TEXT\12EXECMAP" \
     "\13WRMAP\14WRMAPDIRTY\15XLOCK\17ONWORKLST\20MARKER" \
-    "\22LAYER\24CLEAN\25INACTPEND\26INACTREDO" \
+    "\22LAYER\24CLEAN\26INACTREDO" \
     "\30INACTNOW\31DIROP"
 
 #define        VSIZENOTSET     ((voff_t)-1)