Put back a missing NOBOUNCE around a call to vm_bounce_kva_free.

[unix-history] / sys / kern / vfs__bio.c

diff --git a/sys/kern/vfs__bio.c b/sys/kern/vfs__bio.c
index f3c6c9f..0deca47 100644 (file)
--- a/sys/kern/vfs__bio.c
+++ b/sys/kern/vfs__bio.c
@@ -45,7 +45,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     $Id: vfs__bio.c,v 1.17 1994/03/23 09:15:38 davidg Exp $
+ *     $Id: vfs__bio.c,v 1.20 1994/05/29 07:34:15 davidg Exp $

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


@@ -359,18 +359,8 @@ start:
                && bfreelist[BQ_EMPTY].av_forw != (struct buf *)bfreelist+BQ_EMPTY) {
                caddr_t addr;
 
                && bfreelist[BQ_EMPTY].av_forw != (struct buf *)bfreelist+BQ_EMPTY) {
                caddr_t addr;
 

-/*#define notyet*/
-#ifndef notyet
-               if ((addr = malloc (sz, M_IOBUF, M_WAITOK)) == 0) goto tryfree;
-#else /* notyet */
-               /* get new memory buffer */
-               if (round_page(sz) == sz)
-                       addr = (caddr_t) kmem_alloc_wired_wait(buffer_map, sz);
-               else
-                       addr = (caddr_t) malloc (sz, M_IOBUF, M_WAITOK);
-       /*if ((addr = malloc (sz, M_IOBUF, M_NOWAIT)) == 0) goto tryfree;*/
-               bzero(addr, sz);
-#endif /* notyet */
+               if ((addr = malloc (sz, M_IOBUF, M_NOWAIT)) == 0)
+                       goto tryfree;

                freebufspace -= sz;
                allocbufspace += sz;
 
                freebufspace -= sz;
                allocbufspace += sz;
 


@@ -482,7 +472,14 @@ loop:
                /* if (bp->b_bufsize != size) allocbuf(bp, size); */
        } else {
 
                /* if (bp->b_bufsize != size) allocbuf(bp, size); */
        } else {
 

-               if ((bp = getnewbuf(size)) == 0) goto loop;
+               if ((bp = getnewbuf(size)) == 0)
+                       goto loop;
+               if ( incore(vp, blkno)) {
+                       bp->b_flags |= B_INVAL;
+                       brelse(bp);
+                       goto loop;
+               }
+                       

                bp->b_blkno = bp->b_lblkno = blkno;
                bgetvp(vp, bp);
                bh = BUFHASH(vp, blkno);
                bp->b_blkno = bp->b_lblkno = blkno;
                bgetvp(vp, bp);
                bh = BUFHASH(vp, blkno);


@@ -527,27 +524,13 @@ allocbuf(register struct buf *bp, int size)
        caddr_t newcontents;
 
        /* get new memory buffer */
        caddr_t newcontents;
 
        /* get new memory buffer */

-#ifndef notyet

        newcontents = (caddr_t) malloc (size, M_IOBUF, M_WAITOK);
        newcontents = (caddr_t) malloc (size, M_IOBUF, M_WAITOK);

-#else /* notyet */
-       if (round_page(size) == size)
-               newcontents = (caddr_t) kmem_alloc_wired_wait(buffer_map, size);
-       else
-               newcontents = (caddr_t) malloc (size, M_IOBUF, M_WAITOK);
-#endif /* notyet */

 
        /* copy the old into the new, up to the maximum that will fit */
        bcopy (bp->b_un.b_addr, newcontents, min(bp->b_bufsize, size));
 
        /* return old contents to free heap */
 
        /* copy the old into the new, up to the maximum that will fit */
        bcopy (bp->b_un.b_addr, newcontents, min(bp->b_bufsize, size));
 
        /* return old contents to free heap */

-#ifndef notyet

        free (bp->b_un.b_addr, M_IOBUF);
        free (bp->b_un.b_addr, M_IOBUF);

-#else /* notyet */
-       if (round_page(bp->b_bufsize) == bp->b_bufsize)
-               kmem_free_wakeup(buffer_map, bp->b_un.b_addr, bp->b_bufsize);
-       else
-               free (bp->b_un.b_addr, M_IOBUF);
-#endif /* notyet */

 
        /* adjust buffer cache's idea of memory allocated to buffer contents */
        freebufspace -= size - bp->b_bufsize;
 
        /* adjust buffer cache's idea of memory allocated to buffer contents */
        freebufspace -= size - bp->b_bufsize;


@@ -620,7 +603,9 @@ biodone(register struct buf *bp)
                        
                        biodone(tbp);
                }
                        
                        biodone(tbp);
                }

+#ifndef NOBOUNCE

                vm_bounce_kva_free( bp->b_un.b_addr, bp->b_bufsize, 0);
                vm_bounce_kva_free( bp->b_un.b_addr, bp->b_bufsize, 0);

+#endif

                relpbuf(bp);
                splx(s);
                return;
                relpbuf(bp);
                splx(s);
                return;