summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-02-22 09:26:35 +0000
committerphk <phk@FreeBSD.org>2002-02-22 09:26:35 +0000
commitb9b775cf13e59a7cc373855362fec46d7b862077 (patch)
treec52fd868262e61a637aaf017a4cb137977bf47ce /sys
parent8b5a71f365fa771240bb1b5f8790a9c194013468 (diff)
downloadFreeBSD-src-b9b775cf13e59a7cc373855362fec46d7b862077.zip
FreeBSD-src-b9b775cf13e59a7cc373855362fec46d7b862077.tar.gz
GC: BIO_ORDERED, various infrastructure dealing with BIO_ORDERED.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_devstat.c3
-rw-r--r--sys/kern/subr_disklabel.c3
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/sys/bio.h6
-rw-r--r--sys/vm/swap_pager.c2
5 files changed, 4 insertions, 12 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);
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 6536e9d..c1c515b 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -93,7 +93,6 @@ struct bio {
/* bio_flags */
#define BIO_ERROR 0x00000001
-#define BIO_ORDERED 0x00000002
#define BIO_DONE 0x00000004
#define BIO_FLAG2 0x40000000 /* Available for local hacks */
#define BIO_FLAG1 0x80000000 /* Available for local hacks */
@@ -152,10 +151,7 @@ bioq_init(struct bio_queue_head *head)
static __inline void
bioq_insert_tail(struct bio_queue_head *head, struct bio *bp)
{
- if ((bp->bio_flags & BIO_ORDERED) != 0) {
- head->insert_point = bp;
- head->switch_point = NULL;
- }
+
TAILQ_INSERT_TAIL(&head->queue, bp, bio_queue);
}
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index b8880ef..57f2c9c 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -2078,7 +2078,7 @@ getchainbuf(struct bio *bp, struct vnode *vp, int flags)
waitchainbuf(bp, 4, 0);
nbp->b_iocmd = bp->bio_cmd;
- nbp->b_ioflags = bp->bio_flags & BIO_ORDERED;
+ nbp->b_ioflags = 0;
nbp->b_flags = flags;
nbp->b_rcred = crhold(proc0.p_ucred);
nbp->b_wcred = crhold(proc0.p_ucred);
OpenPOWER on IntegriCloud