lstat of symbolic link returns attributes of its containing directory
[unix-history] / usr / src / sys / kern / vfs_bio.c
index c894dc1..0a3553b 100644 (file)
-/*
- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+/*-
+ * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * All rights reserved.
  *
- * %sccs.include.redist.c%
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).
  *
  *
- *     @(#)vfs_bio.c   7.35 (Berkeley) %G%
+ *     @(#)vfs_bio.c   7.58 (Berkeley) %G%
+ */
+
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/trace.h>
+#include <sys/resourcevar.h>
+#include <sys/malloc.h>
+#include <libkern/libkern.h>
+
+/*
+ * Definitions for the buffer hash lists.
+ */
+#define        BUFHASH(dvp, lbn)       \
+       (&bufhashtbl[((int)(dvp) / sizeof(*(dvp)) + (int)(lbn)) & bufhash])
+struct list_entry *bufhashtbl, invalhash;
+u_long bufhash;
+
+/*
+ * Insq/Remq for the buffer hash lists.
+ */
+#define        binshash(bp, dp)        list_enter_head(dp, bp, struct buf *, b_hash)
+#define        bremhash(bp)            list_remove(bp, struct buf *, b_hash)
+
+/*
+ * Definitions for the buffer free lists.
+ */
+#define        BQUEUES         4               /* number of free buffer queues */
+
+#define        BQ_LOCKED       0               /* super-blocks &c */
+#define        BQ_LRU          1               /* lru, useful buffers */
+#define        BQ_AGE          2               /* rubbish */
+#define        BQ_EMPTY        3               /* buffer headers with no memory */
+
+struct queue_entry bufqueues[BQUEUES];
+int needbuffer;
+
+/*
+ * Insq/Remq for the buffer free lists.
+ */
+#define        binsheadfree(bp, dp) \
+       queue_enter_head(dp, bp, struct buf *, b_freelist)
+#define        binstailfree(bp, dp) \
+       queue_enter_tail(dp, bp, struct buf *, b_freelist)
+
+/*
+ * Local declarations
  */
  */
+struct buf *cluster_newbuf __P((struct vnode *, struct buf *, long, daddr_t,
+           daddr_t, long, int));
+struct buf *cluster_rbuild __P((struct vnode *, u_quad_t, struct buf *,
+           daddr_t, daddr_t, long, int, long));
+void       cluster_wbuild __P((struct vnode *, struct buf *, long size,
+           daddr_t start_lbn, int len, daddr_t lbn));
 
 
-#include "param.h"
-#include "proc.h"
-#include "buf.h"
-#include "vnode.h"
-#include "specdev.h"
-#include "mount.h"
-#include "trace.h"
-#include "resourcevar.h"
+void
+bremfree(bp)
+       struct buf *bp;
+{
+       struct queue_entry *dp;
+
+       /*
+        * We only calculate the head of the freelist when removing
+        * the last element of the list as that is the only time that
+        * it is needed (e.g. to reset the tail pointer).
+        */
+       if (bp->b_freelist.qe_next == NULL) {
+               for (dp = bufqueues; dp < &bufqueues[BQUEUES]; dp++)
+                       if (dp->qe_prev == &bp->b_freelist.qe_next)
+                               break;
+               if (dp == &bufqueues[BQUEUES])
+                       panic("bremfree: lost tail");
+       }
+       queue_remove(dp, bp, struct buf *, b_freelist);
+}
+
+/*
+ * Initialize buffers and hash links for buffers.
+ */
+void
+bufinit()
+{
+       register struct buf *bp;
+       struct queue_entry *dp;
+       register int i;
+       int base, residual;
+
+       for (dp = bufqueues; dp < &bufqueues[BQUEUES]; dp++)
+               queue_init(dp);
+       bufhashtbl = (struct list_entry *)hashinit(nbuf, M_CACHE, &bufhash);
+       base = bufpages / nbuf;
+       residual = bufpages % nbuf;
+       for (i = 0; i < nbuf; i++) {
+               bp = &buf[i];
+               bzero((char *)bp, sizeof *bp);
+               bp->b_dev = NODEV;
+               bp->b_rcred = NOCRED;
+               bp->b_wcred = NOCRED;
+               bp->b_un.b_addr = buffers + i * MAXBSIZE;
+               if (i < residual)
+                       bp->b_bufsize = (base + 1) * CLBYTES;
+               else
+                       bp->b_bufsize = base * CLBYTES;
+               bp->b_flags = B_INVAL;
+               dp = bp->b_bufsize ? &bufqueues[BQ_AGE] : &bufqueues[BQ_EMPTY];
+               binsheadfree(bp, dp);
+               binshash(bp, &invalhash);
+       }
+}
 
 /*
  * Find the block in the buffer pool.
 
 /*
  * Find the block in the buffer pool.
@@ -39,7 +142,7 @@ bread(vp, blkno, size, cred, bpp)
 #ifdef SECSIZE
        bp = getblk(dev, blkno, size, secsize);
 #else SECSIZE
 #ifdef SECSIZE
        bp = getblk(dev, blkno, size, secsize);
 #else SECSIZE
-       *bpp = bp = getblk(vp, blkno, size);
+       *bpp = bp = getblk(vp, blkno, size, 0, 0);
 #endif SECSIZE
        if (bp->b_flags & (B_DONE | B_DELWRI)) {
                trace(TR_BREADHIT, pack(vp, size), blkno);
 #endif SECSIZE
        if (bp->b_flags & (B_DONE | B_DELWRI)) {
                trace(TR_BREADHIT, pack(vp, size), blkno);
@@ -59,21 +162,23 @@ bread(vp, blkno, size, cred, bpp)
 }
 
 /*
 }
 
 /*
- * Operates like bread, but also starts I/O on the specified
- * read-ahead block.
+ * Operates like bread, but also starts I/O on the specified
+ * read-ahead blocks.
  */
  */
-breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
+breadn(vp, blkno, size, rablkno, rabsize, num, cred, bpp)
        struct vnode *vp;
        daddr_t blkno; int size;
 #ifdef SECSIZE
        long secsize;
 #endif SECSIZE
        struct vnode *vp;
        daddr_t blkno; int size;
 #ifdef SECSIZE
        long secsize;
 #endif SECSIZE
-       daddr_t rablkno; int rabsize;
+       daddr_t rablkno[]; int rabsize[];
+       int num;
        struct ucred *cred;
        struct buf **bpp;
 {
        struct proc *p = curproc;               /* XXX */
        register struct buf *bp, *rabp;
        struct ucred *cred;
        struct buf **bpp;
 {
        struct proc *p = curproc;               /* XXX */
        register struct buf *bp, *rabp;
+       register int i;
 
        bp = NULL;
        /*
 
        bp = NULL;
        /*
@@ -81,12 +186,12 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
         * allocate a buffer and start I/O.
         */
        if (!incore(vp, blkno)) {
         * allocate a buffer and start I/O.
         */
        if (!incore(vp, blkno)) {
-               *bpp = bp = getblk(vp, blkno, size);
+               *bpp = bp = getblk(vp, blkno, size, 0, 0);
 #endif SECSIZE
                if ((bp->b_flags & (B_DONE | B_DELWRI)) == 0) {
                        bp->b_flags |= B_READ;
                        if (bp->b_bcount > bp->b_bufsize)
 #endif SECSIZE
                if ((bp->b_flags & (B_DONE | B_DELWRI)) == 0) {
                        bp->b_flags |= B_READ;
                        if (bp->b_bcount > bp->b_bufsize)
-                               panic("breada");
+                               panic("breadn");
                        if (bp->b_rcred == NOCRED && cred != NOCRED) {
                                crhold(cred);
                                bp->b_rcred = cred;
                        if (bp->b_rcred == NOCRED && cred != NOCRED) {
                                crhold(cred);
                                bp->b_rcred = cred;
@@ -94,19 +199,23 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
                        VOP_STRATEGY(bp);
                        trace(TR_BREADMISS, pack(vp, size), blkno);
                        p->p_stats->p_ru.ru_inblock++;  /* pay for read */
                        VOP_STRATEGY(bp);
                        trace(TR_BREADMISS, pack(vp, size), blkno);
                        p->p_stats->p_ru.ru_inblock++;  /* pay for read */
-               } else
+               } else {
                        trace(TR_BREADHIT, pack(vp, size), blkno);
                        trace(TR_BREADHIT, pack(vp, size), blkno);
+               }
        }
 
        /*
        }
 
        /*
-        * If there is a read-ahead block, start I/O on it too.
+        * If there's read-ahead block(s), start I/O
+        * on them also (as above).
         */
         */
-       if (!incore(vp, rablkno)) {
-               rabp = getblk(vp, rablkno, rabsize);
+       for (i = 0; i < num; i++) {
+               if (incore(vp, rablkno[i]))
+                       continue;
+               rabp = getblk(vp, rablkno[i], rabsize[i], 0, 0);
 #endif SECSIZE
                if (rabp->b_flags & (B_DONE | B_DELWRI)) {
                        brelse(rabp);
 #endif SECSIZE
                if (rabp->b_flags & (B_DONE | B_DELWRI)) {
                        brelse(rabp);
-                       trace(TR_BREADHITRA, pack(vp, rabsize), rablkno);
+                       trace(TR_BREADHITRA, pack(vp, rabsize[i]), rablkno[i]);
                } else {
                        rabp->b_flags |= B_ASYNC | B_READ;
                        if (rabp->b_bcount > rabp->b_bufsize)
                } else {
                        rabp->b_flags |= B_ASYNC | B_READ;
                        if (rabp->b_bcount > rabp->b_bufsize)
@@ -116,7 +225,7 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
                                rabp->b_rcred = cred;
                        }
                        VOP_STRATEGY(rabp);
                                rabp->b_rcred = cred;
                        }
                        VOP_STRATEGY(rabp);
-                       trace(TR_BREADMISSRA, pack(vp, rabsize), rablkno);
+                       trace(TR_BREADMISSRA, pack(vp, rabsize[i]), rablkno[i]);
                        p->p_stats->p_ru.ru_inblock++;  /* pay in advance */
                }
        }
                        p->p_stats->p_ru.ru_inblock++;  /* pay in advance */
                }
        }
@@ -134,6 +243,283 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
        return (biowait(bp));
 }
 
        return (biowait(bp));
 }
 
+/*
+ * We could optimize this by keeping track of where the last read-ahead
+ * was, but it would involve adding fields to the vnode.  For now, let's
+ * just get it working.
+ *
+ * This replaces bread.  If this is a bread at the beginning of a file and
+ * lastr is 0, we assume this is the first read and we'll read up to two
+ * blocks if they are sequential.  After that, we'll do regular read ahead
+ * in clustered chunks.
+ *
+ * There are 4 or 5 cases depending on how you count:
+ *     Desired block is in the cache:
+ *         1 Not sequential access (0 I/Os).
+ *         2 Access is sequential, do read-ahead (1 ASYNC).
+ *     Desired block is not in cache:
+ *         3 Not sequential access (1 SYNC).
+ *         4 Sequential access, next block is contiguous (1 SYNC).
+ *         5 Sequential access, next block is not contiguous (1 SYNC, 1 ASYNC)
+ *
+ * There are potentially two buffers that require I/O.
+ *     bp is the block requested.
+ *     rbp is the read-ahead block.
+ *     If either is NULL, then you don't have to do the I/O.
+ */
+cluster_read(vp, filesize, lblkno, size, cred, bpp)
+       struct vnode *vp;
+       u_quad_t filesize;
+       daddr_t lblkno;
+       long size;
+       struct ucred *cred;
+       struct buf **bpp;
+{
+       struct buf *bp, *rbp;
+       daddr_t blkno, ioblkno;
+       long flags;
+       int error, num_ra, alreadyincore;
+
+#ifdef DIAGNOSTIC
+       if (size == 0)
+               panic("cluster_read: size = 0");
+#endif
+
+       error = 0;
+       flags = B_READ;
+       *bpp = bp = getblk(vp, lblkno, size, 0, 0);
+       if (bp->b_flags & (B_CACHE | B_DONE | B_DELWRI)) {
+               /*
+                * Desired block is in cache; do any readahead ASYNC.
+                * Case 1, 2.
+                */
+               trace(TR_BREADHIT, pack(vp, size), lblkno);
+               flags |= B_ASYNC;
+               ioblkno = lblkno +
+                   (lblkno < vp->v_ralen ? vp->v_ralen >> 1 : vp->v_ralen);
+               alreadyincore = (int)incore(vp, ioblkno);
+               bp = NULL;
+       } else {
+               /* Block wasn't in cache, case 3, 4, 5. */
+               trace(TR_BREADMISS, pack(vp, size), lblkno);
+               ioblkno = lblkno;
+               bp->b_flags |= flags;
+               alreadyincore = 0;
+               curproc->p_stats->p_ru.ru_inblock++;            /* XXX */
+       }
+       /*
+        * XXX
+        * Replace 1 with a window size based on some permutation of
+        * maxcontig and rot_delay.  This will let you figure out how
+        * many blocks you should read-ahead (case 2, 4, 5).
+        *
+        * If the access isn't sequential, cut the window size in half.
+        */
+       rbp = NULL;
+       if (lblkno != vp->v_lastr + 1 && lblkno != 0)
+               vp->v_ralen = max(vp->v_ralen >> 1, 1);
+       else if ((ioblkno + 1) * size < filesize && !alreadyincore &&
+           !(error = VOP_BMAP(vp, ioblkno, NULL, &blkno, &num_ra))) {
+               /*
+                * Reading sequentially, and the next block is not in the
+                * cache.  We are going to try reading ahead. If this is
+                * the first read of a file, then limit read-ahead to a
+                * single block, else read as much as we're allowed.
+                */
+               if (num_ra > vp->v_ralen) {
+                       num_ra = vp->v_ralen;
+                       vp->v_ralen = min(MAXPHYS / size, vp->v_ralen << 1);
+               } else 
+                       vp->v_ralen = num_ra + 1;
+
+
+               if (num_ra)                             /* case 2, 4 */
+                       rbp = cluster_rbuild(vp, filesize,
+                           bp, ioblkno, blkno, size, num_ra, flags);
+               else if (lblkno != 0 && ioblkno == lblkno) {
+                       /* Case 5: check how many blocks to read ahead */
+                       ++ioblkno;
+                       if ((ioblkno + 1) * size > filesize ||
+                           (error = VOP_BMAP(vp,
+                           ioblkno, NULL, &blkno, &num_ra)))
+                               goto skip_readahead;
+                       flags |= B_ASYNC;
+                       if (num_ra)
+                               rbp = cluster_rbuild(vp, filesize,
+                                   NULL, ioblkno, blkno, size, num_ra, flags);
+                       else {
+                               rbp = getblk(vp, ioblkno, size, 0, 0);
+                               rbp->b_flags |= flags;
+                               rbp->b_blkno = blkno;
+                       }
+               } else if (lblkno != 0) {
+                       /* case 2; read ahead single block */
+                       rbp = getblk(vp, ioblkno, size, 0, 0);
+                       rbp->b_flags |= flags;
+                       rbp->b_blkno = blkno;
+               } else if (bp)                          /* case 1, 3, block 0 */
+                       bp->b_blkno = blkno;
+               /* Case 1 on block 0; not really doing sequential I/O */
+
+               if (rbp == bp)          /* case 4 */
+                       rbp = NULL;
+               else if (rbp) {                 /* case 2, 5 */
+                       trace(TR_BREADMISSRA,
+                           pack(vp, (num_ra + 1) * size), ioblkno);
+                       curproc->p_stats->p_ru.ru_inblock++;    /* XXX */
+               }
+       }
+
+       /* XXX Kirk, do we need to make sure the bp has creds? */
+skip_readahead:
+       if (bp)
+               if (bp->b_flags & (B_DONE | B_DELWRI))
+                       panic("cluster_read: DONE bp");
+               else 
+                       error = VOP_STRATEGY(bp);
+
+       if (rbp)
+               if (error || rbp->b_flags & (B_DONE | B_DELWRI)) {
+                       rbp->b_flags &= ~(B_ASYNC | B_READ);
+                       brelse(rbp);
+               } else
+                       (void) VOP_STRATEGY(rbp);
+
+       if (bp)
+               return(biowait(bp));
+       return(error);
+}
+
+/*
+ * If blocks are contiguous on disk, use this to provide clustered
+ * read ahead.  We will read as many blocks as possible sequentially
+ * and then parcel them up into logical blocks in the buffer hash table.
+ */
+struct buf *
+cluster_rbuild(vp, filesize, bp, lbn, blkno, size, run, flags)
+       struct vnode *vp;
+       u_quad_t filesize;
+       struct buf *bp;
+       daddr_t lbn;
+       daddr_t blkno;
+       long size;
+       int run;
+       long flags;
+{
+       struct cluster_save *b_save;
+       struct buf *tbp;
+       daddr_t bn;
+       int i, inc;
+
+       if (size * (lbn + run + 1) > filesize)
+               --run;
+       if (run == 0) {
+               if (!bp) {
+                       bp = getblk(vp, lbn, size, 0, 0);
+                       bp->b_blkno = blkno;
+                       bp->b_flags |= flags;
+               }
+               return(bp);
+       }
+
+       bp = cluster_newbuf(vp, bp, flags, blkno, lbn, size, run + 1);
+       if (bp->b_flags & (B_DONE | B_DELWRI))
+               return (bp);
+
+       b_save = malloc(sizeof(struct buf *) * run + sizeof(struct cluster_save),
+           M_SEGMENT, M_WAITOK);
+       b_save->bs_bufsize = b_save->bs_bcount = size;
+       b_save->bs_nchildren = 0;
+       b_save->bs_children = (struct buf **)(b_save + 1);
+       b_save->bs_saveaddr = bp->b_saveaddr;
+       bp->b_saveaddr = (caddr_t) b_save;
+
+       inc = size / DEV_BSIZE;
+       for (bn = blkno + inc, i = 1; i <= run; ++i, bn += inc) {
+               if (incore(vp, lbn + i)) {
+                       if (i == 1) {
+                               bp->b_saveaddr = b_save->bs_saveaddr;
+                               bp->b_flags &= ~B_CALL;
+                               bp->b_iodone = NULL;
+                               allocbuf(bp, size);
+                               free(b_save, M_SEGMENT);
+                       } else
+                               allocbuf(bp, size * i);
+                       break;
+               }
+               tbp = getblk(vp, lbn + i, 0, 0, 0);
+               tbp->b_bcount = tbp->b_bufsize = size;
+               tbp->b_blkno = bn;
+               tbp->b_flags |= flags | B_READ | B_ASYNC;
+               ++b_save->bs_nchildren;
+               b_save->bs_children[i - 1] = tbp;
+       }
+       if (!(bp->b_flags & B_ASYNC))
+               vp->v_ralen = max(vp->v_ralen - 1, 1);
+       return(bp);
+}
+
+/*
+ * Either get a new buffer or grow the existing one.
+ */
+struct buf *
+cluster_newbuf(vp, bp, flags, blkno, lblkno, size, run)
+       struct vnode *vp;
+       struct buf *bp;
+       long flags;
+       daddr_t blkno;
+       daddr_t lblkno;
+       long size;
+       int run;
+{
+       if (!bp) {
+               bp = getblk(vp, lblkno, size, 0, 0);
+               if (bp->b_flags & (B_DONE | B_DELWRI)) {
+                       bp->b_blkno = blkno;
+                       return(bp);
+               }
+       }
+       allocbuf(bp, run * size);
+       bp->b_blkno = blkno;
+       bp->b_iodone = cluster_callback;
+       bp->b_flags |= flags | B_CALL;
+       return(bp);
+}
+
+/*
+ * Cleanup after a clustered read or write.
+ */
+void
+cluster_callback(bp)
+       struct buf *bp;
+{
+       struct cluster_save *b_save;
+       struct buf **tbp;
+       long bsize;
+       caddr_t cp;
+       b_save = (struct cluster_save *)(bp->b_saveaddr);
+       bp->b_saveaddr = b_save->bs_saveaddr;
+
+       cp = bp->b_un.b_addr + b_save->bs_bufsize;
+       for (tbp = b_save->bs_children; b_save->bs_nchildren--; ++tbp) {
+               pagemove(cp, (*tbp)->b_un.b_addr, (*tbp)->b_bufsize);
+               cp += (*tbp)->b_bufsize;
+               bp->b_bufsize -= (*tbp)->b_bufsize;
+               biodone(*tbp);
+       }
+#ifdef DIAGNOSTIC
+       if (bp->b_bufsize != b_save->bs_bufsize)
+               panic ("cluster_callback: more space to reclaim");
+#endif
+       bp->b_bcount = bp->b_bufsize;
+       bp->b_iodone = NULL;
+       free(b_save, M_SEGMENT);
+       if (bp->b_flags & B_ASYNC)
+               brelse(bp);
+       else
+               wakeup((caddr_t)bp);
+}
+
 /*
  * Synchronous write.
  * Release buffer on completion.
 /*
  * Synchronous write.
  * Release buffer on completion.
@@ -143,19 +529,22 @@ bwrite(bp)
 {
        struct proc *p = curproc;               /* XXX */
        register int flag;
 {
        struct proc *p = curproc;               /* XXX */
        register int flag;
-       int s, error;
+       int s, error = 0;
 
        flag = bp->b_flags;
        bp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI);
 
        flag = bp->b_flags;
        bp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI);
-       if ((flag & B_DELWRI) == 0)
-               p->p_stats->p_ru.ru_oublock++;          /* no one paid yet */
-       else
-               reassignbuf(bp, bp->b_vp);
+       if (flag & B_ASYNC) {
+               if ((flag & B_DELWRI) == 0)
+                       p->p_stats->p_ru.ru_oublock++;  /* no one 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++;
        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++;
+       bp->b_flags |= B_WRITEINPROG;
        splx(s);
        VOP_STRATEGY(bp);
 
        splx(s);
        VOP_STRATEGY(bp);
 
@@ -166,14 +555,31 @@ bwrite(bp)
         */
        if ((flag & B_ASYNC) == 0) {
                error = biowait(bp);
         */
        if ((flag & B_ASYNC) == 0) {
                error = biowait(bp);
+               if ((flag&B_DELWRI) == 0)
+                       p->p_stats->p_ru.ru_oublock++;  /* no one paid yet */
+               else
+                       reassignbuf(bp, bp->b_vp);
+               if (bp->b_flags & B_EINTR) {
+                       bp->b_flags &= ~B_EINTR;
+                       error = EINTR;
+               }
                brelse(bp);
        } else if (flag & B_DELWRI) {
                brelse(bp);
        } else if (flag & B_DELWRI) {
+               s = splbio();
                bp->b_flags |= B_AGE;
                bp->b_flags |= B_AGE;
-               error = 0;
+               splx(s);
        }
        return (error);
 }
 
        }
        return (error);
 }
 
+int
+vn_bwrite(ap)
+       struct vop_bwrite_args *ap;
+{
+       return (bwrite(ap->a_bp));
+}
+
+
 /*
  * Delayed write.
  *
 /*
  * Delayed write.
  *
@@ -220,7 +626,205 @@ bawrite(bp)
         * after starting the I/O.
         */
        bp->b_flags |= B_ASYNC;
         * after starting the I/O.
         */
        bp->b_flags |= B_ASYNC;
-       (void) bwrite(bp);
+       (void) VOP_BWRITE(bp);
+}
+
+/*
+ * Do clustered write for FFS.
+ *
+ * Three cases:
+ *     1. Write is not sequential (write asynchronously)
+ *     Write is sequential:
+ *     2.      beginning of cluster - begin cluster
+ *     3.      middle of a cluster - add to cluster
+ *     4.      end of a cluster - asynchronously write cluster
+ */
+void
+cluster_write(bp, filesize)
+        struct buf *bp;
+       u_quad_t filesize;
+{
+        struct vnode *vp;
+        daddr_t lbn;
+        int clen, error, maxrun;
+
+        vp = bp->b_vp;
+        lbn = bp->b_lblkno;
+       clen = 0;
+
+       /*
+        * Handle end of file first.  If we are appending, we need to check
+        * if the current block was allocated contiguously.  If it wasn't,
+        * then we need to fire off a previous cluster if it existed.
+        * Additionally, when we're appending, we need to figure out how
+        * to initialize vp->v_clen.
+        */
+       if ((lbn + 1) * bp->b_bcount == filesize) {
+               if (bp->b_blkno != vp->v_lasta + bp->b_bcount / DEV_BSIZE) {
+                       /* This block was not allocated contiguously */
+                       if (vp->v_clen)
+                           cluster_wbuild(vp, NULL, bp->b_bcount, vp->v_cstart,
+                               vp->v_lastw - vp->v_cstart + 1, lbn);
+                       vp->v_cstart = lbn;
+                       clen = vp->v_clen =
+                           MAXBSIZE / vp->v_mount->mnt_stat.f_iosize - 1;
+                       /*
+                        * Next cluster started. Write this buffer and return.
+                        */
+                       vp->v_lastw = lbn;
+                       vp->v_lasta = bp->b_blkno;
+                       bdwrite(bp);
+                       return;
+               }
+               vp->v_lasta = bp->b_blkno;
+       } else if (lbn == 0) {
+               vp->v_clen = vp->v_cstart = vp->v_lastw = 0;
+       }
+        if (vp->v_clen == 0 || lbn != vp->v_lastw + 1) {
+               if (vp->v_clen != 0)
+                       /*
+                        * Write is not sequential.
+                        */
+                       cluster_wbuild(vp, NULL, bp->b_bcount, vp->v_cstart,
+                           vp->v_lastw - vp->v_cstart + 1, lbn);
+               /*
+                * Consider beginning a cluster.
+                */
+               if (error = VOP_BMAP(vp, lbn, NULL, &bp->b_blkno, &clen)) {
+                       bawrite(bp);
+                       vp->v_cstart = lbn + 1;
+                       vp->v_lastw = lbn;
+                       return;
+               }
+                vp->v_clen = clen;
+                if (clen == 0) {               /* I/O not contiguous */
+                       vp->v_cstart = lbn + 1;
+                        bawrite(bp);
+                } else {                       /* Wait for rest of cluster */
+                       vp->v_cstart = lbn;
+                        bdwrite(bp);
+               }
+        } else if (lbn == vp->v_cstart + vp->v_clen) {
+               /*
+                * At end of cluster, write it out.
+                */
+               cluster_wbuild(vp, bp, bp->b_bcount, vp->v_cstart,
+                   vp->v_clen + 1, lbn);
+               vp->v_clen = 0;
+               vp->v_cstart = lbn + 1;
+        } else
+               /*
+                * In the middle of a cluster, so just delay the
+                * I/O for now.
+                */
+                bdwrite(bp);
+        vp->v_lastw = lbn;
+}
+
+
+/*
+ * This is an awful lot like cluster_rbuild...wish they could be combined.
+ * The last lbn argument is the current block on which I/O is being
+ * performed.  Check to see that it doesn't fall in the middle of
+ * the current block.
+ */
+void
+cluster_wbuild(vp, last_bp, size, start_lbn, len, lbn)
+       struct vnode *vp;
+       struct buf *last_bp;
+       long size;
+       daddr_t start_lbn;
+       int len;
+       daddr_t lbn;
+{
+       struct cluster_save *b_save;
+       struct buf *bp, *tbp;
+       caddr_t cp;
+       int i, s;
+
+redo:
+       while ((!incore(vp, start_lbn) || start_lbn == lbn) && len) {
+               ++start_lbn;
+               --len;
+       }
+
+       /* Get more memory for current buffer */
+       if (len <= 1) {
+               if (last_bp)
+                       bawrite(last_bp);
+               return;
+       }
+
+       bp = getblk(vp, start_lbn, size, 0, 0);
+       if (!(bp->b_flags & B_DELWRI)) {
+               ++start_lbn;
+               --len;
+               brelse(bp);
+               goto redo;
+       }
+
+       --len;
+       b_save = malloc(sizeof(struct buf *) * len + sizeof(struct cluster_save),
+           M_SEGMENT, M_WAITOK);
+       b_save->bs_bcount = bp->b_bcount;
+       b_save->bs_bufsize = bp->b_bufsize;
+       b_save->bs_nchildren = 0;
+       b_save->bs_children = (struct buf **)(b_save + 1);
+       b_save->bs_saveaddr = bp->b_saveaddr;
+       bp->b_saveaddr = (caddr_t) b_save;
+
+
+       bp->b_flags |= B_CALL;
+       bp->b_iodone = cluster_callback;
+       cp = bp->b_un.b_addr + bp->b_bufsize;
+       for (++start_lbn, i = 0; i < len; ++i, ++start_lbn) {
+               if (!incore(vp, start_lbn) || start_lbn == lbn)
+                       break;
+
+               if (last_bp == NULL || start_lbn != last_bp->b_lblkno) {
+                       tbp = getblk(vp, start_lbn, size, 0, 0);
+#ifdef DIAGNOSTIC
+                       if (tbp->b_bcount != tbp->b_bufsize)
+                               panic("cluster_wbuild: Buffer too big");
+#endif
+                       if (!(tbp->b_flags & B_DELWRI)) {
+                               brelse(tbp);
+                               break;
+                       }
+               } else
+                       tbp = last_bp;
+
+               ++b_save->bs_nchildren;
+
+               /* Move memory from children to parent */
+               pagemove(tbp->b_un.b_daddr, cp, size);
+               bp->b_bcount += size;
+               bp->b_bufsize += size;
+
+               tbp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI);
+               tbp->b_flags |= B_ASYNC;
+               s = splbio();
+               reassignbuf(tbp, tbp->b_vp);            /* put on clean list */
+               ++tbp->b_vp->v_numoutput;
+               splx(s);
+               b_save->bs_children[i] = tbp;
+
+               cp += tbp->b_bufsize;
+       }
+
+       if (i == 0) {
+               /* None to cluster */
+               bp->b_saveaddr = b_save->bs_saveaddr;
+               bp->b_flags &= ~B_CALL;
+               bp->b_iodone = NULL;
+               free(b_save, M_SEGMENT);
+       }
+       bawrite(bp);
+       if (i < len) {
+               len -= i + 1;
+               start_lbn += 1;
+               goto redo;
+       }
 }
 
 /*
 }
 
 /*
@@ -230,7 +834,7 @@ bawrite(bp)
 brelse(bp)
        register struct buf *bp;
 {
 brelse(bp)
        register struct buf *bp;
 {
-       register struct buf *flist;
+       register struct queue_entry *flist;
        int s;
 
        trace(TR_BRELSE, pack(bp->b_vp, bp->b_bufsize), bp->b_lblkno);
        int s;
 
        trace(TR_BRELSE, pack(bp->b_vp, bp->b_bufsize), bp->b_lblkno);
@@ -240,13 +844,14 @@ brelse(bp)
         */
        if (bp->b_flags & B_WANTED)
                wakeup((caddr_t)bp);
         */
        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);
+       if (needbuffer) {
+               needbuffer = 0;
+               wakeup((caddr_t)&needbuffer);
        }
        /*
         * Retry I/O for locked buffers rather than invalidating them.
         */
        }
        /*
         * Retry I/O for locked buffers rather than invalidating them.
         */
+       s = splbio();
        if ((bp->b_flags & B_ERROR) && (bp->b_flags & B_LOCKED))
                bp->b_flags &= ~B_ERROR;
        /*
        if ((bp->b_flags & B_ERROR) && (bp->b_flags & B_LOCKED))
                bp->b_flags &= ~B_ERROR;
        /*
@@ -262,22 +867,21 @@ brelse(bp)
        /*
         * Stick the buffer back on a free list.
         */
        /*
         * 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 */
        if (bp->b_bufsize <= 0) {
                /* block has no buffer ... put at front of unused buffer list */
-               flist = &bfreelist[BQ_EMPTY];
+               flist = &bufqueues[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 */
                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];
+               flist = &bufqueues[BQ_AGE];
                binsheadfree(bp, flist);
        } else {
                if (bp->b_flags & B_LOCKED)
                binsheadfree(bp, flist);
        } else {
                if (bp->b_flags & B_LOCKED)
-                       flist = &bfreelist[BQ_LOCKED];
+                       flist = &bufqueues[BQ_LOCKED];
                else if (bp->b_flags & B_AGE)
                else if (bp->b_flags & B_AGE)
-                       flist = &bfreelist[BQ_AGE];
+                       flist = &bufqueues[BQ_AGE];
                else
                else
-                       flist = &bfreelist[BQ_LRU];
+                       flist = &bufqueues[BQ_LRU];
                binstailfree(bp, flist);
        }
        bp->b_flags &= ~(B_WANTED | B_BUSY | B_ASYNC | B_AGE | B_NOCACHE);
                binstailfree(bp, flist);
        }
        bp->b_flags &= ~(B_WANTED | B_BUSY | B_ASYNC | B_AGE | B_NOCACHE);
@@ -287,19 +891,18 @@ brelse(bp)
 /*
  * Check to see if a block is currently memory resident.
  */
 /*
  * Check to see if a block is currently memory resident.
  */
+struct buf *
 incore(vp, blkno)
        struct vnode *vp;
        daddr_t blkno;
 {
        register struct buf *bp;
 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)
+       for (bp = BUFHASH(vp, blkno)->le_next; bp; bp = bp->b_hash.qe_next)
                if (bp->b_lblkno == blkno && bp->b_vp == vp &&
                    (bp->b_flags & B_INVAL) == 0)
                if (bp->b_lblkno == blkno && bp->b_vp == vp &&
                    (bp->b_flags & B_INVAL) == 0)
-                       return (1);
-       return (0);
+                       return (bp);
+       return (NULL);
 }
 
 /*
 }
 
 /*
@@ -311,16 +914,17 @@ struct buf *
 #ifdef SECSIZE
 getblk(dev, blkno, size, secsize)
 #else SECSIZE
 #ifdef SECSIZE
 getblk(dev, blkno, size, secsize)
 #else SECSIZE
-getblk(vp, blkno, size)
+getblk(vp, blkno, size, slpflag, slptimeo)
        register struct vnode *vp;
        daddr_t blkno;
        register struct vnode *vp;
        daddr_t blkno;
-       int size;
+       int size, slpflag, slptimeo;
 #ifdef SECSIZE
        long secsize;
 #endif SECSIZE
 {
 #ifdef SECSIZE
        long secsize;
 #endif SECSIZE
 {
-       register struct buf *bp, *dp;
-       int s;
+       register struct buf *bp;
+       struct list_entry *dp;
+       int s, error;
 
        if (size > MAXBSIZE)
                panic("getblk: size too big");
 
        if (size > MAXBSIZE)
                panic("getblk: size too big");
@@ -331,30 +935,52 @@ getblk(vp, blkno, size)
         */
        dp = BUFHASH(vp, blkno);
 loop:
         */
        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))
+       for (bp = dp->le_next; bp; bp = bp->b_hash.qe_next) {
+               if (bp->b_lblkno != blkno || bp->b_vp != vp)
                        continue;
                s = splbio();
                if (bp->b_flags & B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        continue;
                s = splbio();
                if (bp->b_flags & B_BUSY) {
                        bp->b_flags |= B_WANTED;
-                       sleep((caddr_t)bp, PRIBIO + 1);
+                       error = tsleep((caddr_t)bp, slpflag | (PRIBIO + 1),
+                               "getblk", slptimeo);
                        splx(s);
                        splx(s);
+                       if (error)
+                               return (NULL);
                        goto loop;
                }
                        goto loop;
                }
+               /*
+                * The test for B_INVAL is moved down here, since there
+                * are cases where B_INVAL is set before VOP_BWRITE() is
+                * called and for NFS, the process cannot be allowed to
+                * allocate a new buffer for the same block until the write
+                * back to the server has been completed. (ie. B_BUSY clears)
+                */
+               if (bp->b_flags & B_INVAL) {
+                       splx(s);
+                       continue;
+               }
                bremfree(bp);
                bp->b_flags |= B_BUSY;
                splx(s);
                if (bp->b_bcount != size) {
                        printf("getblk: stray size");
                        bp->b_flags |= B_INVAL;
                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);
+                       VOP_BWRITE(bp);
                        goto loop;
                }
                bp->b_flags |= B_CACHE;
                return (bp);
        }
                        goto loop;
                }
                bp->b_flags |= B_CACHE;
                return (bp);
        }
-       bp = getnewbuf();
+       /*
+        * The loop back to the top when getnewbuf() fails is because
+        * stateless filesystems like NFS have no node locks. Thus,
+        * there is a slight chance that more than one process will
+        * try and getnewbuf() for the same block concurrently when
+        * the first sleeps in getnewbuf(). So after a sleep, go back
+        * up to the top to check the hash lists again.
+        */
+       if ((bp = getnewbuf(slpflag, slptimeo)) == 0)
+               goto loop;
        bremhash(bp);
        bgetvp(vp, bp);
        bp->b_bcount = 0;
        bremhash(bp);
        bgetvp(vp, bp);
        bp->b_bcount = 0;
@@ -378,21 +1004,21 @@ struct buf *
 geteblk(size)
        int size;
 {
 geteblk(size)
        int size;
 {
-       register struct buf *bp, *flist;
+       register struct buf *bp;
 
        if (size > MAXBSIZE)
                panic("geteblk: size too big");
 
        if (size > MAXBSIZE)
                panic("geteblk: size too big");
-       bp = getnewbuf();
+       while ((bp = getnewbuf(0, 0)) == NULL)
+               /* void */;
        bp->b_flags |= B_INVAL;
        bremhash(bp);
        bp->b_flags |= B_INVAL;
        bremhash(bp);
-       flist = &bfreelist[BQ_AGE];
+       binshash(bp, &invalhash);
        bp->b_bcount = 0;
 #ifdef SECSIZE
        bp->b_blksize = DEV_BSIZE;
 #endif SECSIZE
        bp->b_error = 0;
        bp->b_resid = 0;
        bp->b_bcount = 0;
 #ifdef SECSIZE
        bp->b_blksize = DEV_BSIZE;
 #endif SECSIZE
        bp->b_error = 0;
        bp->b_resid = 0;
-       binshash(bp, flist);
        allocbuf(bp, size);
        return (bp);
 }
        allocbuf(bp, size);
        return (bp);
 }
@@ -422,8 +1048,7 @@ allocbuf(tp, size)
         * extra space in the present buffer.
         */
        if (sizealloc < tp->b_bufsize) {
         * extra space in the present buffer.
         */
        if (sizealloc < tp->b_bufsize) {
-               ep = bfreelist[BQ_EMPTY].av_forw;
-               if (ep == &bfreelist[BQ_EMPTY])
+               if ((ep = bufqueues[BQ_EMPTY].qe_next) == NULL)
                        goto out;
                s = splbio();
                bremfree(ep);
                        goto out;
                s = splbio();
                bremfree(ep);
@@ -445,7 +1070,8 @@ allocbuf(tp, size)
         */
        while (tp->b_bufsize < sizealloc) {
                take = sizealloc - tp->b_bufsize;
         */
        while (tp->b_bufsize < sizealloc) {
                take = sizealloc - tp->b_bufsize;
-               bp = getnewbuf();
+               while ((bp = getnewbuf(0, 0)) == NULL)
+                       /* void */;
                if (take >= bp->b_bufsize)
                        take = bp->b_bufsize;
                pagemove(&bp->b_un.b_addr[bp->b_bufsize - take],
                if (take >= bp->b_bufsize)
                        take = bp->b_bufsize;
                pagemove(&bp->b_un.b_addr[bp->b_bufsize - take],
@@ -456,7 +1082,7 @@ allocbuf(tp, size)
                        bp->b_bcount = bp->b_bufsize;
                if (bp->b_bufsize <= 0) {
                        bremhash(bp);
                        bp->b_bcount = bp->b_bufsize;
                if (bp->b_bufsize <= 0) {
                        bremhash(bp);
-                       binshash(bp, &bfreelist[BQ_EMPTY]);
+                       binshash(bp, &invalhash);
                        bp->b_dev = NODEV;
                        bp->b_error = 0;
                        bp->b_flags |= B_INVAL;
                        bp->b_dev = NODEV;
                        bp->b_error = 0;
                        bp->b_flags |= B_INVAL;
@@ -474,24 +1100,27 @@ out:
  * Preference is to AGE list, then LRU list.
  */
 struct buf *
  * Preference is to AGE list, then LRU list.
  */
 struct buf *
-getnewbuf()
+getnewbuf(slpflag, slptimeo)
+       int slpflag, slptimeo;
 {
 {
-       register struct buf *bp, *dp;
+       register struct buf *bp;
+       register struct queue_entry *dp;
        register struct ucred *cred;
        int s;
 
 loop:
        s = splbio();
        register struct ucred *cred;
        int s;
 
 loop:
        s = splbio();
-       for (dp = &bfreelist[BQ_AGE]; dp > bfreelist; dp--)
-               if (dp->av_forw != dp)
+       for (dp = &bufqueues[BQ_AGE]; dp > bufqueues; dp--)
+               if (dp->qe_next)
                        break;
                        break;
-       if (dp == bfreelist) {          /* no free blocks */
-               dp->b_flags |= B_WANTED;
-               sleep((caddr_t)dp, PRIBIO + 1);
+       if (dp == bufqueues) {          /* no free blocks */
+               needbuffer = 1;
+               (void) tsleep((caddr_t)&needbuffer, slpflag | (PRIBIO + 1),
+                       "getnewbuf", slptimeo);
                splx(s);
                splx(s);
-               goto loop;
+               return (NULL);
        }
        }
-       bp = dp->av_forw;
+       bp = dp->qe_next;
        bremfree(bp);
        bp->b_flags |= B_BUSY;
        splx(s);
        bremfree(bp);
        bp->b_flags |= B_BUSY;
        splx(s);
@@ -514,6 +1143,7 @@ loop:
        }
        bp->b_flags = B_BUSY;
        bp->b_dirtyoff = bp->b_dirtyend = 0;
        }
        bp->b_flags = B_BUSY;
        bp->b_dirtyoff = bp->b_dirtyend = 0;
+       bp->b_validoff = bp->b_validend = 0;
        return (bp);
 }
 
        return (bp);
 }
 
@@ -546,26 +1176,16 @@ biowait(bp)
  * If a callback has been requested, e.g. the pageout
  * daemon, do so. Otherwise, awaken waiting processes.
  */
  * If a callback has been requested, e.g. the pageout
  * daemon, do so. Otherwise, awaken waiting processes.
  */
+void
 biodone(bp)
        register struct buf *bp;
 {
 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_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_READ) == 0)
+               vwakeup(bp);
        if (bp->b_flags & B_CALL) {
                bp->b_flags &= ~B_CALL;
                (*bp->b_iodone)(bp);
        if (bp->b_flags & B_CALL) {
                bp->b_flags &= ~B_CALL;
                (*bp->b_iodone)(bp);
@@ -579,251 +1199,48 @@ biodone(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;
+int
+count_lock_queue()
 {
        register struct buf *bp;
 {
        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.
- */
-mntinvalbuf(mountp)
-       struct mount *mountp;
-{
-       register struct vnode *vp;
-       int dirty = 0;
+       register int ret;
 
 
-       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);
+       for (ret = 0, bp = (struct buf *)bufqueues[BQ_LOCKED].qe_next;
+           bp; bp = (struct buf *)bp->b_freelist.qe_next)
+               ++ret;
+       return(ret);
 }
 
 }
 
+#ifdef DIAGNOSTIC
 /*
 /*
- * Flush out and invalidate all buffers associated with a vnode.
- * Called with the underlying object locked.
+ * Print out statistics on the current allocation of the buffer pool.
+ * Can be enabled to print out on every ``sync'' by setting "syncprt"
+ * above.
  */
  */
-vinvalbuf(vp, save)
-       register struct vnode *vp;
-       int save;
+void
+vfs_bufstats()
 {
 {
+       int s, i, j, count;
        register struct buf *bp;
        register struct buf *bp;
-       struct buf *nbp, *blist;
-       int s, dirty = 0;
+       register struct queue_entry *dp;
+       int counts[MAXBSIZE/CLBYTES+1];
+       static char *bname[BQUEUES] = { "LOCKED", "LRU", "AGE", "EMPTY" };
 
 
-       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);
+       for (dp = bufqueues, i = 0; dp < &bufqueues[BQUEUES]; dp++, i++) {
+               count = 0;
+               for (j = 0; j <= MAXBSIZE/CLBYTES; j++)
+                       counts[j] = 0;
+               s = splbio();
+               for (bp = dp->qe_next; bp; bp = bp->b_freelist.qe_next) {
+                       counts[bp->b_bufsize/CLBYTES]++;
+                       count++;
                }
                }
-       }
-       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)
-       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.
-        */
-       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;
+               splx(s);
+               printf("%s: total-%d", bname[i], count);
+               for (j = 0; j <= MAXBSIZE/CLBYTES; j++)
+                       if (counts[j] != 0)
+                               printf(", %d-%d", j * CLBYTES, counts[j]);
+               printf("\n");
        }
 }
        }
 }
+#endif /* DIAGNOSTIC */