From aab4a16259711ce514726d497de75219c93f086a Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Sun, 9 Jul 2006 22:55:45 +0000
Subject: [PATCH] Don't use B_PAGING with geteblk() bufs

---
 sys/dev/raid/vinum/vinumrequest.c | 4 +---
 sys/dev/raid/vinum/vinumrevive.c  | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sys/dev/raid/vinum/vinumrequest.c b/sys/dev/raid/vinum/vinumrequest.c
index 47a74bda8d..c804c3e9bf 100644
--- a/sys/dev/raid/vinum/vinumrequest.c
+++ b/sys/dev/raid/vinum/vinumrequest.c
@@ -39,7 +39,7 @@
  *
  * $Id: vinumrequest.c,v 1.30 2001/01/09 04:20:55 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.44.2.5 2002/08/28 04:30:56 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.14 2006/07/06 23:36:29 corecode Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.15 2006/07/09 22:55:45 corecode Exp $
  */
 
 #include "vinumhdr.h"
@@ -812,7 +812,6 @@ build_rq_buffer(struct rqelement *rqe, struct plex *plex)
     /* copy these flags from user bp */
     bp->b_flags = ubp->b_flags & (B_ORDERED | B_NOCACHE | B_ASYNC);
     bp->b_cmd = ubp->b_cmd;
-    bp->b_flags |= B_PAGING;
 #ifdef VINUMDEBUG
     if (rqe->flags & XFR_BUFLOCKED)			    /* paranoia */
 	panic("build_rq_buffer: rqe already locked");	    /* XXX remove this when we're sure */
@@ -946,7 +945,6 @@ sdio(struct bio *bio)
     }
     sddev = DRIVE[sd->driveno].dev;		    /* device */
     bzero(sbp, sizeof(struct sdbuf));			    /* start with nothing */
-    sbp->b.b_flags = bp->b_flags | B_PAGING;
     sbp->b.b_cmd = bp->b_cmd;
     sbp->b.b_bcount = bp->b_bcount;			    /* number of bytes to transfer */
     sbp->b.b_resid = bp->b_resid;			    /* and amount waiting */
diff --git a/sys/dev/raid/vinum/vinumrevive.c b/sys/dev/raid/vinum/vinumrevive.c
index 88f5902eb7..6e2c057edd 100644
--- a/sys/dev/raid/vinum/vinumrevive.c
+++ b/sys/dev/raid/vinum/vinumrevive.c
@@ -39,7 +39,7 @@
  *
  * $Id: vinumrevive.c,v 1.14 2000/12/21 01:55:11 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.22.2.5 2001/03/13 02:59:43 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.10 2006/04/30 17:22:17 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.11 2006/07/09 22:55:45 corecode Exp $
  */
 
 #include "vinumhdr.h"
@@ -164,7 +164,6 @@ revive_block(int sdno)
 	else						    /* it's an unattached plex */
 	    dev = VINUM_PLEX(sd->plexno);		    /* create the device number */
 
-	bp->b_flags = B_PAGING;		    /* either way, read it */
 	bp->b_cmd = BUF_CMD_READ;
 	vinumstart(dev, &bp->b_bio1, 1);
 	biowait(bp);
@@ -176,7 +175,7 @@ revive_block(int sdno)
 	/* Now write to the subdisk */
     {
 	dev = VINUM_SD(sdno);			    /* create the device number */
-	bp->b_flags = B_ORDERED | B_PAGING;    /* and make this an ordered write */
+	bp->b_flags = B_ORDERED;		    /* and make this an ordered write */
 	bp->b_cmd = BUF_CMD_WRITE;
 	bp->b_resid = bp->b_bcount;
 	bp->b_bio1.bio_offset = (off_t)sd->revived << DEV_BSHIFT;		    /* write it to here */
@@ -416,7 +415,6 @@ parityrebuild(struct plex *plex,
 	    else
 		bpp[sdno]->b_bio1.bio_driver_info = VINUM_SD(plex->sdnos[sdno]);	/* device number */
 	    bpp[sdno]->b_cmd = BUF_CMD_READ;	    /* either way, read it */
-	    bpp[sdno]->b_flags = B_PAGING;
 	    bpp[sdno]->b_bcount = mysize;
 	    bpp[sdno]->b_resid = bpp[sdno]->b_bcount;
 	    bpp[sdno]->b_bio1.bio_offset = (off_t)pstripe << DEV_BSHIFT;	    /* transfer from here */
-- 
2.41.0