typo

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

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 8b3282d..4f74f8f 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,43 +1,61 @@
-/*     vfs_cluster.c   4.39    82/11/13        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/pte.h"
-#include "../h/vm.h"
-#include "../h/trace.h"
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)vfs_cluster.c       7.3 (Berkeley) %G%
+ */
+
+#include "../machine/pte.h"
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "conf.h"
+#include "proc.h"
+#include "seg.h"
+#include "vm.h"
+#include "trace.h"

 
 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */
 struct buf *
 
 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */
 struct buf *

+#ifdef SECSIZE
+bread(dev, blkno, size, secsize)
+#else SECSIZE

 bread(dev, blkno, size)
 bread(dev, blkno, size)

+#endif SECSIZE

        dev_t dev;
        daddr_t blkno;
        int size;
        dev_t dev;
        daddr_t blkno;
        int size;

+#ifdef SECSIZE
+       long secsize;
+#endif SECSIZE

 {
        register struct buf *bp;
 
        if (size == 0)
                panic("bread: size 0");
 {
        register struct buf *bp;
 
        if (size == 0)
                panic("bread: size 0");

+#ifdef SECSIZE
+       bp = getblk(dev, blkno, size, secsize);
+#else SECSIZE

        bp = getblk(dev, blkno, size);
        bp = getblk(dev, blkno, size);

-       if (bp->b_flags&B_DONE) {
-               trace(TR_BREADHIT, dev, blkno);
-               return(bp);
+#endif SECSIZE
+       if (bp->b_flags&(B_DONE|B_DELWRI)) {
+               trace(TR_BREADHIT, pack(dev, size), blkno);
+               return (bp);

        }
        bp->b_flags |= B_READ;
        if (bp->b_bcount > bp->b_bufsize)
                panic("bread");
        (*bdevsw[major(dev)].d_strategy)(bp);
        }
        bp->b_flags |= B_READ;
        if (bp->b_bcount > bp->b_bufsize)
                panic("bread");
        (*bdevsw[major(dev)].d_strategy)(bp);

-       trace(TR_BREADMISS, dev, blkno);
+       trace(TR_BREADMISS, pack(dev, size), blkno);

        u.u_ru.ru_inblock++;            /* pay for read */
        biowait(bp);
        u.u_ru.ru_inblock++;            /* pay for read */
        biowait(bp);

-       return(bp);
+       return (bp);

 }
 
 /*
 }
 
 /*


@@ -45,9 +63,16 @@ bread(dev, blkno, size)
  * read-ahead block (which is not allocated to the caller)
  */
 struct buf *
  * read-ahead block (which is not allocated to the caller)
  */
 struct buf *

+#ifdef SECSIZE
+breada(dev, blkno, size, secsize, rablkno, rabsize)
+#else SECSIZE

 breada(dev, blkno, size, rablkno, rabsize)
 breada(dev, blkno, size, rablkno, rabsize)

+#endif SECSIZE

        dev_t dev;
        daddr_t blkno; int size;
        dev_t dev;
        daddr_t blkno; int size;

+#ifdef SECSIZE
+       long secsize;
+#endif SECSIZE

        daddr_t rablkno; int rabsize;
 {
        register struct buf *bp, *rabp;
        daddr_t rablkno; int rabsize;
 {
        register struct buf *bp, *rabp;


@@ -59,16 +84,20 @@ breada(dev, blkno, size, rablkno, rabsize)
         * for a cache hit).
         */
        if (!incore(dev, blkno)) {
         * for a cache hit).
         */
        if (!incore(dev, blkno)) {

+#ifdef SECSIZE
+               bp = getblk(dev, blkno, size, secsize);
+#else SECSIZE

                bp = getblk(dev, blkno, size);
                bp = getblk(dev, blkno, size);

-               if ((bp->b_flags&B_DONE) == 0) {
+#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");
                        (*bdevsw[major(dev)].d_strategy)(bp);
                        bp->b_flags |= B_READ;
                        if (bp->b_bcount > bp->b_bufsize)
                                panic("breada");
                        (*bdevsw[major(dev)].d_strategy)(bp);

-                       trace(TR_BREADMISS, dev, blkno);
+                       trace(TR_BREADMISS, pack(dev, size), blkno);

                        u.u_ru.ru_inblock++;            /* pay for read */
                } else
                        u.u_ru.ru_inblock++;            /* pay for read */
                } else

-                       trace(TR_BREADHIT, dev, blkno);
+                       trace(TR_BREADHIT, pack(dev, size), blkno);

        }
 
        /*
        }
 
        /*


@@ -76,16 +105,20 @@ breada(dev, blkno, size, rablkno, rabsize)
         * on it also (as above).
         */
        if (rablkno && !incore(dev, rablkno)) {
         * on it also (as above).
         */
        if (rablkno && !incore(dev, rablkno)) {

+#ifdef SECSIZE
+               rabp = getblk(dev, rablkno, rabsize, secsize);
+#else SECSIZE

                rabp = getblk(dev, rablkno, rabsize);
                rabp = getblk(dev, rablkno, rabsize);

-               if (rabp->b_flags & B_DONE) {
+#endif SECSIZE
+               if (rabp->b_flags & (B_DONE|B_DELWRI)) {

                        brelse(rabp);
                        brelse(rabp);

-                       trace(TR_BREADHITRA, dev, blkno);
+                       trace(TR_BREADHITRA, pack(dev, rabsize), blkno);

                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        if (rabp->b_bcount > rabp->b_bufsize)
                                panic("breadrabp");
                        (*bdevsw[major(dev)].d_strategy)(rabp);
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        if (rabp->b_bcount > rabp->b_bufsize)
                                panic("breadrabp");
                        (*bdevsw[major(dev)].d_strategy)(rabp);

-                       trace(TR_BREADMISSRA, dev, rablock);
+                       trace(TR_BREADMISSRA, pack(dev, rabsize), rablock);

                        u.u_ru.ru_inblock++;            /* pay in advance */
                }
        }
                        u.u_ru.ru_inblock++;            /* pay in advance */
                }
        }


@@ -96,7 +129,11 @@ breada(dev, blkno, size, rablkno, rabsize)
         * above, and just wait for it.
         */
        if (bp == NULL)
         * above, and just wait for it.
         */
        if (bp == NULL)

+#ifdef SECSIZE
+               return (bread(dev, blkno, size, secsize));
+#else SECSIZE

                return (bread(dev, blkno, size));
                return (bread(dev, blkno, size));

+#endif SECSIZE

        biowait(bp);
        return (bp);
 }
        biowait(bp);
        return (bp);
 }


@@ -111,10 +148,10 @@ bwrite(bp)
        register flag;
 
        flag = bp->b_flags;
        register flag;
 
        flag = bp->b_flags;

-       bp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI | B_AGE);
+       bp->b_flags &= ~(B_READ | B_DONE | B_ERROR | B_DELWRI);

        if ((flag&B_DELWRI) == 0)
                u.u_ru.ru_oublock++;            /* noone paid yet */
        if ((flag&B_DELWRI) == 0)
                u.u_ru.ru_oublock++;            /* noone paid yet */

-       trace(TR_BWRITE, bp->b_dev, bp->b_blkno);
+       trace(TR_BWRITE, pack(bp->b_dev, bp->b_bcount), bp->b_blkno);

        if (bp->b_bcount > bp->b_bufsize)
                panic("bwrite");
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if (bp->b_bcount > bp->b_bufsize)
                panic("bwrite");
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);


@@ -123,16 +160,12 @@ bwrite(bp)
         * If the write was synchronous, then await i/o completion.
         * If the write was "delayed", then we put the buffer on
         * the q of blocks awaiting i/o completion status.
         * If the write was synchronous, then await i/o completion.
         * If the write was "delayed", then we put the buffer on
         * the q of blocks awaiting i/o completion status.

-        * Otherwise, the i/o must be finished and we check for
-        * an error.

         */
        if ((flag&B_ASYNC) == 0) {
                biowait(bp);
                brelse(bp);
        } else if (flag & B_DELWRI)
                bp->b_flags |= B_AGE;
         */
        if ((flag&B_ASYNC) == 0) {
                biowait(bp);
                brelse(bp);
        } else if (flag & B_DELWRI)
                bp->b_flags |= B_AGE;

-       else
-               u.u_error = geterror(bp);

 }
 
 /*
 }
 
 /*


@@ -146,12 +179,10 @@ bwrite(bp)
 bdwrite(bp)
        register struct buf *bp;
 {
 bdwrite(bp)
        register struct buf *bp;
 {

-       register int flags;

 
        if ((bp->b_flags&B_DELWRI) == 0)
                u.u_ru.ru_oublock++;            /* noone paid yet */
 
        if ((bp->b_flags&B_DELWRI) == 0)
                u.u_ru.ru_oublock++;            /* noone paid yet */

-       flags = bdevsw[major(bp->b_dev)].d_flags;
-       if(flags & B_TAPE)
+       if (bdevsw[major(bp->b_dev)].d_flags & B_TAPE)

                bawrite(bp);
        else {
                bp->b_flags |= B_DELWRI | B_DONE;
                bawrite(bp);
        else {
                bp->b_flags |= B_DELWRI | B_DONE;


@@ -179,6 +210,7 @@ brelse(bp)
        register struct buf *flist;
        register s;
 
        register struct buf *flist;
        register s;
 

+       trace(TR_BRELSE, pack(bp->b_dev, bp->b_bufsize), bp->b_blkno);

        /*
         * If someone's waiting for the buffer, or
         * is waiting for a buffer wake 'em up.
        /*
         * If someone's waiting for the buffer, or
         * is waiting for a buffer wake 'em up.


@@ -198,7 +230,7 @@ brelse(bp)
        /*
         * Stick the buffer back on a free list.
         */
        /*
         * Stick the buffer back on a free list.
         */

-       s = spl6();
+       s = splbio();

        if (bp->b_bufsize <= 0) {
                /* block has no buffer ... put at front of unused buffer list */
                flist = &bfreelist[BQ_EMPTY];
        if (bp->b_bufsize <= 0) {
                /* block has no buffer ... put at front of unused buffer list */
                flist = &bfreelist[BQ_EMPTY];


@@ -240,14 +272,25 @@ incore(dev, blkno)
 }
 
 struct buf *
 }
 
 struct buf *

+#ifdef SECSIZE
+baddr(dev, blkno, size, secsize)
+#else SECSIZE

 baddr(dev, blkno, size)
 baddr(dev, blkno, size)

+#endif SECSIZE

        dev_t dev;
        daddr_t blkno;
        int size;
        dev_t dev;
        daddr_t blkno;
        int size;

+#ifdef SECSIZE
+       long secsize;
+#endif SECSIZE

 {
 
        if (incore(dev, blkno))
 {
 
        if (incore(dev, blkno))

+#ifdef SECSIZE
+               return (bread(dev, blkno, size, secsize));
+#else SECSIZE

                return (bread(dev, blkno, size));
                return (bread(dev, blkno, size));

+#endif SECSIZE

        return (0);
 }
 
        return (0);
 }
 


@@ -256,21 +299,45 @@ baddr(dev, blkno, size)
  * block is already associated, return it; otherwise search
  * for the oldest non-busy buffer and reassign it.
  *
  * 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.
  */
 struct buf *
  * 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.
  */
 struct buf *

+#ifdef SECSIZE
+getblk(dev, blkno, size, secsize)
+#else SECSIZE

 getblk(dev, blkno, size)
 getblk(dev, blkno, size)

+#endif SECSIZE

        dev_t dev;
        daddr_t blkno;
        int size;
        dev_t dev;
        daddr_t blkno;
        int size;

+#ifdef SECSIZE
+       long secsize;
+#endif SECSIZE

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

-       if ((unsigned)blkno >= 1 << (sizeof(int)*NBBY-PGSHIFT))
-               blkno = 1 << ((sizeof(int)*NBBY-PGSHIFT) + 1);
+       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
        /*
         * Search the cache for the block.  If we hit, but
         * the buffer is in use for i/o, then we wait until


@@ -282,7 +349,7 @@ loop:
                if (bp->b_blkno != blkno || bp->b_dev != dev ||
                    bp->b_flags&B_INVAL)
                        continue;
                if (bp->b_blkno != blkno || bp->b_dev != dev ||
                    bp->b_flags&B_INVAL)
                        continue;

-               s = spl6();
+               s = splbio();

                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);
                if (bp->b_flags&B_BUSY) {
                        bp->b_flags |= B_WANTED;
                        sleep((caddr_t)bp, PRIBIO+1);


@@ -291,10 +358,19 @@ loop:
                }
                splx(s);
                notavail(bp);
                }
                splx(s);
                notavail(bp);

-               if (brealloc(bp, size) == 0)
+               if (bp->b_bcount != size) {
+                       if (bp->b_bcount < size && (bp->b_flags&B_DELWRI)) {
+                               bp->b_flags &= ~B_ASYNC;
+                               bwrite(bp);
+                               goto loop;
+                       }
+                       if (brealloc(bp, size) == 0)
+                               goto loop;
+               }
+               if (bp->b_bcount != size && brealloc(bp, size) == 0)

                        goto loop;
                bp->b_flags |= B_CACHE;
                        goto loop;
                bp->b_flags |= B_CACHE;

-               return(bp);
+               return (bp);

        }
        if (major(dev) >= nblkdev)
                panic("blkdev");
        }
        if (major(dev) >= nblkdev)
                panic("blkdev");


@@ -303,11 +379,14 @@ loop:
        bremhash(bp);
        binshash(bp, dp);
        bp->b_dev = dev;
        bremhash(bp);
        binshash(bp, dp);
        bp->b_dev = dev;

+#ifdef SECSIZE
+       bp->b_blksize = secsize;
+#endif SECSIZE

        bp->b_blkno = blkno;
        bp->b_error = 0;
        if (brealloc(bp, size) == 0)
                goto loop;
        bp->b_blkno = blkno;
        bp->b_error = 0;
        if (brealloc(bp, size) == 0)
                goto loop;

-       return(bp);
+       return (bp);

 }
 
 /*
 }
 
 /*


@@ -320,6 +399,8 @@ geteblk(size)
 {
        register struct buf *bp, *flist;
 
 {
        register struct buf *bp, *flist;
 

+       if (size > MAXBSIZE)
+               panic("geteblk: size too big");

 loop:
        bp = getnewbuf();
        bp->b_flags |= B_INVAL;
 loop:
        bp = getnewbuf();
        bp->b_flags |= B_INVAL;


@@ -328,14 +409,18 @@ loop:
        flist = &bfreelist[BQ_AGE];
        binshash(bp, flist);
        bp->b_dev = (dev_t)NODEV;
        flist = &bfreelist[BQ_AGE];
        binshash(bp, flist);
        bp->b_dev = (dev_t)NODEV;

+#ifdef SECSIZE
+       bp->b_blksize = DEV_BSIZE;
+#endif SECSIZE

        bp->b_error = 0;
        if (brealloc(bp, size) == 0)
                goto loop;
        bp->b_error = 0;
        if (brealloc(bp, size) == 0)
                goto loop;

-       return(bp);
+       return (bp);

 }
 
 /*
  * Allocate space associated with a buffer.
 }
 
 /*
  * Allocate space associated with a buffer.

+ * If can't get space, buffer is released

  */
 brealloc(bp, size)
        register struct buf *bp;
  */
 brealloc(bp, size)
        register struct buf *bp;


@@ -347,7 +432,7 @@ brealloc(bp, size)
        int s;
 
        /*
        int s;
 
        /*

-        * First need to make sure that all overlaping previous I/O
+        * First need to make sure that all overlapping previous I/O

         * is dispatched with.
         */
        if (size == bp->b_bcount)
         * is dispatched with.
         */
        if (size == bp->b_bcount)


@@ -359,15 +444,13 @@ brealloc(bp, size)
                }
                if (bp->b_flags & B_LOCKED)
                        panic("brealloc");
                }
                if (bp->b_flags & B_LOCKED)
                        panic("brealloc");

-               allocbuf(bp, size);
-               return (1);
+               return (allocbuf(bp, size));

        }
        bp->b_flags &= ~B_DONE;
        }
        bp->b_flags &= ~B_DONE;

-       if (bp->b_dev == NODEV) {
-               allocbuf(bp, size);
-               return (1);
-       }
+       if (bp->b_dev == NODEV)
+               return (allocbuf(bp, size));

 
 

+       trace(TR_BREALLOC, pack(bp->b_dev, size), bp->b_blkno);

        /*
         * Search cache for any buffers that overlap the one that we
         * are trying to allocate. Overlapping buffers must be marked
        /*
         * Search cache for any buffers that overlap the one that we
         * are trying to allocate. Overlapping buffers must be marked


@@ -377,7 +460,11 @@ brealloc(bp, size)
         * when two buffer are trying to get the same set of disk blocks.
         */
        start = bp->b_blkno;
         * when two buffer are trying to get the same set of disk blocks.
         */
        start = bp->b_blkno;

-       last = start + (size / DEV_BSIZE) - 1;
+#ifdef SECSIZE
+       last = start + size/bp->b_blksize - 1;
+#else SECSIZE
+       last = start + btodb(size) - 1;
+#endif SECSIZE

        dp = BUFHASH(bp->b_dev, bp->b_blkno);
 loop:
        for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {
        dp = BUFHASH(bp->b_dev, bp->b_blkno);
 loop:
        for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {


@@ -385,9 +472,13 @@ loop:
                        continue;
                /* look for overlap */
                if (ep->b_bcount == 0 || ep->b_blkno > last ||
                        continue;
                /* look for overlap */
                if (ep->b_bcount == 0 || ep->b_blkno > last ||

-                   ep->b_blkno + (ep->b_bcount / DEV_BSIZE) <= start)
+#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;
                        continue;

-               s = spl6();
+               s = splbio();

                if (ep->b_flags&B_BUSY) {
                        ep->b_flags |= B_WANTED;
                        sleep((caddr_t)ep, PRIBIO+1);
                if (ep->b_flags&B_BUSY) {
                        ep->b_flags |= B_WANTED;
                        sleep((caddr_t)ep, PRIBIO+1);


@@ -403,89 +494,7 @@ loop:
                ep->b_flags |= B_INVAL;
                brelse(ep);
        }
                ep->b_flags |= B_INVAL;
                brelse(ep);
        }

-       allocbuf(bp, size);
-       return (1);
-}
-
-/*
- * Expand or contract the actual memory allocated to a buffer.
- */
-allocbuf(tp, size)
-       register struct buf *tp;
-       int size;
-{
-       register struct buf *bp, *ep;
-       int sizealloc, take;
-
-       sizealloc = roundup(size, CLBYTES);
-       /*
-        * Buffer size does not change
-        */
-       if (sizealloc == tp->b_bufsize)
-               goto out;
-       /*
-        * 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.
-        */
-       if (sizealloc < tp->b_bufsize) {
-               ep = bfreelist[BQ_EMPTY].av_forw;
-               if (ep == &bfreelist[BQ_EMPTY])
-                       goto out;
-               notavail(ep);
-               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_bcount = 0;
-               brelse(ep);
-               goto out;
-       }
-       /*
-        * 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;
-               bp = getnewbuf();
-               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, &bfreelist[BQ_EMPTY]);
-                       bp->b_dev = (dev_t)NODEV;
-                       bp->b_error = 0;
-                       bp->b_flags |= B_INVAL;
-               }
-               brelse(bp);
-       }
-out:
-       tp->b_bcount = size;
-}
-
-/*
- * Release space associated with a buffer.
- */
-bfree(bp)
-       struct buf *bp;
-{
-       /*
-        * This stub is provided to allow the system to reclaim
-        * memory from the buffer pool. Currently we do not migrate
-        * memory between the buffer memory pool and the user memory
-        * pool.
-        */
-       bp->b_bcount = 0;
+       return (allocbuf(bp, size));

 }
 
 /*
 }
 
 /*


@@ -500,13 +509,14 @@ getnewbuf()
        int s;
 
 loop:
        int s;
 
 loop:

-       s = spl6();
+       s = splbio();

        for (dp = &bfreelist[BQ_AGE]; dp > bfreelist; dp--)
                if (dp->av_forw != dp)
                        break;
        if (dp == bfreelist) {          /* no free blocks */
                dp->b_flags |= B_WANTED;
                sleep((caddr_t)dp, PRIBIO+1);
        for (dp = &bfreelist[BQ_AGE]; dp > bfreelist; dp--)
                if (dp->av_forw != dp)
                        break;
        if (dp == bfreelist) {          /* no free blocks */
                dp->b_flags |= B_WANTED;
                sleep((caddr_t)dp, PRIBIO+1);

+               splx(s);

                goto loop;
        }
        splx(s);
                goto loop;
        }
        splx(s);


@@ -517,7 +527,7 @@ loop:
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }

-       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);
+       trace(TR_BRELSE, pack(bp->b_dev, bp->b_bufsize), bp->b_blkno);

        bp->b_flags = B_BUSY;
        return (bp);
 }
        bp->b_flags = B_BUSY;
        return (bp);
 }


@@ -531,42 +541,30 @@ biowait(bp)
 {
        int s;
 
 {
        int s;
 

-       s = spl6();
+       s = splbio();

        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);

-       u.u_error = geterror(bp);
+       if (u.u_error == 0)                     /* XXX */
+               u.u_error = geterror(bp);

 }
 
 /*
 }
 
 /*

- * Mark I/O complete on a buffer. If the header
- * indicates a dirty page push completion, the
- * header is inserted into the ``cleaned'' list
- * to be processed by the pageout daemon. Otherwise
- * release it if I/O is asynchronous, and wake 
- * up anyone waiting for it.
+ * Mark I/O complete on a buffer.
+ * If someone should be called, e.g. the pageout
+ * daemon, do so.  Otherwise, wake up anyone
+ * waiting for it.

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

-       register int s;

 
        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_DIRTY) {
-               if (bp->b_flags & B_ERROR)
-                       panic("IO err in push");
-               s = spl6();
-               bp->av_forw = bclnlist;
-               bp->b_bcount = swsize[bp - swbuf];
-               bp->b_pfcent = swpf[bp - swbuf];
-               cnt.v_pgout++;
-               cnt.v_pgpgout += bp->b_bcount / NBPG;
-               bclnlist = bp;
-               if (bswlist.b_flags & B_WANTED)
-                       wakeup((caddr_t)&proc[2]);
-               splx(s);
+       if (bp->b_flags & B_CALL) {
+               bp->b_flags &= ~B_CALL;
+               (*bp->b_iodone)(bp);

                return;
        }
        if (bp->b_flags&B_ASYNC)
                return;
        }
        if (bp->b_flags&B_ASYNC)


@@ -579,11 +577,21 @@ biodone(bp)
 
 /*
  * Insure that no part of a specified block is in an incore buffer.
 
 /*
  * Insure 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(dev, blkno, size)
        dev_t dev;
        daddr_t blkno;
  */
 blkflush(dev, blkno, size)
        dev_t dev;
        daddr_t blkno;

+#ifdef SECSIZE
+       int size;
+#else SECSIZE

        long size;
        long size;

+#endif SECSIZE

 {
        register struct buf *ep;
        struct buf *dp;
 {
        register struct buf *ep;
        struct buf *dp;


@@ -591,7 +599,11 @@ blkflush(dev, blkno, size)
        int s;
 
        start = blkno;
        int s;
 
        start = blkno;

-       last = start + (size / DEV_BSIZE) - 1;
+#ifdef SECSIZE
+       last = start + size - 1;
+#else SECSIZE
+       last = start + btodb(size) - 1;
+#endif SECSIZE

        dp = BUFHASH(dev, blkno);
 loop:
        for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {
        dp = BUFHASH(dev, blkno);
 loop:
        for (ep = dp->b_forw; ep != dp; ep = ep->b_forw) {


@@ -599,9 +611,13 @@ loop:
                        continue;
                /* look for overlap */
                if (ep->b_bcount == 0 || ep->b_blkno > last ||
                        continue;
                /* look for overlap */
                if (ep->b_bcount == 0 || ep->b_blkno > last ||

-                   ep->b_blkno + (ep->b_bcount / DEV_BSIZE) <= start)
+#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;
                        continue;

-               s = spl6();
+               s = splbio();

                if (ep->b_flags&B_BUSY) {
                        ep->b_flags |= B_WANTED;
                        sleep((caddr_t)ep, PRIBIO+1);
                if (ep->b_flags&B_BUSY) {
                        ep->b_flags |= B_WANTED;
                        sleep((caddr_t)ep, PRIBIO+1);


@@ -619,11 +635,10 @@ loop:
 }
 
 /*
 }
 
 /*

- * make sure all write-behind blocks
+ * Make sure all write-behind blocks

  * on dev (or NODEV for all)
  * are flushed out.
  * (from umount and update)
  * on dev (or NODEV for all)
  * are flushed out.
  * (from umount and update)

- * (and temporarily pagein)

  */
 bflush(dev)
        dev_t dev;
  */
 bflush(dev)
        dev_t dev;


@@ -633,7 +648,7 @@ bflush(dev)
        int s;
 
 loop:
        int s;
 
 loop:

-       s = spl6();
+       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_DELWRI) == 0)
        for (flist = bfreelist; flist < &bfreelist[BQ_EMPTY]; flist++)
        for (bp = flist->av_forw; bp != flist; bp = bp->av_forw) {
                if ((bp->b_flags & B_DELWRI) == 0)


@@ -642,6 +657,7 @@ loop:
                        bp->b_flags |= B_ASYNC;
                        notavail(bp);
                        bwrite(bp);
                        bp->b_flags |= B_ASYNC;
                        notavail(bp);
                        bwrite(bp);

+                       splx(s);

                        goto loop;
                }
        }
                        goto loop;
                }
        }


@@ -650,9 +666,7 @@ loop:
 
 /*
  * Pick up the device's error number and pass it to the user;
 
 /*
  * 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.  Actually the latter is always true because devices
- * don't yet return specific errors.
+ * if there is an error but the number is 0 set a generalized code.

  */
 geterror(bp)
        register struct buf *bp;
  */
 geterror(bp)
        register struct buf *bp;