From bb8188c89538d3d7a82ea0438d714333d9d1f38e Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 30 Mar 2003 10:16:31 +0000 Subject: retire the "busy" field in bioqueues, it's served it's purpose. --- sys/kern/subr_disk.c | 8 -------- sys/sys/bio.h | 1 - 2 files changed, 9 deletions(-) (limited to 'sys') diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 3e09cca..35c2295 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -128,8 +128,6 @@ bioq_disksort(bioq, bp) struct bio *bn; struct bio *be; - if (!atomic_cmpset_int(&bioq->busy, 0, 1)) - panic("Recursing in bioq_disksort()"); be = TAILQ_LAST(&bioq->queue, bio_queue); /* * If the queue is empty or we are an @@ -137,7 +135,6 @@ bioq_disksort(bioq, bp) */ if ((bq = bioq_first(bioq)) == NULL) { bioq_insert_tail(bioq, bp); - bioq->busy = 0; return; } else if (bioq->insert_point != NULL) { @@ -166,7 +163,6 @@ bioq_disksort(bioq, bp) if (bq == NULL) { bioq->switch_point = bp; bioq_insert_tail(bioq, bp); - bioq->busy = 0; return; } /* @@ -177,7 +173,6 @@ bioq_disksort(bioq, bp) if (bp->bio_pblkno < bq->bio_pblkno) { bioq->switch_point = bp; TAILQ_INSERT_BEFORE(bq, bp, bio_queue); - bioq->busy = 0; return; } } else { @@ -190,7 +185,6 @@ bioq_disksort(bioq, bp) */ if (bp->bio_pblkno < bq->bio_pblkno) { TAILQ_INSERT_BEFORE(bq, bp, bio_queue); - bioq->busy = 0; return; } } @@ -202,7 +196,6 @@ bioq_disksort(bioq, bp) */ if (bp->bio_pblkno > be->bio_pblkno) { TAILQ_INSERT_AFTER(&bioq->queue, be, bp, bio_queue); - bioq->busy = 0; return; } @@ -220,7 +213,6 @@ bioq_disksort(bioq, bp) bq = bn; } TAILQ_INSERT_AFTER(&bioq->queue, bq, bp, bio_queue); - bioq->busy = 0; } diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 1628e61..c7e81ea 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -111,7 +111,6 @@ struct bio_queue_head { daddr_t last_pblkno; struct bio *insert_point; struct bio *switch_point; - int busy; }; void biodone(struct bio *bp); -- cgit v1.1