BSD 4_3_Net_2 release

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

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 356d489..f55ec0e 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -2,35 +2,62 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 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_bio.c   7.30 (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.
+ *
+ *     from: @(#)vfs_bio.c     7.40 (Berkeley) 5/8/91

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

-#include "user.h"
+#include "proc.h"

 #include "buf.h"
 #include "vnode.h"
 #include "specdev.h"
 #include "mount.h"
 #include "trace.h"
 #include "buf.h"
 #include "vnode.h"
 #include "specdev.h"
 #include "mount.h"
 #include "trace.h"

-#include "ucred.h"
+#include "resourcevar.h"
+
+/*
+ * Initialize buffers and hash links for buffers.
+ */
+bufinit()
+{
+
+       /*
+        * Body deleted.
+        */
+       return;
+}

 
 /*
 
 /*

- * Read in (if necessary) the block and return a buffer pointer.
+ * Find the block in the buffer pool.
+ * If the buffer is not present, allocate a new buffer and load
+ * its contents according to the filesystem fill routine.

  */
 bread(vp, blkno, size, cred, bpp)
        struct vnode *vp;
  */
 bread(vp, blkno, size, cred, bpp)
        struct vnode *vp;


@@ -39,31 +66,16 @@ bread(vp, blkno, size, cred, bpp)
        struct ucred *cred;
        struct buf **bpp;
 {
        struct ucred *cred;
        struct buf **bpp;
 {

-       register struct buf *bp;

 
 

-       if (size == 0)
-               panic("bread: size 0");
-       *bpp = bp = getblk(vp, blkno, size);
-       if (bp->b_flags&(B_DONE|B_DELWRI)) {
-               trace(TR_BREADHIT, pack(vp, size), blkno);
-               return (0);
-       }
-       bp->b_flags |= B_READ;
-       if (bp->b_bcount > bp->b_bufsize)
-               panic("bread");
-       if (bp->b_rcred == NOCRED && cred != NOCRED) {
-               crhold(cred);
-               bp->b_rcred = cred;
-       }
-       VOP_STRATEGY(bp);
-       trace(TR_BREADMISS, pack(vp, size), blkno);
-       u.u_ru.ru_inblock++;            /* pay for read */
-       return (biowait(bp));
+       /*
+        * Body deleted.
+        */
+       return (EIO);

 }
 
 /*
 }
 
 /*

- * Read in the block, like bread, but also start I/O on the
- * read-ahead block (which is not allocated to the caller)
+ * Operates like bread, but also starts I/O on the specified
+ * read-ahead block.

  */
 breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
        struct vnode *vp;
  */
 breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
        struct vnode *vp;


@@ -72,247 +84,95 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
        struct ucred *cred;
        struct buf **bpp;
 {
        struct ucred *cred;
        struct buf **bpp;
 {

-       register struct buf *bp, *rabp;
-
-       bp = NULL;
-       /*
-        * If the block isn't in core, then allocate
-        * a buffer and initiate i/o (getblk checks
-        * for a cache hit).
-        */
-       if (!incore(vp, blkno)) {
-               *bpp = bp = getblk(vp, blkno, size);
-               if ((bp->b_flags&(B_DONE|B_DELWRI)) == 0) {
-                       bp->b_flags |= B_READ;
-                       if (bp->b_bcount > bp->b_bufsize)
-                               panic("breada");
-                       if (bp->b_rcred == NOCRED && cred != NOCRED) {
-                               crhold(cred);
-                               bp->b_rcred = cred;
-                       }
-                       VOP_STRATEGY(bp);
-                       trace(TR_BREADMISS, pack(vp, size), blkno);
-                       u.u_ru.ru_inblock++;            /* pay for read */
-               } else
-                       trace(TR_BREADHIT, pack(vp, size), blkno);
-       }

 
        /*
 
        /*

-        * If there's a read-ahead block, start i/o
-        * on it also (as above).
+        * Body deleted.

         */
         */

-       if (!incore(vp, rablkno)) {
-               rabp = getblk(vp, rablkno, rabsize);
-               if (rabp->b_flags & (B_DONE|B_DELWRI)) {
-                       brelse(rabp);
-                       trace(TR_BREADHITRA, pack(vp, rabsize), rablkno);
-               } else {
-                       rabp->b_flags |= B_READ|B_ASYNC;
-                       if (rabp->b_bcount > rabp->b_bufsize)
-                               panic("breadrabp");
-                       if (rabp->b_rcred == NOCRED && cred != NOCRED) {
-                               crhold(cred);
-                               rabp->b_rcred = cred;
-                       }
-                       VOP_STRATEGY(rabp);
-                       trace(TR_BREADMISSRA, pack(vp, rabsize), rablkno);
-                       u.u_ru.ru_inblock++;            /* pay in advance */
-               }
-       }
-
-       /*
-        * If block was in core, let bread get it.
-        * If block wasn't in core, then the read was started
-        * above, and just wait for it.
-        */
-       if (bp == NULL)
-               return (bread(vp, blkno, size, cred, bpp));
-       return (biowait(bp));
+       return (EIO);

 }
 
 /*
 }
 
 /*

- * Write the buffer, waiting for completion.
- * Then release the buffer.
+ * Synchronous write.
+ * Release buffer on completion.

  */
 bwrite(bp)
        register struct buf *bp;
 {
  */
 bwrite(bp)
        register struct buf *bp;
 {

-       register int flag;
-       int s, error;
-
-       flag = bp->b_flags;
-       bp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI);
-       if ((flag&B_DELWRI) == 0)
-               u.u_ru.ru_oublock++;            /* noone paid yet */
-       else
-               reassignbuf(bp, bp->b_vp);
-       trace(TR_BWRITE, pack(bp->b_vp, bp->b_bcount), bp->b_lblkno);
-       if (bp->b_bcount > bp->b_bufsize)
-               panic("bwrite");
-       s = splbio();
-       bp->b_vp->v_numoutput++;
-       splx(s);
-       VOP_STRATEGY(bp);

 
        /*
 
        /*

-        * If the write was synchronous, then await i/o completion.
-        * If the write was "delayed", then we put the buffer on
-        * the q of blocks awaiting i/o completion status.
+        * Body deleted.

         */
         */

-       if ((flag&B_ASYNC) == 0) {
-               error = biowait(bp);
-               brelse(bp);
-       } else if (flag & B_DELWRI) {
-               bp->b_flags |= B_AGE;
-               error = 0;
-       }
-       return (error);
+       return (EIO);

 }
 
 /*
 }
 
 /*

- * Release the buffer, marking it so that if it is grabbed
- * for another purpose it will be written out before being
- * given up (e.g. when writing a partial block where it is
- * assumed that another write for the same block will soon follow).
- * This can't be done for magtape, since writes must be done
- * in the same order as requested.
+ * Delayed write.
+ *
+ * The buffer is marked dirty, but is not queued for I/O.
+ * This routine should be used when the buffer is expected
+ * to be modified again soon, typically a small write that
+ * partially fills a buffer.
+ *
+ * NB: magnetic tapes cannot be delayed; they must be
+ * written in the order that the writes are requested.

  */
 bdwrite(bp)
        register struct buf *bp;
 {
 
  */
 bdwrite(bp)
        register struct buf *bp;
 {
 

-       if ((bp->b_flags & B_DELWRI) == 0) {
-               bp->b_flags |= B_DELWRI;
-               reassignbuf(bp, bp->b_vp);
-               u.u_ru.ru_oublock++;            /* noone paid yet */
-       }

        /*
        /*

-        * If this is a tape drive, the write must be initiated.
+        * Body deleted.

         */
         */

-       if (VOP_IOCTL(bp->b_vp, 0, B_TAPE, 0, NOCRED) == 0) {
-               bawrite(bp);
-       } else {
-               bp->b_flags |= B_DELWRI | B_DONE;
-               brelse(bp);
-       }
+       return;

 }
 
 /*
 }
 
 /*

- * Release the buffer, start I/O on it, but don't wait for completion.
+ * Asynchronous write.
+ * Start I/O on a buffer, but do not wait for it to complete.
+ * The buffer is released when the I/O completes.

  */
 bawrite(bp)
        register struct buf *bp;
 {
 
  */
 bawrite(bp)
        register struct buf *bp;
 {
 

-       bp->b_flags |= B_ASYNC;
-       (void) bwrite(bp);
+       /*
+        * Body deleted.
+        */
+       return;

 }
 
 /*
 }
 
 /*

- * Release the buffer, with no I/O implied.
+ * Release a buffer.
+ * Even if the buffer is dirty, no I/O is started.

  */
 brelse(bp)
        register struct buf *bp;
 {
  */
 brelse(bp)
        register struct buf *bp;
 {

-       register struct buf *flist;
-       register s;
-
-       trace(TR_BRELSE, pack(bp->b_vp, bp->b_bufsize), bp->b_lblkno);
-       /*
-        * If a process is waiting for the buffer, or
-        * is waiting for a free buffer, awaken it.
-        */
-       if (bp->b_flags&B_WANTED)
-               wakeup((caddr_t)bp);
-       if (bfreelist[0].b_flags&B_WANTED) {
-               bfreelist[0].b_flags &= ~B_WANTED;
-               wakeup((caddr_t)bfreelist);
-       }
-       /*
-        * Retry I/O for locked buffers rather than invalidating them.
-        */
-       if ((bp->b_flags & B_ERROR) && (bp->b_flags & B_LOCKED))
-               bp->b_flags &= ~B_ERROR;

 
        /*
 
        /*

-        * Disassociate buffers that are no longer valid.
+        * Body deleted.

         */
         */

-       if (bp->b_flags & (B_NOCACHE|B_ERROR))
-               bp->b_flags |= B_INVAL;
-       if ((bp->b_bufsize <= 0) || (bp->b_flags & (B_ERROR|B_INVAL))) {
-               if (bp->b_vp)
-                       brelvp(bp);
-               bp->b_flags &= ~B_DELWRI;
-       }
-       /*
-        * Stick the buffer back on a free list.
-        */
-       s = splbio();
-       if (bp->b_bufsize <= 0) {
-               /* block has no buffer ... put at front of unused buffer list */
-               flist = &bfreelist[BQ_EMPTY];
-               binsheadfree(bp, flist);
-       } else if (bp->b_flags & (B_ERROR|B_INVAL)) {
-               /* block has no info ... put at front of most free list */
-               flist = &bfreelist[BQ_AGE];
-               binsheadfree(bp, flist);
-       } else {
-               if (bp->b_flags & B_LOCKED)
-                       flist = &bfreelist[BQ_LOCKED];
-               else if (bp->b_flags & B_AGE)
-                       flist = &bfreelist[BQ_AGE];
-               else
-                       flist = &bfreelist[BQ_LRU];
-               binstailfree(bp, flist);
-       }
-       bp->b_flags &= ~(B_WANTED|B_BUSY|B_ASYNC|B_AGE|B_NOCACHE);
-       splx(s);
+       return;

 }
 
 /*
 }
 
 /*

- * See if the block is associated with some buffer
- * (mainly to avoid getting hung up on a wait in breada)
+ * Check to see if a block is currently memory resident.

  */
 incore(vp, blkno)
        struct vnode *vp;
        daddr_t blkno;
 {
  */
 incore(vp, blkno)
        struct vnode *vp;
        daddr_t blkno;
 {

-       register struct buf *bp;
-       register struct buf *dp;
-
-       dp = BUFHASH(vp, blkno);
-       for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
-               if (bp->b_lblkno == blkno && bp->b_vp == vp &&
-                   (bp->b_flags & B_INVAL) == 0)
-                       return (1);
-       return (0);
-}
-
-/*
- * Return a block if it is in memory.
- */
-baddr(vp, blkno, size, cred, bpp)
-       struct vnode *vp;
-       daddr_t blkno;
-       int size;
-       struct ucred *cred;
-       struct buf **bpp;
-{

 
 

-       if (incore(vp, blkno))
-               return (bread(vp, blkno, size, cred, bpp));
-       *bpp = 0;
+       /*
+        * Body deleted.
+        */

        return (0);
 }
 
 /*
        return (0);
 }
 
 /*

- * Assign a buffer for the given block.  If the appropriate
- * block is already associated, return it; otherwise search
- * for the oldest non-busy buffer and reassign it.
- *
- * We use splx here because this routine may be called
- * on the interrupt stack during a dump, and we don't
- * want to lower the ipl back to 0.
+ * Check to see if a block is currently memory resident.
+ * If it is resident, return it. If it is not resident,
+ * allocate a new buffer and assign it to the block.

  */
 struct buf *
 getblk(vp, blkno, size)
  */
 struct buf *
 getblk(vp, blkno, size)


@@ -320,93 +180,41 @@ getblk(vp, blkno, size)
        daddr_t blkno;
        int size;
 {
        daddr_t blkno;
        int size;
 {

-       register struct buf *bp, *dp;
-       int s;

 
 

-       if (size > MAXBSIZE)
-               panic("getblk: size too big");

        /*
        /*

-        * Search the cache for the block.  If we hit, but
-        * the buffer is in use for i/o, then we wait until
-        * the i/o has completed.
+        * Body deleted.

         */
         */

-       dp = BUFHASH(vp, blkno);
-loop:
-       for (bp = dp->b_forw; bp != dp; bp = bp->b_forw) {
-               if (bp->b_lblkno != blkno || bp->b_vp != vp ||
-                   bp->b_flags&B_INVAL)
-                       continue;
-               s = splbio();
-               if (bp->b_flags&B_BUSY) {
-                       bp->b_flags |= B_WANTED;
-                       sleep((caddr_t)bp, PRIBIO+1);
-                       splx(s);
-                       goto loop;
-               }
-               bremfree(bp);
-               bp->b_flags |= B_BUSY;
-               splx(s);
-               if (bp->b_bcount != size) {
-                       printf("getblk: stray size");
-                       bp->b_flags |= B_INVAL;
-                       bwrite(bp);
-                       goto loop;
-               }
-               bp->b_flags |= B_CACHE;
-               return (bp);
-       }
-       bp = getnewbuf();
-       bfree(bp);
-       bremhash(bp);
-       bgetvp(vp, bp);
-       bp->b_lblkno = blkno;
-       bp->b_blkno = blkno;
-       bp->b_error = 0;
-       bp->b_resid = 0;
-       binshash(bp, dp);
-       brealloc(bp, size);
-       return (bp);
+       return (0);

 }
 
 /*
 }
 
 /*

- * get an empty block,
- * not assigned to any particular device
+ * Allocate a buffer.
+ * The caller will assign it to a block.

  */
 struct buf *
 geteblk(size)
        int size;
 {
  */
 struct buf *
 geteblk(size)
        int size;
 {

-       register struct buf *bp, *flist;

 
 

-       if (size > MAXBSIZE)
-               panic("geteblk: size too big");
-       bp = getnewbuf();
-       bp->b_flags |= B_INVAL;
-       bfree(bp);
-       bremhash(bp);
-       flist = &bfreelist[BQ_AGE];
-       bp->b_error = 0;
-       bp->b_resid = 0;
-       binshash(bp, flist);
-       brealloc(bp, size);
-       return (bp);
+       /*
+        * Body deleted.
+        */
+       return (0);

 }
 
 /*
 }
 
 /*

- * Allocate space associated with a buffer.
+ * Expand or contract the actual memory allocated to a buffer.
+ * If no memory is available, release buffer and take error exit.

  */
  */

-brealloc(bp, size)
-       register struct buf *bp;
+allocbuf(tp, size)
+       register struct buf *tp;

        int size;
 {
        int size;
 {

-       daddr_t start, last;
-       register struct buf *ep;
-       struct buf *dp;
-       int s;

 
 

-       if (size == bp->b_bcount)
-               return;
-       allocbuf(bp, size);
+       /*
+        * Body deleted.
+        */
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -417,354 +225,42 @@ brealloc(bp, size)
 struct buf *
 getnewbuf()
 {
 struct buf *
 getnewbuf()
 {

-       register struct buf *bp, *dp;
-       register struct ucred *cred;
-       int s;

 
 

-loop:
-       s = splbio();
-       for (dp = &bfreelist[BQ_AGE]; dp > bfreelist; dp--)
-               if (dp->av_forw != dp)
-                       break;
-       if (dp == bfreelist) {          /* no free blocks */
-               dp->b_flags |= B_WANTED;
-               sleep((caddr_t)dp, PRIBIO+1);
-               splx(s);
-               goto loop;
-       }
-       bp = dp->av_forw;
-       bremfree(bp);
-       bp->b_flags |= B_BUSY;
-       splx(s);
-       if (bp->b_flags & B_DELWRI) {
-               (void) bawrite(bp);
-               goto loop;
-       }
-       trace(TR_BRELSE, pack(bp->b_vp, bp->b_bufsize), bp->b_lblkno);
-       if (bp->b_vp)
-               brelvp(bp);
-       if (bp->b_rcred != NOCRED) {
-               cred = bp->b_rcred;
-               bp->b_rcred = NOCRED;
-               crfree(cred);
-       }
-       if (bp->b_wcred != NOCRED) {
-               cred = bp->b_wcred;
-               bp->b_wcred = NOCRED;
-               crfree(cred);
-       }
-       bp->b_flags = B_BUSY;
-       return (bp);
+       /*
+        * Body deleted.
+        */
+       return (0);

 }
 
 /*
 }
 
 /*

- * Wait for I/O completion on the buffer; return errors
- * to the user.
+ * Wait for I/O to complete.
+ *
+ * Extract and return any errors associated with the I/O.
+ * If the error flag is set, but no specific error is
+ * given, return EIO.

  */
 biowait(bp)
        register struct buf *bp;
 {
  */
 biowait(bp)
        register struct buf *bp;
 {

-       int s;

 
 

-       s = splbio();
-       while ((bp->b_flags & B_DONE) == 0)
-               sleep((caddr_t)bp, PRIBIO);
-       splx(s);

        /*
        /*

-        * Pick up the device's error number and pass it to the user;
-        * if there is an error but the number is 0 set a generalized code.
+        * Body deleted.

         */
         */

-       if ((bp->b_flags & B_ERROR) == 0)
-               return (0);
-       if (bp->b_error)
-               return (bp->b_error);

        return (EIO);
 }
 
 /*
  * Mark I/O complete on a buffer.
        return (EIO);
 }
 
 /*
  * Mark I/O complete on a buffer.

- * If someone should be called, e.g. the pageout
- * daemon, do so.  Otherwise, wake up anyone
- * waiting for it.
- */
-biodone(bp)
-       register struct buf *bp;
-{
-       register struct vnode *vp;
-
-       if (bp->b_flags & B_DONE)
-               panic("dup biodone");
-       bp->b_flags |= B_DONE;
-       if ((bp->b_flags & B_READ) == 0) {
-               bp->b_dirtyoff = bp->b_dirtyend = 0;
-               if (vp = bp->b_vp) {
-                       vp->v_numoutput--;
-                       if ((vp->v_flag & VBWAIT) && vp->v_numoutput <= 0) {
-                               if (vp->v_numoutput < 0)
-                                       panic("biodone: neg numoutput");
-                               vp->v_flag &= ~VBWAIT;
-                               wakeup((caddr_t)&vp->v_numoutput);
-                       }
-               }
-       }
-       if (bp->b_flags & B_CALL) {
-               bp->b_flags &= ~B_CALL;
-               (*bp->b_iodone)(bp);
-               return;
-       }
-       if (bp->b_flags&B_ASYNC)
-               brelse(bp);
-       else {
-               bp->b_flags &= ~B_WANTED;
-               wakeup((caddr_t)bp);
-       }
-}
-
-/*
- * Make sure all write-behind blocks associated
- * with mount point are flushed out (from sync).
- */
-mntflushbuf(mountp, flags)
-       struct mount *mountp;
-       int flags;
-{
-       register struct vnode *vp;
-
-       if ((mountp->mnt_flag & MNT_MPBUSY) == 0)
-               panic("mntflushbuf: not busy");
-loop:
-       for (vp = mountp->mnt_mounth; vp; vp = vp->v_mountf) {
-               if (vget(vp))
-                       goto loop;
-               vflushbuf(vp, flags);
-               vput(vp);
-               if (vp->v_mount != mountp)
-                       goto loop;
-       }
-}
-
-/*
- * Flush all dirty buffers associated with a vnode.
- */
-vflushbuf(vp, flags)
-       register struct vnode *vp;
-       int flags;
-{
-       register struct buf *bp;
-       struct buf *nbp;
-       int s;
-
-loop:
-       s = splbio();
-       for (bp = vp->v_dirtyblkhd; bp; bp = nbp) {
-               nbp = bp->b_blockf;
-               if ((bp->b_flags & B_BUSY))
-                       continue;
-               if ((bp->b_flags & B_DELWRI) == 0)
-                       panic("vflushbuf: not dirty");
-               bremfree(bp);
-               bp->b_flags |= B_BUSY;
-               splx(s);
-               /*
-                * Wait for I/O associated with indirect blocks to complete,
-                * since there is no way to quickly wait for them below.
-                * NB - This is really specific to ufs, but is done here
-                * as it is easier and quicker.
-                */
-               if (bp->b_vp == vp || (flags & B_SYNC) == 0) {
-                       (void) bawrite(bp);
-                       s = splbio();
-               } else {
-                       (void) bwrite(bp);
-                       goto loop;
-               }
-       }
-       splx(s);
-       if ((flags & B_SYNC) == 0)
-               return;
-       s = splbio();
-       while (vp->v_numoutput) {
-               vp->v_flag |= VBWAIT;
-               sleep((caddr_t)&vp->v_numoutput, PRIBIO+1);
-       }
-       splx(s);
-       if (vp->v_dirtyblkhd) {
-               vprint("vflushbuf: dirty", vp);
-               goto loop;
-       }
-}
-
-/*
- * Invalidate in core blocks belonging to closed or umounted filesystem

  *
  *

- * Go through the list of vnodes associated with the file system;
- * for each vnode invalidate any buffers that it holds. Normally
- * this routine is preceeded by a bflush call, so that on a quiescent
- * filesystem there will be no dirty buffers when we are done. Binval
- * returns the count of dirty buffers when it is finished.
+ * If a callback has been requested, e.g. the pageout
+ * daemon, do so. Otherwise, awaken waiting processes.

  */
  */

-mntinvalbuf(mountp)
-       struct mount *mountp;
-{
-       register struct vnode *vp;
-       int dirty = 0;
-
-       if ((mountp->mnt_flag & MNT_MPBUSY) == 0)
-               panic("mntinvalbuf: not busy");
-loop:
-       for (vp = mountp->mnt_mounth; vp; vp = vp->v_mountf) {
-               if (vget(vp))
-                       goto loop;
-               dirty += vinvalbuf(vp, 1);
-               vput(vp);
-               if (vp->v_mount != mountp)
-                       goto loop;
-       }
-       return (dirty);
-}
-
-/*
- * Flush out and invalidate all buffers associated with a vnode.
- * Called with the underlying object locked.
- */
-vinvalbuf(vp, save)
-       register struct vnode *vp;
-       int save;
-{
-       register struct buf *bp;
-       struct buf *nbp, *blist;
-       int s, dirty = 0;
-
-       for (;;) {
-               if (blist = vp->v_dirtyblkhd)
-                       /* void */;
-               else if (blist = vp->v_cleanblkhd)
-                       /* void */;
-               else
-                       break;
-               for (bp = blist; bp; bp = nbp) {
-                       nbp = bp->b_blockf;
-                       s = splbio();
-                       if (bp->b_flags & B_BUSY) {
-                               bp->b_flags |= B_WANTED;
-                               sleep((caddr_t)bp, PRIBIO+1);
-                               splx(s);
-                               break;
-                       }
-                       bremfree(bp);
-                       bp->b_flags |= B_BUSY;
-                       splx(s);
-                       if (save && (bp->b_flags & B_DELWRI)) {
-                               dirty++;
-                               (void) bwrite(bp);
-                               break;
-                       }
-                       if (bp->b_vp != vp)
-                               reassignbuf(bp, bp->b_vp);
-                       else
-                               bp->b_flags |= B_INVAL;
-                       brelse(bp);
-               }
-       }
-       if (vp->v_dirtyblkhd || vp->v_cleanblkhd)
-               panic("vinvalbuf: flush failed");
-       return (dirty);
-}
-
-/*
- * Associate a buffer with a vnode.
- */
-bgetvp(vp, bp)
-       register struct vnode *vp;
-       register struct buf *bp;
-{
-
-       if (bp->b_vp)
-               panic("bgetvp: not free");
-       VHOLD(vp);
-       bp->b_vp = vp;
-       if (vp->v_type == VBLK || vp->v_type == VCHR)
-               bp->b_dev = vp->v_rdev;
-       else
-               bp->b_dev = NODEV;
-       /*
-        * Insert onto list for new vnode.
-        */
-       if (vp->v_cleanblkhd) {
-               bp->b_blockf = vp->v_cleanblkhd;
-               bp->b_blockb = &vp->v_cleanblkhd;
-               vp->v_cleanblkhd->b_blockb = &bp->b_blockf;
-               vp->v_cleanblkhd = bp;
-       } else {
-               vp->v_cleanblkhd = bp;
-               bp->b_blockb = &vp->v_cleanblkhd;
-               bp->b_blockf = NULL;
-       }
-}
-
-/*
- * Disassociate a buffer from a vnode.
- */
-brelvp(bp)
-       register struct buf *bp;
-{
-       struct buf *bq;
-       struct vnode *vp;
-
-       if (bp->b_vp == (struct vnode *) 0)
-               panic("brelvp: NULL");
-       /*
-        * Delete from old vnode list, if on one.
-        */
-       if (bp->b_blockb) {
-               if (bq = bp->b_blockf)
-                       bq->b_blockb = bp->b_blockb;
-               *bp->b_blockb = bq;
-               bp->b_blockf = NULL;
-               bp->b_blockb = NULL;
-       }
-       vp = bp->b_vp;
-       bp->b_vp = (struct vnode *) 0;
-       HOLDRELE(vp);
-}
-
-/*
- * Reassign a buffer from one vnode to another.
- * Used to assign file specific control information
- * (indirect blocks) to the vnode to which they belong.
- */
-reassignbuf(bp, newvp)
+biodone(bp)

        register struct buf *bp;
        register struct buf *bp;

-       register struct vnode *newvp;

 {
 {

-       register struct buf *bq, **listheadp;

 
 

-       if (newvp == NULL)
-               panic("reassignbuf: NULL");
-       /*
-        * Delete from old vnode list, if on one.
-        */
-       if (bp->b_blockb) {
-               if (bq = bp->b_blockf)
-                       bq->b_blockb = bp->b_blockb;
-               *bp->b_blockb = bq;
-       }

        /*
        /*

-        * If dirty, put on list of dirty buffers;
-        * otherwise insert onto list of clean buffers.
+        * Body deleted.

         */
         */

-       if (bp->b_flags & B_DELWRI)
-               listheadp = &newvp->v_dirtyblkhd;
-       else
-               listheadp = &newvp->v_cleanblkhd;
-       if (*listheadp) {
-               bp->b_blockf = *listheadp;
-               bp->b_blockb = listheadp;
-               bp->b_blockf->b_blockb = &bp->b_blockf;
-               *listheadp = bp;
-       } else {
-               *listheadp = bp;
-               bp->b_blockb = listheadp;
-               bp->b_blockf = NULL;
-       }
+        return;

 }
 }