Module Name: src
Committed By: rmind
Date: Thu May 19 03:11:59 UTC 2011
Modified Files:
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/puffs: puffs_vnops.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/kern: vfs_vnode.c
src/sys/nfs: nfs_node.c
src/sys/ufs/ufs: ufs_inode.c
Log Message:
Remove cache_purge(9) calls from reclamation routines in the file systems,
as vclean(9) performs it for us since Lite2 merge.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/coda/coda_vnops.c
cvs rdiff -u -r1.37 -r1.38 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.27 -r1.28 src/sys/fs/cd9660/cd9660_node.c
cvs rdiff -u -r1.23 -r1.24 src/sys/fs/efs/efs_vnops.c
cvs rdiff -u -r1.22 -r1.23 src/sys/fs/filecorefs/filecore_node.c
cvs rdiff -u -r1.22 -r1.23 src/sys/fs/hfs/hfs_vnops.c
cvs rdiff -u -r1.43 -r1.44 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.48 -r1.49 src/sys/fs/ntfs/ntfs_vnops.c
cvs rdiff -u -r1.151 -r1.152 src/sys/fs/puffs/puffs_vnops.c
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.37 -r1.38 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.80 -r1.81 src/sys/fs/tmpfs/tmpfs_vnops.c
cvs rdiff -u -r1.64 -r1.65 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.114 -r1.115 src/sys/nfs/nfs_node.c
cvs rdiff -u -r1.84 -r1.85 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/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.78 src/sys/coda/coda_vnops.c:1.79
--- src/sys/coda/coda_vnops.c:1.78 Tue Nov 30 10:43:01 2010
+++ src/sys/coda/coda_vnops.c Thu May 19 03:11:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.78 2010/11/30 10:43:01 dholland Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.79 2011/05/19 03:11:55 rmind Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.78 2010/11/30 10:43:01 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.79 2011/05/19 03:11:55 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1735,7 +1735,6 @@
}
#endif
}
- cache_purge(vp);
coda_free(VTOC(vp));
SET_VTOC(vp) = NULL;
return (0);
Index: src/sys/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.37 src/sys/fs/adosfs/advnops.c:1.38
--- src/sys/fs/adosfs/advnops.c:1.37 Thu Jun 24 13:03:09 2010
+++ src/sys/fs/adosfs/advnops.c Thu May 19 03:11:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.37 2010/06/24 13:03:09 hannken Exp $ */
+/* $NetBSD: advnops.c,v 1.38 2011/05/19 03:11:55 rmind Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.37 2010/06/24 13:03:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.38 2011/05/19 03:11:55 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -881,7 +881,6 @@
vp = sp->a_vp;
ap = VTOA(vp);
LIST_REMOVE(ap, link);
- cache_purge(vp);
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.27 src/sys/fs/cd9660/cd9660_node.c:1.28
--- src/sys/fs/cd9660/cd9660_node.c:1.27 Wed Jul 21 17:52:09 2010
+++ src/sys/fs/cd9660/cd9660_node.c Thu May 19 03:11:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_node.c,v 1.27 2010/07/21 17:52:09 hannken Exp $ */
+/* $NetBSD: cd9660_node.c,v 1.28 2011/05/19 03:11:55 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.27 2010/07/21 17:52:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.28 2011/05/19 03:11:55 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,6 @@
/*
* Purge old data structures associated with the inode.
*/
- cache_purge(vp);
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = 0;
Index: src/sys/fs/efs/efs_vnops.c
diff -u src/sys/fs/efs/efs_vnops.c:1.23 src/sys/fs/efs/efs_vnops.c:1.24
--- src/sys/fs/efs/efs_vnops.c:1.23 Tue Nov 30 10:43:02 2010
+++ src/sys/fs/efs/efs_vnops.c Thu May 19 03:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: efs_vnops.c,v 1.23 2010/11/30 10:43:02 dholland Exp $ */
+/* $NetBSD: efs_vnops.c,v 1.24 2011/05/19 03:11:56 rmind Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble <[email protected]>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.23 2010/11/30 10:43:02 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.24 2011/05/19 03:11:56 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -597,7 +597,6 @@
struct vnode *vp = ap->a_vp;
efs_ihashrem(EFS_VTOI(vp));
- cache_purge(vp);
genfs_node_destroy(vp);
pool_put(&efs_inode_pool, vp->v_data);
vp->v_data = NULL;
Index: src/sys/fs/filecorefs/filecore_node.c
diff -u src/sys/fs/filecorefs/filecore_node.c:1.22 src/sys/fs/filecorefs/filecore_node.c:1.23
--- src/sys/fs/filecorefs/filecore_node.c:1.22 Wed Jul 21 17:52:09 2010
+++ src/sys/fs/filecorefs/filecore_node.c Thu May 19 03:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.c,v 1.22 2010/07/21 17:52:09 hannken Exp $ */
+/* $NetBSD: filecore_node.c,v 1.23 2011/05/19 03:11:56 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.22 2010/07/21 17:52:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_node.c,v 1.23 2011/05/19 03:11:56 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,7 +257,6 @@
/*
* Purge old data structures associated with the inode.
*/
- cache_purge(vp);
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = 0;
Index: src/sys/fs/hfs/hfs_vnops.c
diff -u src/sys/fs/hfs/hfs_vnops.c:1.22 src/sys/fs/hfs/hfs_vnops.c:1.23
--- src/sys/fs/hfs/hfs_vnops.c:1.22 Thu Feb 10 03:30:29 2011
+++ src/sys/fs/hfs/hfs_vnops.c Thu May 19 03:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.22 2011/02/10 03:30:29 christos Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.23 2011/05/19 03:11:56 rmind 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.22 2011/02/10 03:30:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.23 2011/05/19 03:11:56 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1037,9 +1037,6 @@
/* Remove the hfsnode from its hash chain. */
hfs_nhashremove(hp);
- /* Purge name lookup cache. */
- cache_purge(vp);
-
/* Decrement the reference count to the volume's device. */
if (hp->h_devvp) {
vrele(hp->h_devvp);
@@ -1048,7 +1045,7 @@
genfs_node_destroy(vp);
free(vp->v_data, M_TEMP);
- vp->v_data = 0;
+ vp->v_data = NULL;
return 0;
}
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.43 src/sys/fs/msdosfs/msdosfs_denode.c:1.44
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.43 Mon Apr 4 19:16:58 2011
+++ src/sys/fs/msdosfs/msdosfs_denode.c Thu May 19 03:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.43 2011/04/04 19:16:58 hannken Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.44 2011/05/19 03:11:56 rmind 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.43 2011/04/04 19:16:58 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.44 2011/05/19 03:11:56 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -687,7 +687,6 @@
/*
* Purge old data structures associated with the denode.
*/
- cache_purge(vp);
if (dep->de_devvp) {
vrele(dep->de_devvp);
dep->de_devvp = 0;
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.10 src/sys/fs/nilfs/nilfs_vnops.c:1.11
--- src/sys/fs/nilfs/nilfs_vnops.c:1.10 Sun Apr 24 21:35:29 2011
+++ src/sys/fs/nilfs/nilfs_vnops.c Thu May 19 03:11:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.10 2011/04/24 21:35:29 rmind Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.11 2011/05/19 03:11:56 rmind 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.10 2011/04/24 21:35:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.11 2011/05/19 03:11:56 rmind Exp $");
#endif /* not lint */
@@ -118,9 +118,6 @@
/* update note for closure */
nilfs_update(vp, NULL, NULL, NULL, UPDATE_CLOSE);
- /* purge old data from namei */
- cache_purge(vp);
-
/* dispose all node knowledge */
nilfs_dispose_node(&nilfs_node);
Index: src/sys/fs/ntfs/ntfs_vnops.c
diff -u src/sys/fs/ntfs/ntfs_vnops.c:1.48 src/sys/fs/ntfs/ntfs_vnops.c:1.49
--- src/sys/fs/ntfs/ntfs_vnops.c:1.48 Tue Apr 26 11:32:38 2011
+++ src/sys/fs/ntfs/ntfs_vnops.c Thu May 19 03:11:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vnops.c,v 1.48 2011/04/26 11:32:38 hannken Exp $ */
+/* $NetBSD: ntfs_vnops.c,v 1.49 2011/05/19 03:11:57 rmind Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.48 2011/04/26 11:32:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.49 2011/05/19 03:11:57 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,8 +246,6 @@
if ((error = ntfs_ntget(ip)) != 0)
return (error);
- /* Purge old data structures associated with the inode. */
- cache_purge(vp);
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = NULL;
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.151 src/sys/fs/puffs/puffs_vnops.c:1.152
--- src/sys/fs/puffs/puffs_vnops.c:1.151 Tue May 3 13:16:47 2011
+++ src/sys/fs/puffs/puffs_vnops.c Thu May 19 03:11:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.151 2011/05/03 13:16:47 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.152 2011/05/19 03:11:57 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.151 2011/05/03 13:16:47 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.152 2011/05/19 03:11:57 rmind Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -1104,13 +1104,12 @@
mutex_enter(&pmp->pmp_lock);
LIST_REMOVE(pnode, pn_hashent);
mutex_exit(&pmp->pmp_lock);
- if (PUFFS_USE_NAMECACHE(pmp))
- cache_purge(vp);
if (notifyserver)
callreclaim(MPTOPUFFSMP(vp->v_mount), VPTOPNC(vp));
puffs_putvnode(vp);
+ vp->v_data = NULL;
return 0;
}
Index: src/sys/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.45 src/sys/fs/smbfs/smbfs_node.c:1.46
--- src/sys/fs/smbfs/smbfs_node.c:1.45 Wed Jul 21 17:52:11 2010
+++ src/sys/fs/smbfs/smbfs_node.c Thu May 19 03:11:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.45 2010/07/21 17:52:11 hannken Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.46 2011/05/19 03:11:58 rmind Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.45 2010/07/21 17:52:11 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.46 2011/05/19 03:11:58 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -254,7 +254,6 @@
LIST_REMOVE(np, n_hash);
- cache_purge(vp);
if (smp->sm_root == np) {
SMBVDEBUG0("root vnode\n");
smp->sm_root = NULL;
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.37 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.38
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.37 Tue Apr 26 11:32:38 2011
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Thu May 19 03:11:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.37 2011/04/26 11:32:38 hannken Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.38 2011/05/19 03:11:58 rmind 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.37 2011/04/26 11:32:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.38 2011/05/19 03:11:58 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -644,7 +644,6 @@
mutex_enter(&mntvnode_lock);
LIST_REMOVE(bnode, link);
mutex_exit(&mntvnode_lock);
- cache_purge(vp);
genfs_node_destroy(vp);
pool_put(&sysvbfs_node_pool, bnode);
vp->v_data = NULL;
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.80 src/sys/fs/tmpfs/tmpfs_vnops.c:1.81
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.80 Tue May 10 00:34:26 2011
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Thu May 19 03:11:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.80 2011/05/10 00:34:26 matt Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.81 2011/05/19 03:11:58 rmind 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.80 2011/05/10 00:34:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.81 2011/05/19 03:11:58 rmind Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -1291,7 +1291,6 @@
node = VP_TO_TMPFS_NODE(vp);
tmp = VFS_TO_TMPFS(vp->v_mount);
- cache_purge(vp);
tmpfs_free_vp(vp);
/* If the node referenced by this vnode was deleted by the user,
Index: src/sys/fs/udf/udf_vnops.c
diff -u src/sys/fs/udf/udf_vnops.c:1.64 src/sys/fs/udf/udf_vnops.c:1.65
--- src/sys/fs/udf/udf_vnops.c:1.64 Tue Apr 26 11:32:39 2011
+++ src/sys/fs/udf/udf_vnops.c Thu May 19 03:11:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.64 2011/04/26 11:32:39 hannken Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.65 2011/05/19 03:11:58 rmind 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.64 2011/04/26 11:32:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.65 2011/05/19 03:11:58 rmind Exp $");
#endif /* not lint */
@@ -159,9 +159,6 @@
tsleep(&udf_node->outstanding_nodedscr, PRIBIO, "recl wait", hz/8);
}
- /* purge old data from namei */
- cache_purge(vp);
-
/* dispose all node knowledge */
udf_dispose_node(udf_node);
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.6 src/sys/kern/vfs_vnode.c:1.7
--- src/sys/kern/vfs_vnode.c:1.6 Fri May 13 22:16:44 2011
+++ src/sys/kern/vfs_vnode.c Thu May 19 03:11:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.6 2011/05/13 22:16:44 rmind Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.7 2011/05/19 03:11:55 rmind Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.6 2011/05/13 22:16:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.7 2011/05/19 03:11:55 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -990,11 +990,15 @@
vpanic(vp, "vclean: cannot reclaim");
}
+ KASSERT(vp->v_data == NULL);
KASSERT(vp->v_uobj.uo_npages == 0);
+
if (vp->v_type == VREG && vp->v_ractx != NULL) {
uvm_ra_freectx(vp->v_ractx);
vp->v_ractx = NULL;
}
+
+ /* Purge name cache. */
cache_purge(vp);
/* Done with purge, notify sleepers of the grim news. */
Index: src/sys/nfs/nfs_node.c
diff -u src/sys/nfs/nfs_node.c:1.114 src/sys/nfs/nfs_node.c:1.115
--- src/sys/nfs/nfs_node.c:1.114 Fri Sep 24 22:51:50 2010
+++ src/sys/nfs/nfs_node.c Thu May 19 03:11:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_node.c,v 1.114 2010/09/24 22:51:50 rmind Exp $ */
+/* $NetBSD: nfs_node.c,v 1.115 2011/05/19 03:11:59 rmind Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.114 2010/09/24 22:51:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.115 2011/05/19 03:11:59 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -316,7 +316,6 @@
if (np->n_wcred)
kauth_cred_free(np->n_wcred);
- cache_purge(vp);
if (vp->v_type == VREG) {
mutex_destroy(&np->n_commitlock);
}
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.84 src/sys/ufs/ufs/ufs_inode.c:1.85
--- src/sys/ufs/ufs/ufs_inode.c:1.84 Sun Mar 6 17:08:39 2011
+++ src/sys/ufs/ufs/ufs_inode.c Thu May 19 03:11:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.84 2011/03/06 17:08:39 bouyer Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.85 2011/05/19 03:11:59 rmind Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.84 2011/03/06 17:08:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.85 2011/05/19 03:11:59 rmind Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -194,10 +194,7 @@
* Remove the inode from its hash chain.
*/
ufs_ihashrem(ip);
- /*
- * Purge old data structures associated with the inode.
- */
- cache_purge(vp);
+
if (ip->i_devvp) {
vrele(ip->i_devvp);
ip->i_devvp = 0;
