BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / kern / vfs_cache.c

diff --git a/usr/src/sys/kern/vfs_cache.c b/usr/src/sys/kern/vfs_cache.c
index 3fd3d3e..d24de73 100644 (file)
--- a/usr/src/sys/kern/vfs_cache.c
+++ b/usr/src/sys/kern/vfs_cache.c
@@ -2,27 +2,41 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)vfs_cache.c 7.6 (Berkeley) 6/28/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)vfs_cache.c 7.8 (Berkeley) 2/28/91

  */
 
 #include "param.h"
 #include "systm.h"
 #include "time.h"
  */
 
 #include "param.h"
 #include "systm.h"
 #include "time.h"

+#include "mount.h"

 #include "vnode.h"
 #include "namei.h"
 #include "errno.h"
 #include "vnode.h"
 #include "namei.h"
 #include "errno.h"


@@ -108,21 +122,24 @@ cache_lookup(ndp)
        if (!ndp->ni_makeentry) {
                nchstats.ncs_badhits++;
        } else if (ncp->nc_vp == NULL) {
        if (!ndp->ni_makeentry) {
                nchstats.ncs_badhits++;
        } else if (ncp->nc_vp == NULL) {

-               nchstats.ncs_neghits++;
-               /*
-                * move this slot to end of LRU chain, if not already there
-                */
-               if (ncp->nc_nxt) {
-                       /* remove from LRU chain */
-                       *ncp->nc_prev = ncp->nc_nxt;
-                       ncp->nc_nxt->nc_prev = ncp->nc_prev;
-                       /* and replace at end of it */
-                       ncp->nc_nxt = NULL;
-                       ncp->nc_prev = nchtail;
-                       *nchtail = ncp;
-                       nchtail = &ncp->nc_nxt;
+               if ((ndp->ni_nameiop & OPMASK) != CREATE) {
+                       nchstats.ncs_neghits++;
+                       /*
+                        * Move this slot to end of LRU chain,
+                        * if not already there.
+                        */
+                       if (ncp->nc_nxt) {
+                               /* remove from LRU chain */
+                               *ncp->nc_prev = ncp->nc_nxt;
+                               ncp->nc_nxt->nc_prev = ncp->nc_prev;
+                               /* and replace at end of it */
+                               ncp->nc_nxt = NULL;
+                               ncp->nc_prev = nchtail;
+                               *nchtail = ncp;
+                               nchtail = &ncp->nc_nxt;
+                       }
+                       return (ENOENT);

                }
                }

-               return (ENOENT);

        } else if (ncp->nc_vpid != ncp->nc_vp->v_id) {
                nchstats.ncs_falsehits++;
        } else {
        } else if (ncp->nc_vpid != ncp->nc_vp->v_id) {
                nchstats.ncs_falsehits++;
        } else {


@@ -184,7 +201,7 @@ cache_enter(ndp)
         */
        if (numcache < desiredvnodes) {
                ncp = (struct namecache *)
         */
        if (numcache < desiredvnodes) {
                ncp = (struct namecache *)

-                       malloc(sizeof *ncp, M_CACHE, M_WAITOK);
+                       malloc((u_long)sizeof *ncp, M_CACHE, M_WAITOK);

                bzero((char *)ncp, sizeof *ncp);
                numcache++;
        } else if (ncp = nchhead) {
                bzero((char *)ncp, sizeof *ncp);
                numcache++;
        } else if (ncp = nchhead) {


@@ -231,7 +248,8 @@ nchinit()
        nchtail = &nchhead;
        nchashsize = roundup((desiredvnodes + 1) * sizeof *nchp / 2,
                NBPG * CLSIZE);
        nchtail = &nchhead;
        nchashsize = roundup((desiredvnodes + 1) * sizeof *nchp / 2,
                NBPG * CLSIZE);

-       nchashtbl = (union nchash *)malloc(nchashsize, M_CACHE, M_WAITOK);
+       nchashtbl = (union nchash *)malloc((u_long)nchashsize,
+           M_CACHE, M_WAITOK);

        for (nchash = 1; nchash <= nchashsize / sizeof *nchp; nchash <<= 1)
                /* void */;
        nchash = (nchash >> 1) - 1;
        for (nchash = 1; nchash <= nchashsize / sizeof *nchp; nchash <<= 1)
                /* void */;
        nchash = (nchash >> 1) - 1;


@@ -273,7 +291,7 @@ cache_purge(vp)
  * inode.  This makes the algorithm O(n^2), but do you think I care?
  */
 cache_purgevfs(mp)
  * inode.  This makes the algorithm O(n^2), but do you think I care?
  */
 cache_purgevfs(mp)

-       register struct mount *mp;
+       struct mount *mp;

 {
        register struct namecache *ncp, *nxtcp;
 
 {
        register struct namecache *ncp, *nxtcp;