[src/trunk]: src/sys Remove cache_purge(9) calls from reclamation routines in...

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

details:   https://anonhg.NetBSD.org/src/rev/8fd358222958
branches:  trunk
changeset: 765089:8fd358222958
user:      rmind <rmind%NetBSD.org@localhost>
date:      Thu May 19 03:11:55 2011 +0000

description:
Remove cache_purge(9) calls from reclamation routines in the file systems,
as vclean(9) performs it for us since Lite2 merge.

diffstat:

 sys/coda/coda_vnops.c             |  5 ++---
 sys/fs/adosfs/advnops.c           |  5 ++---
 sys/fs/cd9660/cd9660_node.c       |  5 ++---
 sys/fs/efs/efs_vnops.c            |  5 ++---
 sys/fs/filecorefs/filecore_node.c |  5 ++---
 sys/fs/hfs/hfs_vnops.c            |  9 +++------
 sys/fs/msdosfs/msdosfs_denode.c   |  5 ++---
 sys/fs/nilfs/nilfs_vnops.c        |  7 ++-----
 sys/fs/ntfs/ntfs_vnops.c          |  6 ++----
 sys/fs/puffs/puffs_vnops.c        |  7 +++----
 sys/fs/smbfs/smbfs_node.c         |  5 ++---
 sys/fs/sysvbfs/sysvbfs_vnops.c    |  5 ++---
 sys/fs/tmpfs/tmpfs_vnops.c        |  5 ++---
 sys/fs/udf/udf_vnops.c            |  7 ++-----
 sys/kern/vfs_vnode.c              |  8 ++++++--
 sys/nfs/nfs_node.c                |  5 ++---
 sys/ufs/ufs/ufs_inode.c           |  9 +++------
 17 files changed, 41 insertions(+), 62 deletions(-)

diffs (truncated from 477 to 300 lines):

diff -r 2940d7d9c184 -r 8fd358222958 sys/coda/coda_vnops.c
--- a/sys/coda/coda_vnops.c     Thu May 19 03:09:47 2011 +0000
+++ b/sys/coda/coda_vnops.c     Thu May 19 03:11:55 2011 +0000
@@ -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);
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/adosfs/advnops.c
--- a/sys/fs/adosfs/advnops.c   Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/adosfs/advnops.c   Thu May 19 03:11:55 2011 +0000
@@ -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)
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/cd9660/cd9660_node.c
--- a/sys/fs/cd9660/cd9660_node.c       Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/cd9660/cd9660_node.c       Thu May 19 03:11:55 2011 +0000
@@ -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;
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/efs/efs_vnops.c
--- a/sys/fs/efs/efs_vnops.c    Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/efs/efs_vnops.c    Thu May 19 03:11:55 2011 +0000
@@ -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 <rumble%ephemeral.org@localhost>
@@ -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;
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/filecorefs/filecore_node.c
--- a/sys/fs/filecorefs/filecore_node.c Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/filecorefs/filecore_node.c Thu May 19 03:11:55 2011 +0000
@@ -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;
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c    Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/hfs/hfs_vnops.c    Thu May 19 03:11:55 2011 +0000
@@ -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;
 }
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/msdosfs/msdosfs_denode.c
--- a/sys/fs/msdosfs/msdosfs_denode.c   Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/msdosfs/msdosfs_denode.c   Thu May 19 03:11:55 2011 +0000
@@ -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;
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c        Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c        Thu May 19 03:11:55 2011 +0000
@@ -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);
 
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/ntfs/ntfs_vnops.c
--- a/sys/fs/ntfs/ntfs_vnops.c  Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/ntfs/ntfs_vnops.c  Thu May 19 03:11:55 2011 +0000
@@ -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;
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/puffs/puffs_vnops.c
--- a/sys/fs/puffs/puffs_vnops.c        Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/puffs/puffs_vnops.c        Thu May 19 03:11:55 2011 +0000
@@ -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;
 }
diff -r 2940d7d9c184 -r 8fd358222958 sys/fs/smbfs/smbfs_node.c
--- a/sys/fs/smbfs/smbfs_node.c Thu May 19 03:09:47 2011 +0000
+++ b/sys/fs/smbfs/smbfs_node.c Thu May 19 03:11:55 2011 +0000
@@ -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 @@