BSD 4_4 release

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

diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index b25b2d2..d11e8d3 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -1,10 +1,36 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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_subr.c  7.95 (Berkeley) %G%
+ * 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_subr.c  8.1 (Berkeley) 6/10/93

  */
 
 /*
  */
 
 /*


@@ -24,6 +50,9 @@
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
 #include <sys/errno.h>
 #include <sys/malloc.h>
 

+#include <vm/vm.h>
+#include <sys/sysctl.h>
+

 #include <miscfs/specfs/specdev.h>
 
 enum vtype iftovt_tab[16] = {
 #include <miscfs/specfs/specdev.h>
 
 enum vtype iftovt_tab[16] = {


@@ -190,6 +219,7 @@ void vattr_null(vap)
                vap->va_mtime.ts_sec = vap->va_mtime.ts_nsec =
                vap->va_ctime.ts_sec = vap->va_ctime.ts_nsec =
                vap->va_flags = vap->va_gen = VNOVAL;
                vap->va_mtime.ts_sec = vap->va_mtime.ts_nsec =
                vap->va_ctime.ts_sec = vap->va_ctime.ts_nsec =
                vap->va_flags = vap->va_gen = VNOVAL;

+       vap->va_vaflags = 0;

 }
 
 /*
 }
 
 /*


@@ -260,7 +290,7 @@ getnewvnode(tag, mp, vops, vpp)
        vp->v_tag = tag;
        vp->v_op = vops;
        insmntque(vp, mp);
        vp->v_tag = tag;
        vp->v_op = vops;
        insmntque(vp, mp);

-       VREF(vp);
+       vp->v_usecount++;

        *vpp = vp;
        return (0);
 }
        *vpp = vp;
        return (0);
 }


@@ -580,13 +610,11 @@ vget(vp)
                vp->v_freef = NULL;
                vp->v_freeb = NULL;
        }
                vp->v_freef = NULL;
                vp->v_freeb = NULL;
        }

-       VREF(vp);
+       vp->v_usecount++;

        VOP_LOCK(vp);
        return (0);
 }
 
        VOP_LOCK(vp);
        return (0);
 }
 

-int bug_refs = 0;
-

 /*
  * Vnode reference, just increment the count
  */
 /*
  * Vnode reference, just increment the count
  */


@@ -594,11 +622,9 @@ void vref(vp)
        struct vnode *vp;
 {
 
        struct vnode *vp;
 {
 

+       if (vp->v_usecount <= 0)
+               panic("vref used where vget required");

        vp->v_usecount++;
        vp->v_usecount++;

-       if (vp->v_type != VBLK && curproc)
-               curproc->p_spare[0]++;
-       if (bug_refs)
-               vprint("vref: ");

 }
 
 /*
 }
 
 /*


@@ -625,10 +651,6 @@ void vrele(vp)
                panic("vrele: null vp");
 #endif
        vp->v_usecount--;
                panic("vrele: null vp");
 #endif
        vp->v_usecount--;

-       if (vp->v_type != VBLK && curproc)
-               curproc->p_spare[0]--;
-       if (bug_refs)
-               vprint("vref: ");

        if (vp->v_usecount > 0)
                return;
 #ifdef DIAGNOSTIC
        if (vp->v_usecount > 0)
                return;
 #ifdef DIAGNOSTIC


@@ -677,7 +699,8 @@ void holdrele(vp)
  * system error). If MNT_FORCE is specified, detach any active vnodes
  * that are found.
  */
  * system error). If MNT_FORCE is specified, detach any active vnodes
  * that are found.
  */

-int busyprt = 0;       /* patch to print out busy vnodes */
+int busyprt = 0;       /* print out busy vnodes */
+struct ctldebug debug1 = { "busyprt", &busyprt };

 
 vflush(mp, skipvp, flags)
        struct mount *mp;
 
 vflush(mp, skipvp, flags)
        struct mount *mp;


@@ -959,9 +982,9 @@ vfinddev(dev, type, vpp)
                if (dev != vp->v_rdev || type != vp->v_type)
                        continue;
                *vpp = vp;
                if (dev != vp->v_rdev || type != vp->v_type)
                        continue;
                *vpp = vp;

-               return (0);
+               return (1);

        }
        }

-       return (1);
+       return (0);

 }
 
 /*
 }
 
 /*