projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dynamic allocation of vnodes
[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 d966397..4720466 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *     @(#)vfs_subr.c  7.27 (Berkeley) %G%
+ *     @(#)vfs_subr.c  7.38 (Berkeley) %G%
  */
 
 /*
  */
 
 /*
@@ -25,6 +25,7 @@
 #include "mount.h"
 #include "time.h"
 #include "vnode.h"
 #include "mount.h"
 #include "time.h"
 #include "vnode.h"
+#include "specdev.h"
 #include "namei.h"
 #include "ucred.h"
 #include "errno.h"
 #include "namei.h"
 #include "ucred.h"
 #include "errno.h"
@@ -92,8 +93,8 @@ getvfs(fsid)
 
        mp = rootfs;
        do {
 
        mp = rootfs;
        do {
-               if (mp->m_fsid.val[0] == fsid->val[0] &&
-                   mp->m_fsid.val[1] == fsid->val[1]) {
+               if (mp->m_stat.f_fsid.val[0] == fsid->val[0] &&
+                   mp->m_stat.f_fsid.val[1] == fsid->val[1]) {
                        return (mp);
                }
                mp = mp->m_next;
                        return (mp);
                }
                mp = mp->m_next;
@@ -111,8 +112,8 @@ void vattr_null(vap)
        vap->va_type = VNON;
        vap->va_mode = vap->va_nlink = vap->va_uid = vap->va_gid =
                vap->va_fsid = vap->va_fileid = vap->va_size =
        vap->va_type = VNON;
        vap->va_mode = vap->va_nlink = vap->va_uid = vap->va_gid =
                vap->va_fsid = vap->va_fileid = vap->va_size =
-               vap->va_size1 = vap->va_blocksize = vap->va_rdev =
-               vap->va_bytes = vap->va_bytes1 =
+               vap->va_size_rsv = vap->va_blocksize = vap->va_rdev =
+               vap->va_bytes = vap->va_bytes_rsv =
                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.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 =
@@ -170,40 +171,15 @@ ndrele(ndp)
 struct vnode *vfreeh, **vfreet;
 extern struct vnodeops dead_vnodeops, spec_vnodeops;
 extern void vclean();
 struct vnode *vfreeh, **vfreet;
 extern struct vnodeops dead_vnodeops, spec_vnodeops;
 extern void vclean();
-
-#define        SPECHSZ 64
-#if    ((SPECHSZ&(SPECHSZ-1)) == 0)
-#define        SPECHASH(rdev)  (((rdev>>5)+(rdev))&(SPECHSZ-1))
-#else
-#define        SPECHASH(rdev)  (((unsigned)((rdev>>5)+(rdev)))%SPECHSZ)
-#endif
-struct vnode *speclisth[SPECHSZ];
+long numvnodes;
 
 /*
  * Initialize the vnode structures and initialize each file system type.
  */
 vfsinit()
 {
 
 /*
  * Initialize the vnode structures and initialize each file system type.
  */
 vfsinit()
 {
-       register struct vnode *vp = vnode;
        struct vfsops **vfsp;
 
        struct vfsops **vfsp;
 
-       /*
-        * Build vnode free list.
-        */
-       vfreeh = vp;
-       vfreet = &vp->v_freef;
-       vp->v_freeb = &vfreeh;
-       vp->v_op = &dead_vnodeops;
-       vp->v_type = VBAD;
-       for (vp++; vp < vnodeNVNODE; vp++) {
-               *vfreet = vp;
-               vp->v_freeb = vfreet;
-               vfreet = &vp->v_freef;
-               vp->v_op = &dead_vnodeops;
-               vp->v_type = VBAD;
-       }
-       vp--;
-       vp->v_freef = NULL;
        /*
         * Initialize the vnode name cache
         */
        /*
         * Initialize the vnode name cache
         */
@@ -229,26 +205,34 @@ getnewvnode(tag, mp, vops, vpp)
 {
        register struct vnode *vp, *vq;
 
 {
        register struct vnode *vp, *vq;
 
-       if ((vp = vfreeh) == NULL) {
-               tablefull("vnode");
-               *vpp = 0;
-               return (ENFILE);
+       if (numvnodes < desiredvnodes) {
+               vp = (struct vnode *)malloc(sizeof *vp, M_VNODE, M_WAITOK);
+               bzero((char *)vp, sizeof *vp);
+               numvnodes++;
+       } else {
+               if ((vp = vfreeh) == NULL) {
+                       tablefull("vnode");
+                       *vpp = 0;
+                       return (ENFILE);
+               }
+               if (vp->v_usecount)
+                       panic("free vnode isn't");
+               if (vq = vp->v_freef)
+                       vq->v_freeb = &vfreeh;
+               else
+                       vfreet = &vfreeh;
+               vfreeh = vq;
+               vp->v_freef = NULL;
+               vp->v_freeb = NULL;
+               if (vp->v_type != VBAD)
+                       vgone(vp);
+               vp->v_flag = 0;
+               vp->v_shlockc = 0;
+               vp->v_exlockc = 0;
+               vp->v_lastr = 0;
+               vp->v_socket = 0;
        }
        }
-       if (vp->v_usecount)
-               panic("free vnode isn't");
-       if (vq = vp->v_freef)
-               vq->v_freeb = &vfreeh;
-       vfreeh = vq;
-       vp->v_freef = NULL;
-       vp->v_freeb = NULL;
-       if (vp->v_type != VBAD)
-               vgone(vp);
        vp->v_type = VNON;
        vp->v_type = VNON;
-       vp->v_flag = 0;
-       vp->v_shlockc = 0;
-       vp->v_exlockc = 0;
-       vp->v_lastr = 0;
-       vp->v_socket = 0;
        cache_purge(vp);
        vp->v_tag = tag;
        vp->v_op = vops;
        cache_purge(vp);
        vp->v_tag = tag;
        vp->v_op = vops;
@@ -361,17 +345,17 @@ loop:
                break;
        }
        if (vp == NULL || vp->v_tag != VT_NON) {
                break;
        }
        if (vp == NULL || vp->v_tag != VT_NON) {
-               if (vp != NULL) {
-                       nvp->v_flag |= VALIASED;
-                       vp->v_flag |= VALIASED;
-                       vput(vp);
-               }
                MALLOC(nvp->v_specinfo, struct specinfo *,
                        sizeof(struct specinfo), M_VNODE, M_WAITOK);
                nvp->v_rdev = nvp_rdev;
                nvp->v_hashchain = vpp;
                nvp->v_specnext = *vpp;
                *vpp = nvp;
                MALLOC(nvp->v_specinfo, struct specinfo *,
                        sizeof(struct specinfo), M_VNODE, M_WAITOK);
                nvp->v_rdev = nvp_rdev;
                nvp->v_hashchain = vpp;
                nvp->v_specnext = *vpp;
                *vpp = nvp;
+               if (vp != NULL) {
+                       nvp->v_flag |= VALIASED;
+                       vp->v_flag |= VALIASED;
+                       vput(vp);
+               }
                return ((struct vnode *)0);
        }
        VOP_UNLOCK(vp);
                return ((struct vnode *)0);
        }
        VOP_UNLOCK(vp);
@@ -625,14 +609,36 @@ void vgoneall(vp)
 {
        register struct vnode *vq;
 
 {
        register struct vnode *vq;
 
-       while (vp->v_flag & VALIASED) {
-               for (vq = *vp->v_hashchain; vq; vq = vq->v_specnext) {
-                       if (vq->v_rdev != vp->v_rdev ||
-                           vq->v_type != vp->v_type || vp == vq)
-                               continue;
-                       vgone(vq);
-                       break;
+       if (vp->v_flag & VALIASED) {
+               /*
+                * If a vgone (or vclean) is already in progress,
+                * wait until it is done and return.
+                */
+               if (vp->v_flag & VXLOCK) {
+                       vp->v_flag |= VXWANT;
+                       sleep((caddr_t)vp, PINOD);
+                       return;
+               }
+               /*
+                * Ensure that vp will not be vgone'd while we
+                * are eliminating its aliases.
+                */
+               vp->v_flag |= VXLOCK;
+               while (vp->v_flag & VALIASED) {
+                       for (vq = *vp->v_hashchain; vq; vq = vq->v_specnext) {
+                               if (vq->v_rdev != vp->v_rdev ||
+                                   vq->v_type != vp->v_type || vp == vq)
+                                       continue;
+                               vgone(vq);
+                               break;
+                       }
                }
                }
+               /*
+                * Remove the lock so that vgone below will
+                * really eliminate the vnode after which time
+                * vgone will awaken any sleepers.
+                */
+               vp->v_flag &= ~VXLOCK;
        }
        vgone(vp);
 }
        }
        vgone(vp);
 }
@@ -648,6 +654,15 @@ void vgone(vp)
        struct vnode *vx;
        long count;
 
        struct vnode *vx;
        long count;
 
+       /*
+        * If a vgone (or vclean) is already in progress,
+        * wait until it is done and return.
+        */
+       if (vp->v_flag & VXLOCK) {
+               vp->v_flag |= VXWANT;
+               sleep((caddr_t)vp, PINOD);
+               return;
+       }
        /*
         * Clean out the filesystem specific data.
         */
        /*
         * Clean out the filesystem specific data.
         */
@@ -763,7 +778,7 @@ loop:
  * Print out a description of a vnode.
  */
 static char *typename[] =
  * Print out a description of a vnode.
  */
 static char *typename[] =
-       { "VNON", "VREG", "VDIR", "VBLK", "VCHR", "VLNK", "VSOCK", "VBAD" };
+   { "VNON", "VREG", "VDIR", "VBLK", "VCHR", "VLNK", "VSOCK", "VFIFO", "VBAD" };
 
 vprint(label, vp)
        char *label;
 
 vprint(label, vp)
        char *label;
@@ -799,13 +814,3 @@ vprint(label, vp)
        printf("\n\t");
        VOP_PRINT(vp);
 }
        printf("\n\t");
        VOP_PRINT(vp);
 }
-
-strcat(src, append)
-       register char *src, *append;
-{
-
-       for (; *src; ++src)
-               /* void */;
-       while (*src++ = *append++)
-               /* void */;
-}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.