diff options
author | phk <phk@FreeBSD.org> | 2002-02-22 09:18:46 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-02-22 09:18:46 +0000 |
commit | 8b5a71f365fa771240bb1b5f8790a9c194013468 (patch) | |
tree | cf58a1e56139b39cf23692028dc0f47ec6dc4917 /sys | |
parent | 7d2feac7d3f2d24e6aa783bff897b21b508633e8 (diff) | |
download | FreeBSD-src-8b5a71f365fa771240bb1b5f8790a9c194013468.zip FreeBSD-src-8b5a71f365fa771240bb1b5f8790a9c194013468.tar.gz |
GC: BIO_ORDERED going away.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/cam/scsi/scsi_cd.c | 4 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_da.c | 3 | ||||
-rw-r--r-- | sys/dev/ata/ata-disk.c | 23 | ||||
-rw-r--r-- | sys/dev/vinum/vinumrequest.c | 2 | ||||
-rw-r--r-- | sys/dev/vinum/vinumrevive.c | 2 |
5 files changed, 4 insertions, 30 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 550ef41..33f7358 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -1448,9 +1448,7 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb) scsi_read_write(&start_ccb->csio, /*retries*/4, /* cbfcnp */ cddone, - (bp->bio_flags & BIO_ORDERED) != 0 ? - MSG_ORDERED_Q_TAG : - MSG_SIMPLE_Q_TAG, + MSG_SIMPLE_Q_TAG, /* read */bp->bio_cmd == BIO_READ, /* byte2 */ 0, /* minimum_cmd_size */ 10, diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index b58ba9a..5341460 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -1242,8 +1242,7 @@ dastart(struct cam_periph *periph, union ccb *start_ccb) devstat_start_transaction(&softc->device_stats); - if ((bp->bio_flags & BIO_ORDERED) != 0 - || (softc->flags & DA_FLAG_NEED_OTAG) != 0) { + if ((softc->flags & DA_FLAG_NEED_OTAG) != 0) { softc->flags &= ~DA_FLAG_NEED_OTAG; softc->ordered_tag_count++; tag_code = MSG_ORDERED_Q_TAG; diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index a0f760f..6424f28 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -102,9 +102,6 @@ SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLAG_RD, &ata_wc, 0, SYSCTL_INT(_hw_ata, OID_AUTO, tags, CTLFLAG_RD, &ata_tags, 0, "ATA disk tagged queuing support"); -/* experimental cache flush on BIO_ORDERED */ -#undef ATA_FLUSHCACHE_ON - void ad_attach(struct ata_device *atadev) { @@ -368,16 +365,6 @@ ad_start(struct ata_device *atadev) if (!bp) return; -#ifdef ATA_FLUSHCACHE_ON - /* - * if BIO_ORDERED is set cache should be flushed, if there are - * any outstanding requests, hold off and wait for them to finish - */ - if (adp->flags & AD_F_TAG_ENABLED && - bp->bio_flags & BIO_ORDERED && adp->outstanding > 0) - return; -#endif - /* if tagged queueing enabled get next free tag */ if (adp->flags & AD_F_TAG_ENABLED) { while (tag <= adp->num_tags && adp->tags[tag]) @@ -690,16 +677,6 @@ ad_interrupt(struct ad_request *request) request->bp->bio_resid = request->bytecount; -#ifdef ATA_FLUSHCACHE_ON - if (request->bp->bio_flags & BIO_ORDERED) { - request->flags |= ADR_F_FLUSHCACHE; - if (ata_command(adp->device, ATA_C_FLUSHCACHE, 0, 0, 0, ATA_IMMEDIATE)) - ata_prtdev(adp->device, "flushing cache failed\n"); - else - return ATA_OP_CONTINUES; - } -finish: -#endif biofinish(request->bp, &adp->stats, 0); ad_free(request); adp->outstanding--; diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c index 6473a1d..e7cd1c4 100644 --- a/sys/dev/vinum/vinumrequest.c +++ b/sys/dev/vinum/vinumrequest.c @@ -807,7 +807,7 @@ build_rq_buffer(struct rqelement *rqe, struct plex *plex) /* Initialize the buf struct */ /* copy these flags from user bp */ bp->b_flags = ubp->b_flags & (B_NOCACHE | B_ASYNC); - bp->b_io.bio_flags = ubp->b_io.bio_flags & BIO_ORDERED; + bp->b_io.bio_flags = 0; bp->b_iocmd = ubp->b_iocmd; #ifdef VINUMDEBUG if (rqe->flags & XFR_BUFLOCKED) /* paranoia */ diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c index d8fde41..85b73f3 100644 --- a/sys/dev/vinum/vinumrevive.c +++ b/sys/dev/vinum/vinumrevive.c @@ -175,7 +175,7 @@ revive_block(int sdno) { bp->b_dev = VINUM_SD(sdno); /* create the device number */ bp->b_flags &= ~B_DONE; /* no longer done */ - bp->b_ioflags = BIO_ORDERED; /* and make this an ordered write */ + bp->b_ioflags = 0; bp->b_iocmd = BIO_WRITE; bp->b_resid = bp->b_bcount; bp->b_blkno = sd->revived; /* write it to here */ |