timeval => timespec; lint; be more lenient about allocating new vnodes

SCCS-vsn: sys/kern/vfs_subr.c 7.80

diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index 7a9c2f2..6e2add9 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_subr.c  7.81 (Berkeley) %G%
+ *     @(#)vfs_subr.c  7.80 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -176,15 +176,12 @@ void vattr_null(vap)
 
        vap->va_type = VNON;
        vap->va_size = vap->va_bytes = VNOVAL;
 
        vap->va_type = VNON;
        vap->va_size = vap->va_bytes = VNOVAL;

-#ifdef _NOQUAD
-       vap->va_size_rsv = vap->va_bytes_rsv = VNOVAL;
-#endif

        vap->va_mode = vap->va_nlink = vap->va_uid = vap->va_gid =
                vap->va_fsid = vap->va_fileid =
                vap->va_blocksize = vap->va_rdev =
        vap->va_mode = vap->va_nlink = vap->va_uid = vap->va_gid =
                vap->va_fsid = vap->va_fileid =
                vap->va_blocksize = vap->va_rdev =

-               vap->va_atime.tv_sec = vap->va_atime.tv_usec =
-               vap->va_mtime.tv_sec = vap->va_mtime.tv_usec =
-               vap->va_ctime.tv_sec = vap->va_ctime.tv_usec =
+               vap->va_atime.ts_sec = vap->va_atime.ts_nsec =
+               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_flags = vap->va_gen = VNOVAL;
 }
 


@@ -209,7 +206,8 @@ getnewvnode(tag, mp, vops, vpp)
 {
        register struct vnode *vp, *vq;
 
 {
        register struct vnode *vp, *vq;
 

-       if (numvnodes < desiredvnodes) {
+       if ((vfreeh == NULL && numvnodes < 2 * desiredvnodes) ||
+           numvnodes < desiredvnodes) {

                vp = (struct vnode *)malloc((u_long)sizeof *vp,
                    M_VNODE, M_WAITOK);
                bzero((char *)vp, sizeof *vp);
                vp = (struct vnode *)malloc((u_long)sizeof *vp,
                    M_VNODE, M_WAITOK);
                bzero((char *)vp, sizeof *vp);


@@ -834,7 +832,8 @@ loop:
 /*
  * Disassociate the underlying file system from a vnode.
  */
 /*
  * Disassociate the underlying file system from a vnode.
  */

-void vclean(vp, flags)
+void
+vclean(vp, flags)

        register struct vnode *vp;
        int flags;
 {
        register struct vnode *vp;
        int flags;
 {