don't vgone the vnode in vcount if it is ours

[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 ea5fe66..176db6b 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_subr.c  8.10 (Berkeley) %G%
+ *     @(#)vfs_subr.c  8.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -1005,19 +1005,20 @@ vfinddev(dev, type, vpp)
 vcount(vp)
        register struct vnode *vp;
 {
 vcount(vp)
        register struct vnode *vp;
 {

-       register struct vnode *vq;
+       register struct vnode *vq, *vnext;

        int count;
 
        int count;
 

+loop:

        if ((vp->v_flag & VALIASED) == 0)
                return (vp->v_usecount);
        if ((vp->v_flag & VALIASED) == 0)
                return (vp->v_usecount);

-loop:
-       for (count = 0, vq = *vp->v_hashchain; vq; vq = vq->v_specnext) {
+       for (count = 0, vq = *vp->v_hashchain; vq; vq = vnext) {
+               vnext = vq->v_specnext;

                if (vq->v_rdev != vp->v_rdev || vq->v_type != vp->v_type)
                        continue;
                /*
                 * Alias, but not in use, so flush it out.
                 */
                if (vq->v_rdev != vp->v_rdev || vq->v_type != vp->v_type)
                        continue;
                /*
                 * Alias, but not in use, so flush it out.
                 */

-               if (vq->v_usecount == 0) {
+               if (vq->v_usecount == 0 && vq != vp) {

                        vgone(vq);
                        goto loop;
                }
                        vgone(vq);
                        goto loop;
                }