Revert "da: Independant read/write bioqs are used, so no need to use bioqdisksort"
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 19 Nov 2013 02:43:31 +0000 (10:43 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 19 Nov 2013 02:43:31 +0000 (10:43 +0800)
This reverts commit 3f9f5f9aaf14daa1f014ab9c4780f90b4c17bd6d.

bioqdisksort may be augmented later to support read-read or write-write
reordering.  At least currently it does not hurt, so leave it there.

Pointed-out-by: dillon@
sys/bus/cam/scsi/scsi_da.c

index 16a04c3..aa0ce8d 100644 (file)
@@ -733,11 +733,11 @@ dastrategy(struct dev_strategy_args *ap)
         * Place it in the queue of disk activities for this disk
         */
        if (bp->b_cmd == BUF_CMD_WRITE || bp->b_cmd == BUF_CMD_FLUSH)
-               bioq_insert_tail(&softc->bio_queue_wr, bio);
+               bioqdisksort(&softc->bio_queue_wr, bio);
        else if (bp->b_cmd == BUF_CMD_FREEBLKS) 
-               bioq_insert_tail(&softc->bio_queue_trim, bio);
+               bioqdisksort(&softc->bio_queue_trim, bio);
        else
-               bioq_insert_tail(&softc->bio_queue_rd, bio);
+               bioqdisksort(&softc->bio_queue_rd, bio);
        
        /*
         * Schedule ourselves for performing the work.