lstat of symbolic link returns attributes of its containing directory
[unix-history] / usr / src / sys / kern / vfs_bio.c
index fc101f6..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.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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.
+ * 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.12 (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));
+
+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;
 
 
-#include "param.h"
-#include "user.h"
-#include "buf.h"
-#include "vnode.h"
-#include "trace.h"
-#include "ucred.h"
+       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);
+       }
+}
 
 /*
 
 /*
- * 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;
@@ -37,6 +134,7 @@ bread(vp, blkno, size, cred, bpp)
        long secsize;
 #endif SECSIZE
 {
        long secsize;
 #endif SECSIZE
 {
+       struct proc *p = curproc;               /* XXX */
        register struct buf *bp;
 
        if (size == 0)
        register struct buf *bp;
 
        if (size == 0)
@@ -44,10 +142,10 @@ 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
 #endif SECSIZE
-       if (bp->b_flags&(B_DONE|B_DELWRI)) {
-               trace(TR_BREADHIT, pack(vp->v_mount->m_fsid[0], size), blkno);
+       if (bp->b_flags & (B_DONE | B_DELWRI)) {
+               trace(TR_BREADHIT, pack(vp, size), blkno);
                return (0);
        }
        bp->b_flags |= B_READ;
                return (0);
        }
        bp->b_flags |= B_READ;
@@ -58,66 +156,68 @@ bread(vp, blkno, size, cred, bpp)
                bp->b_rcred = cred;
        }
        VOP_STRATEGY(bp);
                bp->b_rcred = cred;
        }
        VOP_STRATEGY(bp);
-       trace(TR_BREADMISS, pack(vp->v_mount->m_fsid[0], size), blkno);
-       u.u_ru.ru_inblock++;            /* pay for read */
+       trace(TR_BREADMISS, pack(vp, size), blkno);
+       p->p_stats->p_ru.ru_inblock++;          /* pay for read */
        return (biowait(bp));
 }
 
 /*
        return (biowait(bp));
 }
 
 /*
- * 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 N 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 ucred *cred;
        struct buf **bpp;
 {
+       struct proc *p = curproc;               /* XXX */
        register struct buf *bp, *rabp;
        register struct buf *bp, *rabp;
+       register int i;
 
        bp = NULL;
        /*
 
        bp = NULL;
        /*
-        * If the block isn't in core, then allocate
-        * a buffer and initiate i/o (getblk checks
-        * for a cache hit).
+        * If the block is not memory resident,
+        * allocate a buffer and start I/O.
         */
        if (!incore(vp, blkno)) {
         */
        if (!incore(vp, blkno)) {
-               *bpp = bp = getblk(vp, blkno, size);
+               *bpp = bp = getblk(vp, blkno, size, 0, 0);
 #endif SECSIZE
 #endif SECSIZE
-               if ((bp->b_flags&(B_DONE|B_DELWRI)) == 0) {
+               if ((bp->b_flags & (B_DONE | B_DELWRI)) == 0) {
                        bp->b_flags |= B_READ;
                        if (bp->b_bcount > bp->b_bufsize)
                        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;
                        }
                        VOP_STRATEGY(bp);
                        if (bp->b_rcred == NOCRED && cred != NOCRED) {
                                crhold(cred);
                                bp->b_rcred = cred;
                        }
                        VOP_STRATEGY(bp);
-                       trace(TR_BREADMISS, pack(vp->v_mount->m_fsid[0], size),
-                           blkno);
-                       u.u_ru.ru_inblock++;            /* pay for read */
-               } else
-                       trace(TR_BREADHIT, pack(vp->v_mount->m_fsid[0], size),
-                           blkno);
+                       trace(TR_BREADMISS, pack(vp, size), blkno);
+                       p->p_stats->p_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).
+        * If there's read-ahead block(s), start I/O
+        * on them also (as above).
         */
         */
-       if (rablkno && !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
 #endif SECSIZE
-               if (rabp->b_flags & (B_DONE|B_DELWRI)) {
+               if (rabp->b_flags & (B_DONE | B_DELWRI)) {
                        brelse(rabp);
                        brelse(rabp);
-                       trace(TR_BREADHITRA,
-                           pack(vp->v_mount->m_fsid[0], rabsize), rablkno);
+                       trace(TR_BREADHITRA, pack(vp, rabsize[i]), rablkno[i]);
                } else {
                } else {
-                       rabp->b_flags |= B_READ|B_ASYNC;
+                       rabp->b_flags |= B_ASYNC | B_READ;
                        if (rabp->b_bcount > rabp->b_bufsize)
                                panic("breadrabp");
                        if (rabp->b_rcred == NOCRED && cred != NOCRED) {
                        if (rabp->b_bcount > rabp->b_bufsize)
                                panic("breadrabp");
                        if (rabp->b_rcred == NOCRED && cred != NOCRED) {
@@ -125,16 +225,15 @@ 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->v_mount->m_fsid[0], rabsize), rablkno);
-                       u.u_ru.ru_inblock++;            /* pay in advance */
+                       trace(TR_BREADMISSRA, pack(vp, rabsize[i]), rablkno[i]);
+                       p->p_stats->p_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 block was memory resident, let bread get it.
+        * If block was not memory resident, the read was
+        * started above, so just wait for the read to complete.
         */
        if (bp == NULL)
 #ifdef SECSIZE
         */
        if (bp == NULL)
 #ifdef SECSIZE
@@ -145,260 +244,747 @@ breada(vp, blkno, size, rablkno, rabsize, cred, bpp)
 }
 
 /*
 }
 
 /*
- * Write the buffer, waiting for completion.
- * Then release the buffer.
+ * 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.
  */
 bwrite(bp)
        register struct buf *bp;
 {
  */
 bwrite(bp)
        register struct buf *bp;
 {
+       struct proc *p = curproc;               /* XXX */
        register int flag;
        register int flag;
-       int 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)
-               u.u_ru.ru_oublock++;            /* noone paid yet */
-       trace(TR_BWRITE,
-           pack(bp->b_vp->v_mount->m_fsid[0], bp->b_bcount), bp->b_blkno);
+       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");
        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);
 
        /*
        VOP_STRATEGY(bp);
 
        /*
-        * If the write was synchronous, then await i/o completion.
+        * If the write was synchronous, then await I/O completion.
         * If the write was "delayed", then we put the buffer on
         * If the write was "delayed", then we put the buffer on
-        * the q of blocks awaiting i/o completion status.
+        * the queue of blocks awaiting I/O completion status.
         */
         */
-       if ((flag&B_ASYNC) == 0) {
+       if ((flag & B_ASYNC) == 0) {
                error = biowait(bp);
                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));
+}
+
+
 /*
 /*
- * 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;
 {
+       struct proc *p = curproc;               /* XXX */
 
 
-       if ((bp->b_flags&B_DELWRI) == 0)
-               u.u_ru.ru_oublock++;            /* noone paid yet */
-#ifdef notdef
+       if ((bp->b_flags & B_DELWRI) == 0) {
+               bp->b_flags |= B_DELWRI;
+               reassignbuf(bp, bp->b_vp);
+               p->p_stats->p_ru.ru_oublock++;          /* no one paid yet */
+       }
        /*
        /*
-        * This does not work for buffers associated with
-        * vnodes that are remote - they have no dev.
-        * Besides, we don't use bio with tapes, so rather
-        * than develop a fix, we just ifdef this out for now.
+        * If this is a tape drive, the write must be initiated.
         */
        if (bdevsw[major(bp->b_dev)].d_flags & B_TAPE)
                bawrite(bp);
         */
        if (bdevsw[major(bp->b_dev)].d_flags & B_TAPE)
                bawrite(bp);
-       else {
-               bp->b_flags |= B_DELWRI | B_DONE;
+       else {
+               bp->b_flags |= (B_DONE | B_DELWRI);
                brelse(bp);
        }
                brelse(bp);
        }
-#endif
-       bp->b_flags |= B_DELWRI | B_DONE;
-       brelse(bp);
 }
 
 /*
 }
 
 /*
- * 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;
 {
 
+       /*
+        * Setting the ASYNC flag causes bwrite to return
+        * after starting the I/O.
+        */
        bp->b_flags |= B_ASYNC;
        bp->b_flags |= B_ASYNC;
-       (void) bwrite(bp);
+       (void) VOP_BWRITE(bp);
 }
 
 /*
 }
 
 /*
- * Release the buffer, with no I/O implied.
+ * 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;
+       }
+}
+
+/*
+ * 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;
+       register struct queue_entry *flist;
+       int s;
 
 
-       trace(TR_BRELSE,
-           pack(bp->b_vp->v_mount->m_fsid[0], bp->b_bufsize), bp->b_blkno);
+       trace(TR_BRELSE, pack(bp->b_vp, bp->b_bufsize), bp->b_lblkno);
        /*
        /*
-        * If someone's waiting for the buffer, or
-        * is waiting for a buffer wake 'em up.
+        * If a process is waiting for the buffer, or
+        * is waiting for a free buffer, awaken it.
         */
         */
-       if (bp->b_flags&B_WANTED)
+       if (bp->b_flags & B_WANTED)
                wakeup((caddr_t)bp);
                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);
        }
        }
-       if (bp->b_flags & B_NOCACHE) {
+       /*
+        * 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;
+       /*
+        * Disassociate buffers that are no longer valid.
+        */
+       if (bp->b_flags & (B_NOCACHE | B_ERROR))
                bp->b_flags |= B_INVAL;
                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;
        }
        }
-       if (bp->b_flags&B_ERROR)
-               if (bp->b_flags & B_LOCKED)
-                       bp->b_flags &= ~B_ERROR;        /* try again later */
-               else
-                       brelvp(bp);                     /* no assoc */
-
        /*
         * 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);
                binsheadfree(bp, flist);
-       } else if (bp->b_flags & (B_ERROR|B_INVAL)) {
+       } else if (bp->b_flags & (B_ERROR | B_INVAL)) {
                /* block has no info ... put at front of most free list */
                /* 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);
        }
                binstailfree(bp, flist);
        }
-       bp->b_flags &= ~(B_WANTED|B_BUSY|B_ASYNC|B_AGE|B_NOCACHE);
+       bp->b_flags &= ~(B_WANTED | B_BUSY | B_ASYNC | B_AGE | B_NOCACHE);
        splx(s);
 }
 
 /*
        splx(s);
 }
 
 /*
- * 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.
  */
  */
+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)
-               if (bp->b_blkno == blkno && bp->b_vp == vp &&
+       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)
                    (bp->b_flags & B_INVAL) == 0)
-                       return (1);
-       return (0);
-}
-
-baddr(vp, blkno, size, cred, bpp)
-       struct vnode *vp;
-       daddr_t blkno;
-       int size;
-       struct ucred *cred;
-       struct buf **bpp;
-#ifdef SECSIZE
-       long secsize;
-#endif SECSIZE
-{
-
-       if (incore(vp, blkno))
-               return (bread(vp, blkno, size, cred, bpp));
-       *bpp = 0;
-#endif SECSIZE
-       return (0);
+                       return (bp);
+       return (NULL);
 }
 
 /*
 }
 
 /*
- * 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.
- *
- * If we find the buffer, but it is dirty (marked DELWRI) and
- * its size is changing, we must write it out first. When the
- * buffer is shrinking, the write is done by brealloc to avoid
- * losing the unwritten data. When the buffer is growing, the
- * write is done by getblk, so that bread will not read stale
- * disk data over the modified data in the buffer.
- *
- * 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 *
 #ifdef SECSIZE
 getblk(dev, blkno, size, secsize)
 #else SECSIZE
  */
 struct buf *
 #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");
        /*
-        * To prevent overflow of 32-bit ints when converting block
-        * numbers to byte offsets, blknos > 2^32 / DEV_BSIZE are set
-        * to the maximum number that can be converted to a byte offset
-        * without overflow. This is historic code; what bug it fixed,
-        * or whether it is still a reasonable thing to do is open to
-        * dispute. mkm 9/85
-        */
-       if ((unsigned)blkno >= 1 << (sizeof(int)*NBBY-DEV_BSHIFT))
-               blkno = 1 << ((sizeof(int)*NBBY-DEV_BSHIFT) + 1);
-       /*
-        * 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.
+        * Search the cache for the block. If the buffer is found,
+        * but it is currently locked, the we must wait for it to
+        * become available.
         */
        dp = BUFHASH(vp, blkno);
 loop:
         */
        dp = BUFHASH(vp, blkno);
 loop:
-       for (bp = dp->b_forw; bp != dp; bp = bp->b_forw) {
-               if (bp->b_blkno != 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();
                        continue;
                s = splbio();
-               if (bp->b_flags&B_BUSY) {
+               if (bp->b_flags & B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        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);
                splx(s);
-               notavail(bp);
                if (bp->b_bcount != size) {
                if (bp->b_bcount != size) {
-                       if (bp->b_bcount < size && (bp->b_flags&B_DELWRI)) {
-                               bp->b_flags &= ~B_ASYNC;
-                               (void) bwrite(bp);
-                               goto loop;
-                       }
-                       if (brealloc(bp, size) == 0)
-                               goto loop;
-               }
-               if (bp->b_bcount != size && brealloc(bp, size) == 0)
+                       printf("getblk: stray size");
+                       bp->b_flags |= B_INVAL;
+                       VOP_BWRITE(bp);
                        goto loop;
                        goto loop;
+               }
                bp->b_flags |= B_CACHE;
                return (bp);
        }
                bp->b_flags |= B_CACHE;
                return (bp);
        }
-       bp = getnewbuf();
-       bfree(bp);
+       /*
+        * 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);
        bremhash(bp);
-       if (bp->b_vp)
-               brelvp(bp);
-       VREF(vp);
-       bp->b_vp = vp;
-       bp->b_dev = vp->v_rdev;
+       bgetvp(vp, bp);
+       bp->b_bcount = 0;
+       bp->b_lblkno = blkno;
 #ifdef SECSIZE
        bp->b_blksize = secsize;
 #endif SECSIZE
 #ifdef SECSIZE
        bp->b_blksize = secsize;
 #endif SECSIZE
@@ -406,120 +992,106 @@ loop:
        bp->b_error = 0;
        bp->b_resid = 0;
        binshash(bp, dp);
        bp->b_error = 0;
        bp->b_resid = 0;
        binshash(bp, dp);
-       if (brealloc(bp, size) == 0)
-               goto loop;
+       allocbuf(bp, size);
        return (bp);
 }
 
 /*
        return (bp);
 }
 
 /*
- * 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;
+       register struct buf *bp;
 
        if (size > MAXBSIZE)
                panic("geteblk: size too big");
 
        if (size > MAXBSIZE)
                panic("geteblk: size too big");
-loop:
-       bp = getnewbuf();
+       while ((bp = getnewbuf(0, 0)) == NULL)
+               /* void */;
        bp->b_flags |= B_INVAL;
        bp->b_flags |= B_INVAL;
-       bfree(bp);
        bremhash(bp);
        bremhash(bp);
-       flist = &bfreelist[BQ_AGE];
-       brelvp(bp);
+       binshash(bp, &invalhash);
+       bp->b_bcount = 0;
 #ifdef SECSIZE
        bp->b_blksize = DEV_BSIZE;
 #endif SECSIZE
        bp->b_error = 0;
        bp->b_resid = 0;
 #ifdef SECSIZE
        bp->b_blksize = DEV_BSIZE;
 #endif SECSIZE
        bp->b_error = 0;
        bp->b_resid = 0;
-       binshash(bp, flist);
-       if (brealloc(bp, size) == 0)
-               goto loop;
+       allocbuf(bp, size);
        return (bp);
 }
 
 /*
        return (bp);
 }
 
 /*
- * Allocate space associated with a buffer.
- * If can't get space, buffer is released
+ * 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;
+       register struct buf *bp, *ep;
+       int sizealloc, take, s;
 
 
+       sizealloc = roundup(size, CLBYTES);
        /*
        /*
-        * First need to make sure that all overlapping previous I/O
-        * is dispatched with.
+        * Buffer size does not change
         */
         */
-       if (size == bp->b_bcount)
-               return (1);
-       if (size < bp->b_bcount) { 
-               if (bp->b_flags & B_DELWRI) {
-                       (void) bwrite(bp);
-                       return (0);
-               }
-               if (bp->b_flags & B_LOCKED)
-                       panic("brealloc");
-               return (allocbuf(bp, size));
-       }
-       bp->b_flags &= ~B_DONE;
-       if (bp->b_vp == (struct vnode *)0)
-               return (allocbuf(bp, size));
-
-       trace(TR_BREALLOC,
-           pack(bp->b_vp->v_mount->m_fsid[0], size), bp->b_blkno);
+       if (sizealloc == tp->b_bufsize)
+               goto out;
        /*
        /*
-        * Search cache for any buffers that overlap the one that we
-        * are trying to allocate. Overlapping buffers must be marked
-        * invalid, after being written out if they are dirty. (indicated
-        * by B_DELWRI) A disk block must be mapped by at most one buffer
-        * at any point in time. Care must be taken to avoid deadlocking
-        * when two buffer are trying to get the same set of disk blocks.
+        * Buffer size is shrinking.
+        * Place excess space in a buffer header taken from the
+        * BQ_EMPTY buffer list and placed on the "most free" list.
+        * If no extra buffer headers are available, leave the
+        * extra space in the present buffer.
         */
         */
-       start = bp->b_blkno;
-#ifdef SECSIZE
-       last = start + size/bp->b_blksize - 1;
-#else SECSIZE
-       last = start + btodb(size) - 1;
-#endif SECSIZE
-       dp = BUFHASH(bp->b_vp, bp->b_blkno);
-loop:
-       for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {
-               if (ep == bp || ep->b_vp != bp->b_vp ||
-                   (ep->b_flags & B_INVAL))
-                       continue;
-               /* look for overlap */
-               if (ep->b_bcount == 0 || ep->b_blkno > last ||
-#ifdef SECSIZE
-                   ep->b_blkno + ep->b_bcount/ep->b_blksize <= start)
-#else SECSIZE
-                   ep->b_blkno + btodb(ep->b_bcount) <= start)
-#endif SECSIZE
-                       continue;
+       if (sizealloc < tp->b_bufsize) {
+               if ((ep = bufqueues[BQ_EMPTY].qe_next) == NULL)
+                       goto out;
                s = splbio();
                s = splbio();
-               if (ep->b_flags&B_BUSY) {
-                       ep->b_flags |= B_WANTED;
-                       sleep((caddr_t)ep, PRIBIO+1);
-                       splx(s);
-                       goto loop;
-               }
+               bremfree(ep);
+               ep->b_flags |= B_BUSY;
                splx(s);
                splx(s);
-               notavail(ep);
-               if (ep->b_flags & B_DELWRI) {
-                       (void) bwrite(ep);
-                       goto loop;
-               }
+               pagemove(tp->b_un.b_addr + sizealloc, ep->b_un.b_addr,
+                   (int)tp->b_bufsize - sizealloc);
+               ep->b_bufsize = tp->b_bufsize - sizealloc;
+               tp->b_bufsize = sizealloc;
                ep->b_flags |= B_INVAL;
                ep->b_flags |= B_INVAL;
+               ep->b_bcount = 0;
                brelse(ep);
                brelse(ep);
+               goto out;
        }
        }
-       return (allocbuf(bp, size));
+       /*
+        * More buffer space is needed. Get it out of buffers on
+        * the "most free" list, placing the empty headers on the
+        * BQ_EMPTY buffer header list.
+        */
+       while (tp->b_bufsize < sizealloc) {
+               take = sizealloc - tp->b_bufsize;
+               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],
+                   &tp->b_un.b_addr[tp->b_bufsize], take);
+               tp->b_bufsize += take;
+               bp->b_bufsize = bp->b_bufsize - take;
+               if (bp->b_bcount > bp->b_bufsize)
+                       bp->b_bcount = bp->b_bufsize;
+               if (bp->b_bufsize <= 0) {
+                       bremhash(bp);
+                       binshash(bp, &invalhash);
+                       bp->b_dev = NODEV;
+                       bp->b_error = 0;
+                       bp->b_flags |= B_INVAL;
+               }
+               brelse(bp);
+       }
+out:
+       tp->b_bcount = size;
+       return (1);
 }
 
 /*
 }
 
 /*
@@ -528,33 +1100,37 @@ loop:
  * 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->qe_next;
+       bremfree(bp);
+       bp->b_flags |= B_BUSY;
        splx(s);
        splx(s);
-       bp = dp->av_forw;
-       notavail(bp);
        if (bp->b_flags & B_DELWRI) {
                (void) bawrite(bp);
                goto loop;
        }
        if (bp->b_flags & B_DELWRI) {
                (void) bawrite(bp);
                goto loop;
        }
-       trace(TR_BRELSE,
-           pack(bp->b_vp->v_mount->m_fsid[0], bp->b_bufsize), bp->b_blkno);
-       brelvp(bp);
+       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;
        if (bp->b_rcred != NOCRED) {
                cred = bp->b_rcred;
                bp->b_rcred = NOCRED;
@@ -566,12 +1142,17 @@ loop:
                crfree(cred);
        }
        bp->b_flags = B_BUSY;
                crfree(cred);
        }
        bp->b_flags = B_BUSY;
+       bp->b_dirtyoff = bp->b_dirtyend = 0;
+       bp->b_validoff = bp->b_validend = 0;
        return (bp);
 }
 
 /*
        return (bp);
 }
 
 /*
- * 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;
@@ -582,10 +1163,6 @@ biowait(bp)
        while ((bp->b_flags & B_DONE) == 0)
                sleep((caddr_t)bp, PRIBIO);
        splx(s);
        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.
-        */
        if ((bp->b_flags & B_ERROR) == 0)
                return (0);
        if (bp->b_error)
        if ((bp->b_flags & B_ERROR) == 0)
                return (0);
        if (bp->b_error)
@@ -595,10 +1172,11 @@ biowait(bp)
 
 /*
  * Mark I/O complete on a buffer.
 
 /*
  * 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.
+ *
+ * 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;
 {
@@ -607,13 +1185,13 @@ biodone(bp)
                panic("dup biodone");
        bp->b_flags |= B_DONE;
        if ((bp->b_flags & B_READ) == 0)
                panic("dup biodone");
        bp->b_flags |= B_DONE;
        if ((bp->b_flags & B_READ) == 0)
-               bp->b_dirtyoff = bp->b_dirtyend = 0;
+               vwakeup(bp);
        if (bp->b_flags & B_CALL) {
                bp->b_flags &= ~B_CALL;
                (*bp->b_iodone)(bp);
                return;
        }
        if (bp->b_flags & B_CALL) {
                bp->b_flags &= ~B_CALL;
                (*bp->b_iodone)(bp);
                return;
        }
-       if (bp->b_flags&B_ASYNC)
+       if (bp->b_flags & B_ASYNC)
                brelse(bp);
        else {
                bp->b_flags &= ~B_WANTED;
                brelse(bp);
        else {
                bp->b_flags &= ~B_WANTED;
@@ -621,149 +1199,48 @@ biodone(bp)
        }
 }
 
        }
 }
 
-/*
- * Ensure that no part of a specified block is in an incore buffer.
-#ifdef SECSIZE
- * "size" is given in device blocks (the units of b_blkno).
-#endif SECSIZE
-#ifdef SECSIZE
- * "size" is given in device blocks (the units of b_blkno).
-#endif SECSIZE
- */
-blkflush(vp, blkno, size)
-       struct vnode *vp;
-       daddr_t blkno;
-#ifdef SECSIZE
-       int size;
-#else SECSIZE
-       long size;
-#endif SECSIZE
-{
-       register struct buf *ep;
-       struct buf *dp;
-       daddr_t start, last;
-       int s, error, allerrors = 0;
-
-       start = blkno;
-#ifdef SECSIZE
-       last = start + size - 1;
-#else SECSIZE
-       last = start + btodb(size) - 1;
-#endif SECSIZE
-       dp = BUFHASH(vp, blkno);
-loop:
-       for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {
-               if (ep->b_vp != vp || (ep->b_flags & B_INVAL))
-                       continue;
-               /* look for overlap */
-               if (ep->b_bcount == 0 || ep->b_blkno > last ||
-#ifdef SECSIZE
-                   ep->b_blkno + ep->b_bcount / ep->b_blksize <= start)
-#else SECSIZE
-                   ep->b_blkno + btodb(ep->b_bcount) <= start)
-#endif SECSIZE
-                       continue;
-               s = splbio();
-               if (ep->b_flags&B_BUSY) {
-                       ep->b_flags |= B_WANTED;
-                       sleep((caddr_t)ep, PRIBIO+1);
-                       splx(s);
-                       goto loop;
-               }
-               if (ep->b_flags & B_DELWRI) {
-                       splx(s);
-                       notavail(ep);
-                       if (error = bwrite(ep))
-                               allerrors = error;
-                       goto loop;
-               }
-               splx(s);
-       }
-       return (allerrors);
-}
-
-/*
- * Make sure all write-behind blocks associated
- * with mount point are flushed out (from sync).
- */
-bflush(mountp)
-       struct mount *mountp;
+int
+count_lock_queue()
 {
        register struct buf *bp;
 {
        register struct buf *bp;
-       register struct buf *flist;
-       int s;
+       register int ret;
 
 
-loop:
-       s = splbio();
-       for (flist = bfreelist; flist < &bfreelist[BQ_EMPTY]; flist++) {
-               for (bp = flist->av_forw; bp != flist; bp = bp->av_forw) {
-                       if ((bp->b_flags & B_BUSY))
-                               continue;
-                       if ((bp->b_flags & B_DELWRI) == 0)
-                               continue;
-                       if (bp->b_vp && bp->b_vp->v_mount == mountp) {
-                               splx(s);
-                               notavail(bp);
-                               (void) bawrite(bp);
-                               goto loop;
-                       }
-               }
-       }
-       splx(s);
+       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
 /*
 /*
- * Invalidate in core blocks belonging to closed or umounted filesystem
- *
- * We walk through the buffer pool and invalidate any buffers for the
- * indicated mount point. 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. We return the count of dirty buffers when
- * we are finished.
+ * Print out statistics on the current allocation of the buffer pool.
+ * Can be enabled to print out on every ``sync'' by setting "syncprt"
+ * above.
  */
  */
-binval(mountp)
-       struct mount *mountp;
+void
+vfs_bufstats()
 {
 {
+       int s, i, j, count;
        register struct buf *bp;
        register struct buf *bp;
-       register struct bufhd *hp;
-       int s, dirty = 0;
-#define dp ((struct buf *)hp)
+       register struct queue_entry *dp;
+       int counts[MAXBSIZE/CLBYTES+1];
+       static char *bname[BQUEUES] = { "LOCKED", "LRU", "AGE", "EMPTY" };
 
 
-loop:
-       for (hp = bufhash; hp < &bufhash[BUFHSZ]; hp++) {
-               for (bp = dp->b_forw; bp != dp; bp = bp->b_forw) {
-                       if (bp->b_vp == NULL || bp->b_vp->v_mount != mountp)
-                               continue;
-                       s = splbio();
-                       if (bp->b_flags & B_BUSY) {
-                               bp->b_flags |= B_WANTED;
-                               sleep((caddr_t)bp, PRIBIO+1);
-                               splx(s);
-                               goto loop;
-                       }
-                       splx(s);
-                       notavail(bp);
-                       if (bp->b_flags & B_DELWRI) {
-                               (void) bawrite(bp);
-                               dirty++;
-                               continue;
-                       }
-                       bp->b_flags |= B_INVAL;
-                       brelvp(bp);
-                       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++;
                }
                }
+               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");
        }
        }
-       return (dirty);
-}
-
-brelvp(bp)
-       struct buf *bp;
-{
-       struct vnode *vp;
-
-       if (bp->b_vp == (struct vnode *) 0)
-               return;
-       vp = bp->b_vp;
-       bp->b_vp = (struct vnode *) 0;
-       vrele(vp);
 }
 }
+#endif /* DIAGNOSTIC */