Module Name: src
Committed By: riastradh
Date: Mon Apr 20 19:36:56 UTC 2015
Modified Files:
src/share/man/man9: vnode.9
src/sys/fs/union: union_subr.c
src/sys/kern: vfs_vnode.c
src/sys/miscfs/genfs: layer_vfsops.c
src/sys/sys: vnode.h
src/usr.sbin/pstat: pstat.8 pstat.c
Log Message:
Cull unused vnode v_iflags: VI_LAYER, VI_LOCKSHARE.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/share/man/man9/vnode.9
cvs rdiff -u -r1.72 -r1.73 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.45 -r1.46 src/sys/miscfs/genfs/layer_vfsops.c
cvs rdiff -u -r1.253 -r1.254 src/sys/sys/vnode.h
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/pstat/pstat.8
cvs rdiff -u -r1.124 -r1.125 src/usr.sbin/pstat/pstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/vnode.9
diff -u src/share/man/man9/vnode.9:1.67 src/share/man/man9/vnode.9:1.68
--- src/share/man/man9/vnode.9:1.67 Mon Apr 20 15:39:38 2015
+++ src/share/man/man9/vnode.9 Mon Apr 20 19:36:55 2015
@@ -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 currently locked to change
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
Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.72 src/sys/fs/union/union_subr.c:1.73
--- src/sys/fs/union/union_subr.c:1.72 Mon Apr 20 13:44:16 2015
+++ src/sys/fs/union/union_subr.c Mon Apr 20 19:36:55 2015
@@ -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 @@ union_loadvnode(struct mount *mp, struct
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 @@ union_loadvnode(struct mount *mp, struct
vref(un->un_lowervp);
}
vp->v_vflag |= VV_ROOT;
- } else {
- vp->v_iflag |= VI_LAYER;
}
uppersz = lowersz = VNOVAL;
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.41 src/sys/kern/vfs_vnode.c:1.42
--- src/sys/kern/vfs_vnode.c:1.41 Mon Apr 20 13:44:16 2015
+++ src/sys/kern/vfs_vnode.c Mon Apr 20 19:36:55 2015
@@ -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 @@ vnfree(vnode_t *vp)
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 @@ getnewvnode(enum vtagtype tag, struct mo
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. */
Index: src/sys/miscfs/genfs/layer_vfsops.c
diff -u src/sys/miscfs/genfs/layer_vfsops.c:1.45 src/sys/miscfs/genfs/layer_vfsops.c:1.46
--- src/sys/miscfs/genfs/layer_vfsops.c:1.45 Sun Nov 9 18:08:07 2014
+++ src/sys/miscfs/genfs/layer_vfsops.c Mon Apr 20 19:36:55 2015
@@ -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 @@ layerfs_loadvnode(struct mount *mp, stru
/* 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;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.253 src/sys/sys/vnode.h:1.254
--- src/sys/sys/vnode.h:1.253 Mon Apr 20 13:49:02 2015
+++ src/sys/sys/vnode.h Mon Apr 20 19:36:56 2015
@@ -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 @@ typedef struct vnode vnode_t;
#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 @@ typedef struct vnode vnode_t;
#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)
Index: src/usr.sbin/pstat/pstat.8
diff -u src/usr.sbin/pstat/pstat.8:1.40 src/usr.sbin/pstat/pstat.8:1.41
--- src/usr.sbin/pstat/pstat.8:1.40 Mon Mar 24 13:42:41 2014
+++ src/usr.sbin/pstat/pstat.8 Mon Apr 20 19:36:56 2015
@@ -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 @@ VISTTY vnode is a tty.
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
Index: src/usr.sbin/pstat/pstat.c
diff -u src/usr.sbin/pstat/pstat.c:1.124 src/usr.sbin/pstat/pstat.c:1.125
--- src/usr.sbin/pstat/pstat.c:1.124 Mon May 26 20:07:25 2014
+++ src/usr.sbin/pstat/pstat.c Mon Apr 20 19:36:56 2015
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#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 @@ const struct flagbit_desc vnode_flags[]
{ VV_ISTTY, 'I' },
{ VI_EXECMAP, 'E' },
{ VU_DIROP, 'D' },
- { VI_LAYER, 'Y' },
{ VI_ONWORKLST, 'O' },
{ 0, '\0' },
};
