[src/trunk]: src/sys Move some the test for MAKEENTRY into the cache_enter(9)...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Move some the test for MAKEENTRY into the cache_enter(9)...
From: rmind <rmind%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:28:12 +0000
details:   https://anonhg.NetBSD.org/src/rev/063444c36373
branches:  trunk
changeset: 780369:063444c36373
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jul 22 00:53:18 2012 +0000

description:
Move some the test for MAKEENTRY into the cache_enter(9).  Make some
variables in vfs_cache.c static, __read_mostly, etc.

No objection on tech-kern@.

diffstat:

 sys/fs/adosfs/adlookup.c            |   8 ++--
 sys/fs/cd9660/cd9660_lookup.c       |  16 +++-----
 sys/fs/efs/efs_vnops.c              |  12 ++----
 sys/fs/filecorefs/filecore_lookup.c |  16 +++-----
 sys/fs/hfs/hfs_vnops.c              |   7 +--
 sys/fs/msdosfs/msdosfs_lookup.c     |  11 ++---
 sys/fs/nilfs/nilfs_vnops.c          |   6 +-
 sys/fs/ntfs/ntfs_vnops.c            |   9 ++--
 sys/fs/puffs/puffs_node.c           |   6 +-
 sys/fs/puffs/puffs_vnops.c          |  11 ++---
 sys/fs/smbfs/smbfs_vnops.c          |  28 ++++++----------
 sys/fs/tmpfs/tmpfs_vnops.c          |   6 +-
 sys/fs/udf/udf_vnops.c              |   6 +-
 sys/fs/unionfs/unionfs_vnops.c      |   8 +--
 sys/kern/vfs_cache.c                |  62 ++++++++++++++++++++----------------
 sys/nfs/nfs_vnops.c                 |  19 +++++-----
 sys/ufs/chfs/chfs_vnops.c           |   6 +-
 sys/ufs/ext2fs/ext2fs_lookup.c      |  14 ++++----
 sys/ufs/ufs/ufs_lookup.c            |  10 ++--
 19 files changed, 122 insertions(+), 139 deletions(-)

diffs (truncated from 812 to 300 lines):

diff -r b7d3560e9b9c -r 063444c36373 sys/fs/adosfs/adlookup.c
--- a/sys/fs/adosfs/adlookup.c  Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/adosfs/adlookup.c  Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adlookup.c,v 1.15 2010/11/30 10:43:02 dholland Exp $   */
+/*     $NetBSD: adlookup.c,v 1.16 2012/07/22 00:53:18 rmind Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.15 2010/11/30 10:43:02 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.16 2012/07/22 00:53:18 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -210,7 +210,7 @@
 #endif
                return(EJUSTRETURN);
        }
-       if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+       if (nameiop != CREATE)
                cache_enter(vdp, NULL, cnp);
 #ifdef ADOSFS_DIAGNOSTIC
        printf("ENOENT)");
@@ -240,7 +240,7 @@
        if (vdp == *vpp)
                vref(vdp);
 found_lockdone:
-       if ((cnp->cn_flags & MAKEENTRY) && nocache == 0)
+       if (nocache == 0)
                cache_enter(vdp, *vpp, cnp);
 
 #ifdef ADOSFS_DIAGNOSTIC
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/cd9660/cd9660_lookup.c
--- a/sys/fs/cd9660/cd9660_lookup.c     Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/cd9660/cd9660_lookup.c     Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $      */
+/*     $NetBSD: cd9660_lookup.c,v 1.20 2012/07/22 00:53:18 rmind Exp $ */
 
 /*-
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.20 2012/07/22 00:53:18 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/namei.h>
@@ -336,11 +336,8 @@
        /*
         * Insert name into cache (as non-existent) if appropriate.
         */
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
-       if (nameiop == CREATE || nameiop == RENAME)
-               return (EROFS);
-       return (ENOENT);
+       cache_enter(vdp, *vpp, cnp);
+       return (nameiop == CREATE || nameiop == RENAME) ? EROFS : ENOENT;
 
 found:
        if (numdirpasses == 2)
@@ -402,9 +399,8 @@
        /*
         * Insert name into cache if appropriate.
         */
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
-       return (0);
+       cache_enter(vdp, *vpp, cnp);
+       return 0;
 }
 
 /*
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/efs/efs_vnops.c
--- a/sys/fs/efs/efs_vnops.c    Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/efs/efs_vnops.c    Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efs_vnops.c,v 1.25 2012/03/13 18:40:36 elad Exp $      */
+/*     $NetBSD: efs_vnops.c,v 1.26 2012/07/22 00:53:19 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.25 2012/03/13 18:40:36 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.26 2012/07/22 00:53:19 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,8 +102,7 @@
                err = efs_inode_lookup(VFSTOEFS(ap->a_dvp->v_mount),
                    EFS_VTOI(ap->a_dvp), ap->a_cnp, &ino);
                if (err) {
-                       if (err == ENOENT && (cnp->cn_flags & MAKEENTRY) &&
-                           nameiop != CREATE)
+                       if (err == ENOENT && nameiop != CREATE)
                                cache_enter(ap->a_dvp, NULL, cnp);
                        if (err == ENOENT && (nameiop == CREATE ||
                            nameiop == RENAME)) {
@@ -121,10 +120,9 @@
                *ap->a_vpp = vp;
        }
 
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
+       cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
 
-       return (0);
+       return 0;
 }
 
 static int
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/filecorefs/filecore_lookup.c
--- a/sys/fs/filecorefs/filecore_lookup.c       Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/filecorefs/filecore_lookup.c       Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_lookup.c,v 1.13 2010/06/24 13:03:09 hannken Exp $     */
+/*     $NetBSD: filecore_lookup.c,v 1.14 2012/07/22 00:53:19 rmind Exp $       */
 
 /*-
  * Copyright (c) 1989, 1993, 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.13 2010/06/24 13:03:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.14 2012/07/22 00:53:19 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/namei.h>
@@ -246,11 +246,8 @@
        /*
         * Insert name into cache (as non-existent) if appropriate.
         */
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
-       if (nameiop == CREATE || nameiop == RENAME)
-               return (EROFS);
-       return (ENOENT);
+       cache_enter(vdp, *vpp, cnp);
+       return (nameiop == CREATE || nameiop == RENAME) ? EROFS : ENOENT;
 
 found:
        if (numdirpasses == 2)
@@ -317,7 +314,6 @@
        /*
         * Insert name into cache if appropriate.
         */
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
-       return (0);
+       cache_enter(vdp, *vpp, cnp);
+       return 0;
 }
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c    Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/hfs/hfs_vnops.c    Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hfs_vnops.c,v 1.25 2012/03/13 18:40:37 elad Exp $      */
+/*     $NetBSD: hfs_vnops.c,v 1.26 2012/07/22 00:53:19 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.25 2012/03/13 18:40:37 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.26 2012/07/22 00:53:19 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -474,8 +474,7 @@
         */
 /* XXX Cache disabled until we can make sure it works. */
 #if 0
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
+       cache_enter(vdp, *vpp, cnp);
 #endif
        
        error = 0;
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/msdosfs/msdosfs_lookup.c
--- a/sys/fs/msdosfs/msdosfs_lookup.c   Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/msdosfs/msdosfs_lookup.c   Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_lookup.c,v 1.23 2010/11/30 10:43:03 dholland Exp $     */
+/*     $NetBSD: msdosfs_lookup.c,v 1.24 2012/07/22 00:53:19 rmind Exp $        */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.23 2010/11/30 10:43:03 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.24 2012/07/22 00:53:19 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -399,7 +399,7 @@
         * e.g. creating a file 'foo' won't invalidate a negative entry 
         * for 'FOO'.
         */
-       if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+       if (nameiop != CREATE)
                cache_enter(vdp, *vpp, cnp);
 #endif
 
@@ -553,10 +553,9 @@
        /*
         * Insert name into cache if appropriate.
         */
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(vdp, *vpp, cnp);
+       cache_enter(vdp, *vpp, cnp);
 
-       return (0);
+       return 0;
 }
 
 /*
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c        Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c        Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.17 2012/03/13 18:40:38 elad Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.18 2012/07/22 00:53:19 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.17 2012/03/13 18:40:38 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.18 2012/07/22 00:53:19 rmind Exp $");
 #endif /* not lint */
 
 
@@ -760,7 +760,7 @@
         * the file might not be found and thus putting it into the namecache
         * might be seen as negative caching.
         */
-       if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+       if (nameiop != CREATE)
                cache_enter(dvp, *vpp, cnp);
 
        DPRINTFIF(LOOKUP, error, ("nilfs_lookup returing error %d\n", error));
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/ntfs/ntfs_vnops.c
--- a/sys/fs/ntfs/ntfs_vnops.c  Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/ntfs/ntfs_vnops.c  Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntfs_vnops.c,v 1.51 2012/04/29 22:53:59 chs Exp $      */
+/*     $NetBSD: ntfs_vnops.c,v 1.52 2012/07/22 00:53:19 rmind Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.51 2012/04/29 22:53:59 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.52 2012/07/22 00:53:19 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -725,10 +725,9 @@
                    (unsigned long long)VTONT(*ap->a_vpp)->i_number));
        }
 
-       if (cnp->cn_flags & MAKEENTRY)
-               cache_enter(dvp, *ap->a_vpp, cnp);
+       cache_enter(dvp, *ap->a_vpp, cnp);
 
-       return (error);
+       return error;
 }
 
 /*
diff -r b7d3560e9b9c -r 063444c36373 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Sat Jul 21 22:49:37 2012 +0000
+++ b/sys/fs/puffs/puffs_node.c Sun Jul 22 00:53:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_node.c,v 1.24 2012/04/08 15:04:41 manu Exp $     */
+/*     $NetBSD: puffs_node.c,v 1.25 2012/07/22 00:53:20 rmind Exp $    */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
Prev by Date: [src/trunk]: src/lib/libc/cdb Redo hashing, if two of the three individual ha...
Next by Date: [src/trunk]: src/libexec/ld.elf_so/arch/sparc64 Add special handling needed f...
Previous by Thread: [src/trunk]: src/lib/libc/cdb Redo hashing, if two of the three individual ha...
Next by Thread: [src/trunk]: src/libexec/ld.elf_so/arch/sparc64 Add special handling needed f...
Indexes:
Home | Main Index | Thread Index | Old Index