Module Name: src
Committed By: hannken
Date: Sat Aug 20 12:37:10 UTC 2016
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c
src/share/man/man9: Makefile vnode.9
src/sys/coda: coda_vnops.c
src/sys/fs/adosfs: advnops.c
src/sys/fs/cd9660: cd9660_node.c
src/sys/fs/efs: efs_vnops.c
src/sys/fs/filecorefs: filecore_node.c
src/sys/fs/hfs: hfs_vnops.c
src/sys/fs/msdosfs: msdosfs_denode.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/ntfs: ntfs_vnops.c
src/sys/fs/ptyfs: ptyfs_vnops.c
src/sys/fs/puffs: puffs_node.c
src/sys/fs/smbfs: smbfs_node.c
src/sys/fs/sysvbfs: sysvbfs_vnops.c
src/sys/fs/tmpfs: tmpfs_vnops.c
src/sys/fs/udf: udf_vnops.c
src/sys/fs/union: union_subr.c
src/sys/fs/v7fs: v7fs_vnops.c
src/sys/kern: vfs_vnode.c
src/sys/miscfs/fdesc: fdesc_vnops.c
src/sys/miscfs/genfs: layer_vnops.c
src/sys/miscfs/kernfs: kernfs_vnops.c
src/sys/miscfs/procfs: procfs_vnops.c
src/sys/miscfs/specfs: spec_vnops.c
src/sys/nfs: nfs_node.c
src/sys/rump/librump/rumpvfs: rumpfs.c
src/sys/sys: param.h vnode.h
src/sys/ufs/chfs: chfs_vnops.c
src/sys/ufs/lfs: ulfs_inode.c
src/sys/ufs/ufs: ufs_inode.c
Log Message:
Remove now obsolete operation vcache_remove().
Welcome to 7.99.36
To generate a diff of this commit:
cvs rdiff -u -r1.2057 -r1.2058 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
cvs rdiff -u -r1.396 -r1.397 src/share/man/man9/Makefile
cvs rdiff -u -r1.70 -r1.71 src/share/man/man9/vnode.9
cvs rdiff -u -r1.102 -r1.103 src/sys/coda/coda_vnops.c
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.34 -r1.35 src/sys/fs/cd9660/cd9660_node.c
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/efs/efs_vnops.c
cvs rdiff -u -r1.27 -r1.28 src/sys/fs/filecorefs/filecore_node.c
cvs rdiff -u -r1.32 -r1.33 src/sys/fs/hfs/hfs_vnops.c
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.32 -r1.33 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/ntfs/ntfs_vnops.c
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/ptyfs/ptyfs_vnops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/puffs/puffs_node.c
cvs rdiff -u -r1.53 -r1.54 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.127 -r1.128 src/sys/fs/tmpfs/tmpfs_vnops.c
cvs rdiff -u -r1.101 -r1.102 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.73 -r1.74 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/fs/v7fs/v7fs_vnops.c
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.126 -r1.127 src/sys/miscfs/fdesc/fdesc_vnops.c
cvs rdiff -u -r1.58 -r1.59 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.155 -r1.156 src/sys/miscfs/kernfs/kernfs_vnops.c
cvs rdiff -u -r1.193 -r1.194 src/sys/miscfs/procfs/procfs_vnops.c
cvs rdiff -u -r1.162 -r1.163 src/sys/miscfs/specfs/spec_vnops.c
cvs rdiff -u -r1.118 -r1.119 src/sys/nfs/nfs_node.c
cvs rdiff -u -r1.141 -r1.142 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.501 -r1.502 src/sys/sys/param.h
cvs rdiff -u -r1.263 -r1.264 src/sys/sys/vnode.h
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.95 -r1.96 src/sys/ufs/ufs/ufs_inode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2057 src/distrib/sets/lists/comp/mi:1.2058
--- src/distrib/sets/lists/comp/mi:1.2057 Sat Aug 20 11:34:49 2016
+++ src/distrib/sets/lists/comp/mi Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2057 2016/08/20 11:34:49 christos Exp $
+# $NetBSD: mi,v 1.2058 2016/08/20 12:37:06 hannken Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -11111,7 +11111,7 @@
./usr/share/man/cat9/vcache_new.0 comp-sys-catman .cat
./usr/share/man/cat9/vcache_rekey_enter.0 comp-sys-catman .cat
./usr/share/man/cat9/vcache_rekey_exit.0 comp-sys-catman .cat
-./usr/share/man/cat9/vcache_remove.0 comp-sys-catman .cat
+./usr/share/man/cat9/vcache_remove.0 comp-sys-catman obsolete
./usr/share/man/cat9/vcons.0 comp-sys-catman .cat
./usr/share/man/cat9/vcount.0 comp-obsolete obsolete
./usr/share/man/cat9/vdead_check.0 comp-sys-catman .cat
@@ -18226,7 +18226,7 @@
./usr/share/man/html9/vcache_new.html comp-sys-htmlman html
./usr/share/man/html9/vcache_rekey_enter.html comp-sys-htmlman html
./usr/share/man/html9/vcache_rekey_exit.html comp-sys-htmlman html
-./usr/share/man/html9/vcache_remove.html comp-sys-htmlman html
+./usr/share/man/html9/vcache_remove.html comp-sys-htmlman obsolete
./usr/share/man/html9/vcons.html comp-sys-htmlman html
./usr/share/man/html9/vcount.html comp-obsolete obsolete
./usr/share/man/html9/vdead_check.html comp-sys-htmlman html
@@ -25575,7 +25575,7 @@
./usr/share/man/man9/vcache_new.9 comp-sys-man .man
./usr/share/man/man9/vcache_rekey_enter.9 comp-sys-man .man
./usr/share/man/man9/vcache_rekey_exit.9 comp-sys-man .man
-./usr/share/man/man9/vcache_remove.9 comp-sys-man .man
+./usr/share/man/man9/vcache_remove.9 comp-sys-man obsolete
./usr/share/man/man9/vcons.9 comp-sys-man .man
./usr/share/man/man9/vcount.9 comp-obsolete obsolete
./usr/share/man/man9/vdead_check.9 comp-sys-man .man
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.19
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.18 Fri Dec 5 09:13:32 2014
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Sat Aug 20 12:37:06 2016
@@ -1057,7 +1057,6 @@ zfs_znode_free(znode_t *zp)
mutex_enter(&zp->z_lock);
vp = ZTOV(zp);
if (vp != NULL) {
- vcache_remove(vp->v_mount, &zp->z_id, sizeof(zp->z_id));
genfs_node_destroy(vp);
/*
* To interlock with zfs_sync().
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.396 src/share/man/man9/Makefile:1.397
--- src/share/man/man9/Makefile:1.396 Tue Jul 12 03:39:55 2016
+++ src/share/man/man9/Makefile Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.396 2016/07/12 03:39:55 knakahara Exp $
+# $NetBSD: Makefile,v 1.397 2016/08/20 12:37:06 hannken Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -957,7 +957,6 @@ MLINKS+=vnode.9 vref.9 \
vnode.9 vcache_new.9 \
vnode.9 vcache_rekey_enter.9 \
vnode.9 vcache_rekey_exit.9 \
- vnode.9 vcache_remove.9 \
vnode.9 vrecycle.9 \
vnode.9 vgone.9 \
vnode.9 vgonel.9 \
Index: src/share/man/man9/vnode.9
diff -u src/share/man/man9/vnode.9:1.70 src/share/man/man9/vnode.9:1.71
--- src/share/man/man9/vnode.9:1.70 Fri Jul 17 06:45:55 2015
+++ src/share/man/man9/vnode.9 Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: vnode.9,v 1.70 2015/07/17 06:45:55 wiz Exp $
+.\" $NetBSD: vnode.9,v 1.71 2016/08/20 12:37:06 hannken Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -43,7 +43,6 @@
.Nm vcache_new ,
.Nm vcache_rekey_enter ,
.Nm vcache_rekey_exit ,
-.Nm vcache_remove ,
.Nm vrecycle ,
.Nm vgone ,
.Nm vgonel ,
@@ -85,8 +84,6 @@
.Fn vcache_rekey_enter "struct mount *mp" "struct vnode *vp" "const void *old_key" "size_t old_key_len" "const void *new_key" "size_t new_key_len"
.Ft void
.Fn vcache_rekey_exit "struct mount *mp" "struct vnode *vp" "const void *old_key" "size_t old_key_len" "const void *new_key" "size_t new_key_len"
-.Ft void
-.Fn vcache_remove "struct mount *mp" "const void *key" "size_t key_len"
.Ft int
.Fn vrecycle "struct vnode *vp"
.Ft void
@@ -709,19 +706,6 @@ is returned, otherwise zero is returned.
.It Fn vcache_rekey_exit "mp" "vp" "old_key" "old_key_len" "new_key" "new_key_len"
Finish rename after calling
.Fn vcache_rekey_enter .
-.It Fn vcache_remove "mp" "key" "key_len"
-Remove a vnode from the cache.
-Must be called when a file system reclaims a vnode.
-.Pp
-The argument
-.Fa mp
-is the mount point for the file system this file resides in.
-.Pp
-The arguments
-.Fa key
-and
-.Fa key_len
-uniquely identify the file in the file system.
.It Fn vrecycle "vp"
Recycle the referenced vnode
.Fa vp
Index: src/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.102 src/sys/coda/coda_vnops.c:1.103
--- src/sys/coda/coda_vnops.c:1.102 Mon Apr 20 23:03:07 2015
+++ src/sys/coda/coda_vnops.c Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.102 2015/04/20 23:03:07 riastradh Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.103 2016/08/20 12:37:06 hannken Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.102 2015/04/20 23:03:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.103 2016/08/20 12:37:06 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1673,9 +1673,6 @@ coda_reclaim(void *v)
cp->c_symlen = 0;
}
- /* Remove it from the table so it can't be found. */
- vcache_remove(vp->v_mount, &cp->c_fid, sizeof(CodaFid));
-
mutex_enter(vp->v_interlock);
mutex_enter(&cp->c_lock);
SET_VTOC(vp) = NULL;
Index: src/sys/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.47 src/sys/fs/adosfs/advnops.c:1.48
--- src/sys/fs/adosfs/advnops.c:1.47 Mon Apr 20 23:03:07 2015
+++ src/sys/fs/adosfs/advnops.c Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.47 2015/04/20 23:03:07 riastradh Exp $ */
+/* $NetBSD: advnops.c,v 1.48 2016/08/20 12:37:06 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.47 2015/04/20 23:03:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.48 2016/08/20 12:37:06 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -879,7 +879,6 @@ adosfs_reclaim(void *v)
#endif
vp = sp->a_vp;
ap = VTOA(vp);
- vcache_remove(vp->v_mount, &ap->block, sizeof(ap->block));
if (vp->v_type == VDIR && ap->tab)
free(ap->tab, M_ANODE);
else if (vp->v_type == VLNK && ap->slinkto)
Index: src/sys/fs/cd9660/cd9660_node.c
diff -u src/sys/fs/cd9660/cd9660_node.c:1.34 src/sys/fs/cd9660/cd9660_node.c:1.35
--- src/sys/fs/cd9660/cd9660_node.c:1.34 Mon Nov 10 18:46:33 2014
+++ src/sys/fs/cd9660/cd9660_node.c Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_node.c,v 1.34 2014/11/10 18:46:33 maxv Exp $ */
+/* $NetBSD: cd9660_node.c,v 1.35 2016/08/20 12:37:06 hannken Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.34 2014/11/10 18:46:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.35 2016/08/20 12:37:06 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,15 +131,10 @@ cd9660_reclaim(void *v)
struct lwp *a_l;
} */ *ap = v;
struct vnode *vp = ap->a_vp;
- struct iso_node *ip = VTOI(vp);
if (prtactive && vp->v_usecount > 1)
vprint("cd9660_reclaim: pushing active", vp);
/*
- * Remove the inode from the vnode cache.
- */
- vcache_remove(vp->v_mount, &ip->i_number, sizeof(ip->i_number));
- /*
* Purge old data structures associated with the inode.
*/
genfs_node_destroy(vp);
Index: src/sys/fs/efs/efs_vnops.c
diff -u src/sys/fs/efs/efs_vnops.c:1.35 src/sys/fs/efs/efs_vnops.c:1.36
--- src/sys/fs/efs/efs_vnops.c:1.35 Thu Jul 7 06:55:42 2016
+++ src/sys/fs/efs/efs_vnops.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: efs_vnops.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: efs_vnops.c,v 1.36 2016/08/20 12:37:07 hannken Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble <rum...@ephemeral.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.35 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.36 2016/08/20 12:37:07 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -583,7 +583,6 @@ efs_reclaim(void *v)
struct vnode *vp = ap->a_vp;
struct efs_inode *eip = EFS_VTOI(vp);
- vcache_remove(vp->v_mount, &eip->ei_number, sizeof(eip->ei_number));
genfs_node_destroy(vp);
pool_put(&efs_inode_pool, eip);
vp->v_data = NULL;
Index: src/sys/fs/filecorefs/filecore_node.c
diff -u src/sys/fs/filecorefs/filecore_node.c:1.27 src/sys/fs/filecorefs/filecore_node.c:1.28
--- src/sys/fs/filecorefs/filecore_node.c:1.27 Sat Oct 4 13:27:24 2014
+++ src/sys/fs/filecorefs/filecore_node.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.c,v 1.27 2014/10/04 13:27:24 hannken Exp $ */
+/* $NetBSD: filecore_node.c,v 1.28 2016/08/20 12:37:07 hannken Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.27 2014/10/04 13:27:24 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.28 2016/08/20 12:37:07 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,10 +246,6 @@ filecore_reclaim(void *v)
if (prtactive && vp->v_usecount > 1)
vprint("filecore_reclaim: pushing active", vp);
- /*
- * Remove the inode from the vnode cache.
- */
- vcache_remove(vp->v_mount, &ip->i_number, sizeof(ip->i_number));
/*
* Purge old data structures associated with the inode.
Index: src/sys/fs/hfs/hfs_vnops.c
diff -u src/sys/fs/hfs/hfs_vnops.c:1.32 src/sys/fs/hfs/hfs_vnops.c:1.33
--- src/sys/fs/hfs/hfs_vnops.c:1.32 Sun Jun 21 13:50:34 2015
+++ src/sys/fs/hfs/hfs_vnops.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.32 2015/06/21 13:50:34 maxv Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.33 2016/08/20 12:37:07 hannken Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.32 2015/06/21 13:50:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.33 2016/08/20 12:37:07 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1030,9 +1030,6 @@ hfs_vop_reclaim(void *v)
vp = ap->a_vp;
hp = VTOH(vp);
- KASSERT(hp->h_key.hnk_cnid == hp->h_rec.u.cnid);
- vcache_remove(vp->v_mount, &hp->h_key, sizeof(hp->h_key));
-
/* Decrement the reference count to the volume's device. */
if (hp->h_devvp) {
vrele(hp->h_devvp);
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.51 src/sys/fs/msdosfs/msdosfs_denode.c:1.52
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.51 Sat Mar 28 19:24:05 2015
+++ src/sys/fs/msdosfs/msdosfs_denode.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.51 2015/03/28 19:24:05 maxv Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.52 2016/08/20 12:37:07 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.51 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.52 2016/08/20 12:37:07 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -549,10 +549,6 @@ msdosfs_reclaim(void *v)
if (prtactive && vp->v_usecount > 1)
vprint("msdosfs_reclaim(): pushing active", vp);
/*
- * Remove the denode from the vnode cache.
- */
- vcache_remove(vp->v_mount, &dep->de_key, sizeof(dep->de_key));
- /*
* Purge old data structures associated with the denode.
*/
if (dep->de_devvp) {
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.32 src/sys/fs/nilfs/nilfs_vnops.c:1.33
--- src/sys/fs/nilfs/nilfs_vnops.c:1.32 Mon Apr 20 23:03:08 2015
+++ src/sys/fs/nilfs/nilfs_vnops.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.32 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.33 2016/08/20 12:37:07 hannken Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.32 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.33 2016/08/20 12:37:07 hannken Exp $");
#endif /* not lint */
@@ -118,9 +118,6 @@ nilfs_reclaim(void *v)
/* update note for closure */
nilfs_update(vp, NULL, NULL, NULL, UPDATE_CLOSE);
- /* remove from vnode cache. */
- vcache_remove(vp->v_mount, &nilfs_node->ino, sizeof(nilfs_node->ino));
-
/* dispose all node knowledge */
genfs_node_destroy(vp);
nilfs_dispose_node(&nilfs_node);
Index: src/sys/fs/ntfs/ntfs_vnops.c
diff -u src/sys/fs/ntfs/ntfs_vnops.c:1.59 src/sys/fs/ntfs/ntfs_vnops.c:1.60
--- src/sys/fs/ntfs/ntfs_vnops.c:1.59 Thu Nov 13 16:51:53 2014
+++ src/sys/fs/ntfs/ntfs_vnops.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vnops.c,v 1.59 2014/11/13 16:51:53 hannken Exp $ */
+/* $NetBSD: ntfs_vnops.c,v 1.60 2016/08/20 12:37:07 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.59 2014/11/13 16:51:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.60 2016/08/20 12:37:07 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,8 +248,6 @@ ntfs_reclaim(void *v)
if ((error = ntfs_ntget(ip)) != 0)
return (error);
- vcache_remove(vp->v_mount, fp->f_key, NTKEY_SIZE(attrlen));
-
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = NULL;
Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.51 src/sys/fs/ptyfs/ptyfs_vnops.c:1.52
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.51 Tue Jun 23 10:41:06 2015
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Sat Aug 20 12:37:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.51 2015/06/23 10:41:06 hannken Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.52 2016/08/20 12:37:07 hannken Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.51 2015/06/23 10:41:06 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.52 2016/08/20 12:37:07 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,9 +223,7 @@ ptyfs_reclaim(void *v)
struct vnode *a_vp;
} */ *ap = v;
struct vnode *vp = ap->a_vp;
- struct ptyfsnode *ptyfs = VTOPTYFS(vp);
- vcache_remove(vp->v_mount, &ptyfs->ptyfs_key, sizeof(ptyfs->ptyfs_key));
vp->v_data = NULL;
return 0;
}
Index: src/sys/fs/puffs/puffs_node.c
diff -u src/sys/fs/puffs/puffs_node.c:1.36 src/sys/fs/puffs/puffs_node.c:1.37
--- src/sys/fs/puffs/puffs_node.c:1.36 Mon Nov 10 18:46:33 2014
+++ src/sys/fs/puffs/puffs_node.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_node.c,v 1.36 2014/11/10 18:46:33 maxv Exp $ */
+/* $NetBSD: puffs_node.c,v 1.37 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.36 2014/11/10 18:46:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.37 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/hash.h>
@@ -193,7 +193,6 @@ puffs_putvnode(struct vnode *vp)
KASSERT(vp->v_tag == VT_PUFFS);
- vcache_remove(vp->v_mount, &pnode->pn_cookie, sizeof(pnode->pn_cookie));
genfs_node_destroy(vp);
/*
Index: src/sys/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.53 src/sys/fs/smbfs/smbfs_node.c:1.54
--- src/sys/fs/smbfs/smbfs_node.c:1.53 Sun Dec 21 10:48:53 2014
+++ src/sys/fs/smbfs/smbfs_node.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.53 2014/12/21 10:48:53 hannken Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.54 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.53 2014/12/21 10:48:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.54 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -235,8 +235,6 @@ smbfs_reclaim(void *v)
smp->sm_root = NULL;
}
- vcache_remove(vp->v_mount, np->n_key, SMBFS_KEYSIZE(np->n_nmlen));
-
genfs_node_destroy(vp);
/* To interlock with smbfs_nget(). */
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.59 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.60
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.59 Fri Nov 13 13:36:54 2015
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.59 2015/11/13 13:36:54 pooka Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.60 2016/08/20 12:37:08 hannken Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.59 2015/11/13 13:36:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.60 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -706,8 +706,6 @@ sysvbfs_reclaim(void *v)
DPRINTF("%s:\n", __func__);
- vcache_remove(vp->v_mount,
- &bnode->inode->number, sizeof(bnode->inode->number));
if (bnode->removed) {
if (bfs_inode_delete(bfs, bnode->inode->number) != 0)
DPRINTF("%s: delete inode failed\n", __func__);
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.127 src/sys/fs/tmpfs/tmpfs_vnops.c:1.128
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.127 Sat Mar 12 12:21:37 2016
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.127 2016/03/12 12:21:37 martin Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.128 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.127 2016/03/12 12:21:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.128 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -1071,7 +1071,6 @@ tmpfs_reclaim(void *v)
/* Disassociate inode from vnode. */
node->tn_vnode = NULL;
- vcache_remove(vp->v_mount, &node, sizeof(node));
vp->v_data = NULL;
/* If inode is not referenced, i.e. no links, then destroy it. */
Index: src/sys/fs/udf/udf_vnops.c
diff -u src/sys/fs/udf/udf_vnops.c:1.101 src/sys/fs/udf/udf_vnops.c:1.102
--- src/sys/fs/udf/udf_vnops.c:1.101 Mon Apr 20 23:03:08 2015
+++ src/sys/fs/udf/udf_vnops.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.101 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.102 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.101 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.102 2016/08/20 12:37:08 hannken Exp $");
#endif /* not lint */
@@ -174,9 +174,6 @@ udf_reclaim(void *v)
tsleep(&udf_node->outstanding_nodedscr, PRIBIO, "recl wait", hz/8);
}
- vcache_remove(vp->v_mount, &udf_node->loc.loc,
- sizeof(udf_node->loc.loc));
-
/* dispose all node knowledge */
udf_dispose_node(udf_node);
Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.73 src/sys/fs/union/union_subr.c:1.74
--- src/sys/fs/union/union_subr.c:1.73 Mon Apr 20 19:36:55 2015
+++ src/sys/fs/union/union_subr.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.73 2015/04/20 19:36:55 riastradh Exp $ */
+/* $NetBSD: union_subr.c,v 1.74 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.73 2015/04/20 19:36:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.74 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -539,8 +539,6 @@ union_freevp(struct vnode *vp)
un->un_uppersz = VNOVAL;
un->un_lowersz = VNOVAL;
- vcache_remove(vp->v_mount, &un, sizeof(un));
-
/* Detach union node from vnode. */
mutex_enter(vp->v_interlock);
vp->v_data = NULL;
Index: src/sys/fs/v7fs/v7fs_vnops.c
diff -u src/sys/fs/v7fs/v7fs_vnops.c:1.21 src/sys/fs/v7fs/v7fs_vnops.c:1.22
--- src/sys/fs/v7fs/v7fs_vnops.c:1.21 Mon Apr 20 23:03:08 2015
+++ src/sys/fs/v7fs/v7fs_vnops.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vnops.c,v 1.21 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: v7fs_vnops.c,v 1.22 2016/08/20 12:37:08 hannken Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.21 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.22 2016/08/20 12:37:08 hannken Exp $");
#if defined _KERNEL_OPT
#include "opt_v7fs.h"
#endif
@@ -1048,8 +1048,6 @@ v7fs_reclaim(void *v)
v7fs_inode_deallocate(fs, inode->inode_number);
DPRINTF("remove inode\n");
}
- vcache_remove(vp->v_mount,
- &inode->inode_number, sizeof(inode->inode_number));
genfs_node_destroy(vp);
pool_put(&v7fs_node_pool, v7node);
mutex_enter(vp->v_interlock);
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.55 src/sys/kern/vfs_vnode.c:1.56
--- src/sys/kern/vfs_vnode.c:1.55 Sat Aug 20 12:33:57 2016
+++ src/sys/kern/vfs_vnode.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.55 2016/08/20 12:33:57 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.56 2016/08/20 12:37:08 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.55 2016/08/20 12:33:57 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.56 2016/08/20 12:37:08 hannken Exp $");
#define _VFS_VNODE_PRIVATE
@@ -1602,29 +1602,6 @@ vcache_reclaim(vnode_t *vp)
}
/*
- * Remove a vnode / fs node pair from the cache.
- */
-void
-vcache_remove(struct mount *mp, const void *key, size_t key_len)
-{
-#ifdef DIAGNOSTIC
- uint32_t hash;
- struct vcache_key vcache_key;
- struct vcache_node *node;
-
- vcache_key.vk_mount = mp;
- vcache_key.vk_key = key;
- vcache_key.vk_key_len = key_len;
- hash = vcache_hash(&vcache_key);
-
- mutex_enter(&vcache.lock);
- node = vcache_hash_lookup(&vcache_key, hash);
- KASSERT(node != NULL);
- mutex_exit(&vcache.lock);
-#endif
-}
-
-/*
* Print a vcache node.
*/
void
Index: src/sys/miscfs/fdesc/fdesc_vnops.c
diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.126 src/sys/miscfs/fdesc/fdesc_vnops.c:1.127
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.126 Mon Apr 20 23:03:08 2015
+++ src/sys/miscfs/fdesc/fdesc_vnops.c Sat Aug 20 12:37:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.126 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.127 2016/08/20 12:37:08 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.126 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.127 2016/08/20 12:37:08 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -862,7 +862,6 @@ fdesc_reclaim(void *v)
struct fdescnode *fd = VTOFDESC(vp);
vp->v_data = NULL;
- vcache_remove(vp->v_mount, &fd->fd_ix, sizeof(fd->fd_ix));
kmem_free(fd, sizeof(struct fdescnode));
return (0);
Index: src/sys/miscfs/genfs/layer_vnops.c
diff -u src/sys/miscfs/genfs/layer_vnops.c:1.58 src/sys/miscfs/genfs/layer_vnops.c:1.59
--- src/sys/miscfs/genfs/layer_vnops.c:1.58 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/genfs/layer_vnops.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vnops.c,v 1.58 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: layer_vnops.c,v 1.59 2016/08/20 12:37:09 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.58 2014/05/25 13:51:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.59 2016/08/20 12:37:09 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -694,7 +694,6 @@ layer_reclaim(void *v)
*/
lmp->layerm_rootvp = NULL;
}
- vcache_remove(vp->v_mount, &lowervp, sizeof(lowervp));
/* After this assignment, this node will not be re-used. */
xp->layer_lowervp = NULL;
kmem_free(vp->v_data, lmp->layerm_size);
Index: src/sys/miscfs/kernfs/kernfs_vnops.c
diff -u src/sys/miscfs/kernfs/kernfs_vnops.c:1.155 src/sys/miscfs/kernfs/kernfs_vnops.c:1.156
--- src/sys/miscfs/kernfs/kernfs_vnops.c:1.155 Mon Apr 20 23:03:08 2015
+++ src/sys/miscfs/kernfs/kernfs_vnops.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vnops.c,v 1.155 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: kernfs_vnops.c,v 1.156 2016/08/20 12:37:09 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.155 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.156 2016/08/20 12:37:09 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1082,7 +1082,6 @@ kernfs_reclaim(void *v)
struct kernfs_node *kfs = VTOKERN(vp);
vp->v_data = NULL;
- vcache_remove(vp->v_mount, &kfs->kfs_kt, sizeof(kfs->kfs_kt));
mutex_enter(&kfs_lock);
TAILQ_REMOVE(&VFSTOKERNFS(vp->v_mount)->nodelist, kfs, kfs_list);
mutex_exit(&kfs_lock);
Index: src/sys/miscfs/procfs/procfs_vnops.c
diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.193 src/sys/miscfs/procfs/procfs_vnops.c:1.194
--- src/sys/miscfs/procfs/procfs_vnops.c:1.193 Mon Apr 20 23:03:08 2015
+++ src/sys/miscfs/procfs/procfs_vnops.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.193 2015/04/20 23:03:08 riastradh Exp $ */
+/* $NetBSD: procfs_vnops.c,v 1.194 2016/08/20 12:37:09 hannken Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.193 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.194 2016/08/20 12:37:09 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -450,7 +450,6 @@ procfs_reclaim(void *v)
mutex_enter(vp->v_interlock);
vp->v_data = NULL;
mutex_exit(vp->v_interlock);
- vcache_remove(vp->v_mount, &pfs->pfs_key, sizeof(pfs->pfs_key));
kmem_free(pfs, sizeof(*pfs));
return 0;
}
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.162 src/sys/miscfs/specfs/spec_vnops.c:1.163
--- src/sys/miscfs/specfs/spec_vnops.c:1.162 Mon Apr 4 08:03:53 2016
+++ src/sys/miscfs/specfs/spec_vnops.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.162 2016/04/04 08:03:53 hannken Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.163 2016/08/20 12:37:09 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.162 2016/04/04 08:03:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.163 2016/08/20 12:37:09 hannken Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1090,10 +1090,9 @@ spec_reclaim(void *v)
struct vop_reclaim_args /* {
struct vnode *a_vp;
} */ *ap = v;
- struct vnode *vp = ap->a_vp;
+ struct vnode *vp __diagused = ap->a_vp;
KASSERT(vp->v_mount == dead_rootmount);
- vcache_remove(vp->v_mount, &vp->v_interlock, sizeof(vp->v_interlock));
return 0;
}
Index: src/sys/nfs/nfs_node.c
diff -u src/sys/nfs/nfs_node.c:1.118 src/sys/nfs/nfs_node.c:1.119
--- src/sys/nfs/nfs_node.c:1.118 Fri May 30 08:47:45 2014
+++ src/sys/nfs/nfs_node.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_node.c,v 1.118 2014/05/30 08:47:45 hannken Exp $ */
+/* $NetBSD: nfs_node.c,v 1.119 2016/08/20 12:37:09 hannken Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.118 2014/05/30 08:47:45 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.119 2016/08/20 12:37:09 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -227,8 +227,6 @@ nfs_reclaim(void *v)
if (prtactive && vp->v_usecount > 1)
vprint("nfs_reclaim: pushing active", vp);
- vcache_remove(vp->v_mount, np->n_fhp, np->n_fhsize);
-
/*
* Free up any directory cookie structures and
* large file handle structures that might be associated with
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.141 src/sys/rump/librump/rumpvfs/rumpfs.c:1.142
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.141 Thu Jul 7 06:55:44 2016
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.141 2016/07/07 06:55:44 msaitoh Exp $ */
+/* $NetBSD: rumpfs.c,v 1.142 2016/08/20 12:37:09 hannken Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.141 2016/07/07 06:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.142 2016/08/20 12:37:09 hannken Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1622,7 +1622,6 @@ rump_vop_reclaim(void *v)
struct vnode *vp = ap->a_vp;
struct rumpfs_node *rn = vp->v_data;
- vcache_remove(vp->v_mount, &rn, sizeof(rn));
mutex_enter(&reclock);
rn->rn_vp = NULL;
mutex_exit(&reclock);
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.501 src/sys/sys/param.h:1.502
--- src/sys/sys/param.h:1.501 Mon Aug 1 03:43:25 2016
+++ src/sys/sys/param.h Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.501 2016/08/01 03:43:25 ozaki-r Exp $ */
+/* $NetBSD: param.h,v 1.502 2016/08/20 12:37:09 hannken Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 799003500 /* NetBSD 7.99.35 */
+#define __NetBSD_Version__ 799003600 /* NetBSD 7.99.36 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.263 src/sys/sys/vnode.h:1.264
--- src/sys/sys/vnode.h:1.263 Fri Jun 3 15:15:49 2016
+++ src/sys/sys/vnode.h Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.263 2016/06/03 15:15:49 dholland Exp $ */
+/* $NetBSD: vnode.h,v 1.264 2016/08/20 12:37:09 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -543,7 +543,6 @@ int vcache_rekey_enter(struct mount *, s
const void *, size_t, const void *, size_t);
void vcache_rekey_exit(struct mount *, struct vnode *,
const void *, size_t, const void *, size_t);
-void vcache_remove(struct mount *, const void *, size_t);
/* see vnsubr(9) */
int vn_bwrite(void *);
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.28 src/sys/ufs/chfs/chfs_vnops.c:1.29
--- src/sys/ufs/chfs/chfs_vnops.c:1.28 Mon Apr 20 23:03:09 2015
+++ src/sys/ufs/chfs/chfs_vnops.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.28 2015/04/20 23:03:09 riastradh Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.29 2016/08/20 12:37:09 hannken Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -1512,7 +1512,6 @@ chfs_reclaim(void *v)
}
cache_purge(vp);
- vcache_remove(vp->v_mount, &ip->ino, sizeof(ip->ino));
if (ip->devvp) {
vrele(ip->devvp);
ip->devvp = 0;
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.15 src/sys/ufs/lfs/ulfs_inode.c:1.16
--- src/sys/ufs/lfs/ulfs_inode.c:1.15 Mon Jun 20 03:36:09 2016
+++ src/sys/ufs/lfs/ulfs_inode.c Sat Aug 20 12:37:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.15 2016/06/20 03:36:09 dholland Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.16 2016/08/20 12:37:09 hannken Exp $ */
/* from NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.15 2016/06/20 03:36:09 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.16 2016/08/20 12:37:09 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -149,11 +149,6 @@ ulfs_reclaim(struct vnode *vp)
lfs_update(vp, NULL, NULL, UPDATE_CLOSE);
lfs_update(vp, NULL, NULL, UPDATE_CLOSE);
- /*
- * Remove the inode from the vnode cache.
- */
- vcache_remove(vp->v_mount, &ip->i_number, sizeof(ip->i_number));
-
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = 0;
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.95 src/sys/ufs/ufs/ufs_inode.c:1.96
--- src/sys/ufs/ufs/ufs_inode.c:1.95 Sat Jun 13 14:56:45 2015
+++ src/sys/ufs/ufs/ufs_inode.c Sat Aug 20 12:37:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.96 2016/08/20 12:37:10 hannken Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.96 2016/08/20 12:37:10 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -164,11 +164,6 @@ ufs_reclaim(struct vnode *vp)
}
UFS_UPDATE(vp, NULL, NULL, UPDATE_CLOSE);
- /*
- * Remove the inode from the vnode cache.
- */
- vcache_remove(vp->v_mount, &ip->i_number, sizeof(ip->i_number));
-
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = 0;
