[src/trunk]: src Cull unused vnode v_iflags: VI_LAYER, VI_LOCKSHARE.

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

details:   https://anonhg.NetBSD.org/src/rev/348997738a45
branches:  trunk
changeset: 337587:348997738a45
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 20 19:36:55 2015 +0000

description:
Cull unused vnode v_iflags: VI_LAYER, VI_LOCKSHARE.

diffstat:

 share/man/man9/vnode.9          |  8 +-------
 sys/fs/union/union_subr.c       |  7 ++-----
 sys/kern/vfs_vnode.c            |  9 ++-------
 sys/miscfs/genfs/layer_vfsops.c |  5 ++---
 sys/sys/vnode.h                 |  6 ++----
 usr.sbin/pstat/pstat.8          |  4 +---
 usr.sbin/pstat/pstat.c          |  5 ++---
 7 files changed, 12 insertions(+), 32 deletions(-)

diffs (191 lines):

diff -r ad07008c19f1 -r 348997738a45 share/man/man9/vnode.9
--- a/share/man/man9/vnode.9    Mon Apr 20 19:17:04 2015 +0000
+++ b/share/man/man9/vnode.9    Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: vnode.9,v 1.67 2015/04/20 15:39:38 riastradh Exp $
+.\"     $NetBSD: vnode.9,v 1.68 2015/04/20 19:36:55 riastradh Exp $
 .\"
 .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -244,12 +244,6 @@
 This vnode is on syncer work-list.
 .It Dv VI_MARKER
 A dummy marker vnode.
-.It Dv VI_LAYER
-This vnode is on a layered file system.
-.It Dv VI_LOCKSHARE
-This vnode shares its
-.Em v_interlock
-with other vnodes.
 .It Dv VI_CLEAN
 This vnode has been reclaimed and is no longer attached to a file system.
 .It Dv VU_DIROP
diff -r ad07008c19f1 -r 348997738a45 sys/fs/union/union_subr.c
--- a/sys/fs/union/union_subr.c Mon Apr 20 19:17:04 2015 +0000
+++ b/sys/fs/union/union_subr.c Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: union_subr.c,v 1.72 2015/04/20 13:44:16 riastradh Exp $        */
+/*     $NetBSD: union_subr.c,v 1.73 2015/04/20 19:36:55 riastradh Exp $        */
 
 /*
  * Copyright (c) 1994
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.72 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.73 2015/04/20 19:36:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -578,7 +578,6 @@
 
        mutex_obj_hold(svp->v_interlock);
        uvm_obj_setlock(&vp->v_uobj, svp->v_interlock);
-       vp->v_iflag |= VI_LOCKSHARE;
 
        /* detect the root vnode (and aliases) */
        if ((un->un_uppervp == um->um_uppervp) &&
@@ -589,8 +588,6 @@
                                vref(un->un_lowervp);
                }
                vp->v_vflag |= VV_ROOT;
-       } else {
-               vp->v_iflag |= VI_LAYER;
        }
 
        uppersz = lowersz = VNOVAL;
diff -r ad07008c19f1 -r 348997738a45 sys/kern/vfs_vnode.c
--- a/sys/kern/vfs_vnode.c      Mon Apr 20 19:17:04 2015 +0000
+++ b/sys/kern/vfs_vnode.c      Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnode.c,v 1.41 2015/04/20 13:44:16 riastradh Exp $ */
+/*     $NetBSD: vfs_vnode.c,v 1.42 2015/04/20 19:36:55 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.41 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.42 2015/04/20 19:36:55 riastradh Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -293,10 +293,6 @@
                mutex_exit(&vnode_free_list_lock);
        }
 
-       /*
-        * Note: the vnode interlock will either be freed, of reference
-        * dropped (if VI_LOCKSHARE was in use).
-        */
        uvm_obj_destroy(&vp->v_uobj, true);
        cv_destroy(&vp->v_cv);
        pool_cache_put(vnode_cache, vp);
@@ -424,7 +420,6 @@
                mutex_obj_hold(slock);
                uvm_obj_setlock(&vp->v_uobj, slock);
                KASSERT(vp->v_interlock == slock);
-               vp->v_iflag |= VI_LOCKSHARE;
        }
 
        /* Finally, move vnode into the mount queue. */
diff -r ad07008c19f1 -r 348997738a45 sys/miscfs/genfs/layer_vfsops.c
--- a/sys/miscfs/genfs/layer_vfsops.c   Mon Apr 20 19:17:04 2015 +0000
+++ b/sys/miscfs/genfs/layer_vfsops.c   Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: layer_vfsops.c,v 1.45 2014/11/09 18:08:07 maxv Exp $   */
+/*     $NetBSD: layer_vfsops.c,v 1.46 2015/04/20 19:36:55 riastradh Exp $      */
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.45 2014/11/09 18:08:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.46 2015/04/20 19:36:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -221,7 +221,6 @@
        /* Share the interlock with the lower node. */
        mutex_obj_hold(lowervp->v_interlock);
        uvm_obj_setlock(&vp->v_uobj, lowervp->v_interlock);
-       vp->v_iflag |= VI_LAYER | VI_LOCKSHARE;
 
        vp->v_tag = lmp->layerm_tag;
        vp->v_type = lowervp->v_type;
diff -r ad07008c19f1 -r 348997738a45 sys/sys/vnode.h
--- a/sys/sys/vnode.h   Mon Apr 20 19:17:04 2015 +0000
+++ b/sys/sys/vnode.h   Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnode.h,v 1.253 2015/04/20 13:49:02 riastradh Exp $    */
+/*     $NetBSD: vnode.h,v 1.254 2015/04/20 19:36:56 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -206,8 +206,6 @@
 #ifdef _VFS_VNODE_PRIVATE
 #define        VI_MARKER       0x00008000      /* Dummy marker vnode */
 #endif /* _VFS_VNODE_PRIVATE */
-#define        VI_LAYER        0x00020000      /* vnode is on a layer filesystem */
-#define        VI_LOCKSHARE    0x00040000      /* v_interlock is shared */
 #ifdef _VFS_VNODE_PRIVATE
 #define        VI_CLEAN        0x00080000      /* has been reclaimed */
 #define        VI_CHANGING     0x00100000      /* vnode changes state */
@@ -221,7 +219,7 @@
 #define        VNODE_FLAGBITS \
     "\20\1ROOT\2SYSTEM\3ISTTY\4MAPPED\5MPSAFE\6LOCKSWORK\11TEXT\12EXECMAP" \
     "\13WRMAP\14WRMAPDIRTY\15XLOCK\17ONWORKLST\20MARKER" \
-    "\22LAYER\24CLEAN\25CHANGING\31DIROP"
+    "\24CLEAN\25CHANGING\31DIROP"
 
 #define        VSIZENOTSET     ((voff_t)-1)
 
diff -r ad07008c19f1 -r 348997738a45 usr.sbin/pstat/pstat.8
--- a/usr.sbin/pstat/pstat.8    Mon Apr 20 19:17:04 2015 +0000
+++ b/usr.sbin/pstat/pstat.8    Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pstat.8,v 1.40 2014/03/24 13:42:41 hannken Exp $
+.\"    $NetBSD: pstat.8,v 1.41 2015/04/20 19:36:56 riastradh Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"    The Regents of the University of California.  All rights reserved.
@@ -272,8 +272,6 @@
 VEXECMAP vnode has PROT_EXEC mappings.
 .It D
 VDIROP lfs vnode involved in directory op.
-.It Y
-VLAYER vnode is on layer filesystem.
 .It O
 VONWORKLST vnode is on syncer work-list.
 .El
diff -r ad07008c19f1 -r 348997738a45 usr.sbin/pstat/pstat.c
--- a/usr.sbin/pstat/pstat.c    Mon Apr 20 19:17:04 2015 +0000
+++ b/usr.sbin/pstat/pstat.c    Mon Apr 20 19:36:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pstat.c,v 1.124 2014/05/26 20:07:25 dholland Exp $     */
+/*     $NetBSD: pstat.c,v 1.125 2015/04/20 19:36:56 riastradh Exp $    */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)pstat.c    8.16 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: pstat.c,v 1.124 2014/05/26 20:07:25 dholland Exp $");
+__RCSID("$NetBSD: pstat.c,v 1.125 2015/04/20 19:36:56 riastradh Exp $");
 #endif
 #endif /* not lint */
 
@@ -388,7 +388,6 @@
        { VV_ISTTY,     'I' },
        { VI_EXECMAP,   'E' },
        { VU_DIROP,     'D' },
-       { VI_LAYER,     'Y' },
        { VI_ONWORKLST, 'O' },
        { 0,            '\0' },
 };