Module Name: src
Committed By: hannken
Date: Mon Sep 30 15:24:14 UTC 2013
Modified Files:
src/sys/kern: vfs_vnode.c
src/sys/sys: vnode.h
Log Message:
Remove VI_INACTPEND. Last consumer was vcount() which got removed 2010-01-08.
Reviewed by: David Holland <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.237 -r1.238 src/sys/sys/vnode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.20 src/sys/kern/vfs_vnode.c:1.21
--- src/sys/kern/vfs_vnode.c:1.20 Sat Sep 21 19:51:33 2013
+++ src/sys/kern/vfs_vnode.c Mon Sep 30 15:24:14 2013
@@ -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 @@ retry:
* 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 @@ vrele_thread(void *cookie)
* 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);
}
}
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.237 src/sys/sys/vnode.h:1.238
--- src/sys/sys/vnode.h:1.237 Sun Nov 18 18:39:24 2012
+++ src/sys/sys/vnode.h Mon Sep 30 15:24:14 2013
@@ -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 @@ TAILQ_HEAD(vnodelst, vnode);
* 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 @@ typedef struct vnode vnode_t;
#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 @@ typedef struct vnode vnode_t;
#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)
