diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_devstat.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_disklabel.c | 3 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 8831a2f..dabdf9d 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -240,8 +240,7 @@ devstat_end_transaction_bio(struct devstat *ds, struct bio *bp) flg = DEVSTAT_WRITE; devstat_end_transaction(ds, bp->bio_bcount - bp->bio_resid, - (bp->bio_flags & BIO_ORDERED) ? - DEVSTAT_TAG_ORDERED : DEVSTAT_TAG_SIMPLE, flg); + DEVSTAT_TAG_SIMPLE, flg); } /* diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index a0f2f3d..05339cb 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -105,8 +105,7 @@ bioqdisksort(bioq, bp) * If the queue is empty or we are an * ordered transaction, then it's easy. */ - if ((bq = bioq_first(bioq)) == NULL - || (bp->bio_flags & BIO_ORDERED) != 0) { + if ((bq = bioq_first(bioq)) == NULL) { bioq_insert_tail(bioq, bp); bioq->busy = 0; return; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 386d1dd..32e91ca 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1286,7 +1286,6 @@ brelse(struct buf * bp) BUF_UNLOCK(bp); bp->b_flags &= ~(B_ASYNC | B_NOCACHE | B_AGE | B_RELBUF | B_DIRECT | B_NOWDRAIN); - bp->b_ioflags &= ~BIO_ORDERED; if ((bp->b_flags & B_DELWRI) == 0 && (bp->b_xflags & BX_VNDIRTY)) panic("brelse: not dirty"); splx(s); @@ -1356,7 +1355,6 @@ bqrelse(struct buf * bp) /* unlock */ BUF_UNLOCK(bp); bp->b_flags &= ~(B_ASYNC | B_NOCACHE | B_AGE | B_RELBUF); - bp->b_ioflags &= ~BIO_ORDERED; if ((bp->b_flags & B_DELWRI) == 0 && (bp->b_xflags & BX_VNDIRTY)) panic("bqrelse: not dirty"); splx(s); |
