summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1994-02-06 10:00:30 +0000
committermycroft <mycroft@NetBSD.org>1994-02-06 10:00:30 +0000
commitadeebc448e09cd7262c54dc993fa642beba5a8a7 (patch)
tree000f8d7dfc791f2b33442b7745611e35994edee7 /sys/dev
parent0acef8143454ea3d0224723814abc36fd957bf03 (diff)
Use b_actf, not av_forw.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/wd.c38
-rw-r--r--sys/dev/isa/mcd.c4
-rw-r--r--sys/dev/isa/wd.c38
-rw-r--r--sys/dev/scsipi/cd.c4
-rw-r--r--sys/dev/scsipi/sd.c4
5 files changed, 44 insertions, 44 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index d7cd303776a..182a8cfeda6 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id: wd.c,v 1.32 1994/01/03 16:23:06 mycroft Exp $
+ * $Id: wd.c,v 1.33 1994/02/06 10:04:53 mycroft Exp $
*/
/* Note: This code heavily modified by tih@barsoom.nhh.no; use at own risk! */
@@ -441,7 +441,7 @@ loop:
if (du->dk_skipm == 0) {
struct buf *oldbp, *nextbp;
oldbp = bp;
- nextbp = bp->av_forw;
+ nextbp = bp->b_actf;
du->dk_bct = du->dk_bc;
oldbp->b_flags |= B_XXX;
while( nextbp
@@ -455,7 +455,7 @@ loop:
du->dk_bct += nextbp->b_bcount;
oldbp->b_flags |= B_XXX;
oldbp = nextbp;
- nextbp = nextbp->av_forw;
+ nextbp = nextbp->b_actf;
}
}
@@ -790,7 +790,7 @@ done:
du->dk_skipm = 0;
dp->b_active = 0;
}
- dp->b_actf = bp->av_forw;
+ dp->b_actf = bp->b_actf;
dp->b_errcnt = 0;
bp->b_resid = 0;
bp->b_flags &= ~B_XXX;
@@ -1651,13 +1651,13 @@ wddisksort(struct buf *dp, struct buf *bp)
if(ap == NULL) {
dp->b_actf = bp;
dp->b_actl = bp;
- bp->av_forw = NULL;
+ bp->b_actf = NULL;
return;
}
while( ap->b_flags & B_XXX) {
- if( ap->av_forw == 0 || (ap->av_forw->b_flags & B_XXX) == 0)
+ if( ap->b_actf == 0 || (ap->b_actf->b_flags & B_XXX) == 0)
break;
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* If we lie after the first (currently active)
@@ -1665,13 +1665,13 @@ wddisksort(struct buf *dp, struct buf *bp)
* and add ourselves to it.
*/
if (bp->b_blkno < ap->b_blkno) {
- while (ap->av_forw) {
+ while (ap->b_actf) {
/*
* Check for an ``inversion'' in the
* normally ascending cylinder numbers,
* indicating the start of the second request list.
*/
- if (ap->av_forw->b_blkno < ap->b_blkno) {
+ if (ap->b_actf->b_blkno < ap->b_blkno) {
/*
* Search the second request list
* for the first request at a larger
@@ -1679,13 +1679,13 @@ wddisksort(struct buf *dp, struct buf *bp)
* if there is no such request, we go at end.
*/
do {
- if (bp->b_blkno < ap->av_forw->b_blkno)
+ if (bp->b_blkno < ap->b_actf->b_blkno)
goto insert;
- ap = ap->av_forw;
- } while (ap->av_forw);
+ ap = ap->b_actf;
+ } while (ap->b_actf);
goto insert; /* after last */
}
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* No inversions... we will go after the last, and
@@ -1697,17 +1697,17 @@ wddisksort(struct buf *dp, struct buf *bp)
* Request is at/after the current request...
* sort in the first request list.
*/
- while (ap->av_forw) {
+ while (ap->b_actf) {
/*
* We want to go after the current request
* if there is an inversion after it (i.e. it is
* the end of the first request list), or if
* the next request is a larger cylinder than our request.
*/
- if (ap->av_forw->b_blkno < ap->b_blkno ||
- bp->b_blkno < ap->av_forw->b_blkno )
+ if (ap->b_actf->b_blkno < ap->b_blkno ||
+ bp->b_blkno < ap->b_actf->b_blkno )
goto insert;
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* Neither a second list nor a larger
@@ -1715,8 +1715,8 @@ wddisksort(struct buf *dp, struct buf *bp)
* which is the same as the end of the whole schebang.
*/
insert:
- bp->av_forw = ap->av_forw;
- ap->av_forw = bp;
+ bp->b_actf = ap->b_actf;
+ ap->b_actf = bp;
if (ap == dp->b_actl)
dp->b_actl = bp;
}
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 477ea3986f3..ce094e8e7cb 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -35,7 +35,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: mcd.c,v 1.3 1993/12/20 09:06:26 mycroft Exp $
+ * $Id: mcd.c,v 1.4 1994/02/06 10:04:47 mycroft Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@@ -377,7 +377,7 @@ static void mcd_start(int unit)
if ((bp = qp->b_actf) != 0) {
/* block found to process, dequeue */
/*MCD_TRACE("mcd_start: found block bp=0x%x\n",bp,0,0,0);*/
- qp->b_actf = bp->av_forw;
+ qp->b_actf = bp->b_actf;
splx(s);
} else {
/* nothing to do */
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index d7cd303776a..182a8cfeda6 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id: wd.c,v 1.32 1994/01/03 16:23:06 mycroft Exp $
+ * $Id: wd.c,v 1.33 1994/02/06 10:04:53 mycroft Exp $
*/
/* Note: This code heavily modified by tih@barsoom.nhh.no; use at own risk! */
@@ -441,7 +441,7 @@ loop:
if (du->dk_skipm == 0) {
struct buf *oldbp, *nextbp;
oldbp = bp;
- nextbp = bp->av_forw;
+ nextbp = bp->b_actf;
du->dk_bct = du->dk_bc;
oldbp->b_flags |= B_XXX;
while( nextbp
@@ -455,7 +455,7 @@ loop:
du->dk_bct += nextbp->b_bcount;
oldbp->b_flags |= B_XXX;
oldbp = nextbp;
- nextbp = nextbp->av_forw;
+ nextbp = nextbp->b_actf;
}
}
@@ -790,7 +790,7 @@ done:
du->dk_skipm = 0;
dp->b_active = 0;
}
- dp->b_actf = bp->av_forw;
+ dp->b_actf = bp->b_actf;
dp->b_errcnt = 0;
bp->b_resid = 0;
bp->b_flags &= ~B_XXX;
@@ -1651,13 +1651,13 @@ wddisksort(struct buf *dp, struct buf *bp)
if(ap == NULL) {
dp->b_actf = bp;
dp->b_actl = bp;
- bp->av_forw = NULL;
+ bp->b_actf = NULL;
return;
}
while( ap->b_flags & B_XXX) {
- if( ap->av_forw == 0 || (ap->av_forw->b_flags & B_XXX) == 0)
+ if( ap->b_actf == 0 || (ap->b_actf->b_flags & B_XXX) == 0)
break;
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* If we lie after the first (currently active)
@@ -1665,13 +1665,13 @@ wddisksort(struct buf *dp, struct buf *bp)
* and add ourselves to it.
*/
if (bp->b_blkno < ap->b_blkno) {
- while (ap->av_forw) {
+ while (ap->b_actf) {
/*
* Check for an ``inversion'' in the
* normally ascending cylinder numbers,
* indicating the start of the second request list.
*/
- if (ap->av_forw->b_blkno < ap->b_blkno) {
+ if (ap->b_actf->b_blkno < ap->b_blkno) {
/*
* Search the second request list
* for the first request at a larger
@@ -1679,13 +1679,13 @@ wddisksort(struct buf *dp, struct buf *bp)
* if there is no such request, we go at end.
*/
do {
- if (bp->b_blkno < ap->av_forw->b_blkno)
+ if (bp->b_blkno < ap->b_actf->b_blkno)
goto insert;
- ap = ap->av_forw;
- } while (ap->av_forw);
+ ap = ap->b_actf;
+ } while (ap->b_actf);
goto insert; /* after last */
}
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* No inversions... we will go after the last, and
@@ -1697,17 +1697,17 @@ wddisksort(struct buf *dp, struct buf *bp)
* Request is at/after the current request...
* sort in the first request list.
*/
- while (ap->av_forw) {
+ while (ap->b_actf) {
/*
* We want to go after the current request
* if there is an inversion after it (i.e. it is
* the end of the first request list), or if
* the next request is a larger cylinder than our request.
*/
- if (ap->av_forw->b_blkno < ap->b_blkno ||
- bp->b_blkno < ap->av_forw->b_blkno )
+ if (ap->b_actf->b_blkno < ap->b_blkno ||
+ bp->b_blkno < ap->b_actf->b_blkno )
goto insert;
- ap = ap->av_forw;
+ ap = ap->b_actf;
}
/*
* Neither a second list nor a larger
@@ -1715,8 +1715,8 @@ wddisksort(struct buf *dp, struct buf *bp)
* which is the same as the end of the whole schebang.
*/
insert:
- bp->av_forw = ap->av_forw;
- ap->av_forw = bp;
+ bp->b_actf = ap->b_actf;
+ ap->b_actf = bp;
if (ap == dp->b_actl)
dp->b_actl = bp;
}
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 36ae88bbcb8..7075d75b397 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: cd.c,v 1.21 1994/01/11 17:21:57 mycroft Exp $
+ * $Id: cd.c,v 1.22 1994/02/06 10:05:54 mycroft Exp $
*/
#define SPLCD splbio
@@ -471,7 +471,7 @@ cdstart(int unit)
dp = &cd_buf_queue[unit];
if ((bp = dp->b_actf) != NULL) /* yes, an assign */
{
- dp->b_actf = bp->av_forw;
+ dp->b_actf = bp->b_actf;
}
else
{
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index d817db98068..78f39227f90 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: sd.c,v 1.21 1994/01/25 08:56:45 deraadt Exp $
+ * $Id: sd.c,v 1.22 1994/02/06 10:05:50 mycroft Exp $
*/
#include "sd.h"
@@ -480,7 +480,7 @@ sdstart(int unit)
dp = &(sd_data[unit]->sdbuf);
if ((bp = dp->b_actf) != NULL) /* yes, an assign */
- dp->b_actf = bp->av_forw;
+ dp->b_actf = bp->b_actf;
else
return;