diff options
| author | mav <mav@FreeBSD.org> | 2011-07-30 21:42:53 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2011-07-30 21:42:53 +0000 |
| commit | 16484690884efd6341d529d335b9faf17bef69bb (patch) | |
| tree | f0a43fde2cffbadc65a6da180b71b338f9e94df1 /sys/cam | |
| parent | 4e3d572cde7b95f9285d7c78ea067200cec32c6c (diff) | |
| download | FreeBSD-src-16484690884efd6341d529d335b9faf17bef69bb.zip FreeBSD-src-16484690884efd6341d529d335b9faf17bef69bb.tar.gz | |
Higher-priority initialization request can eat request scheduling done from
adaclose(). Add immediate_priority check into adaschedule() to restore it.
Approved by: re (kib)
MFC after: 1 week
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ata/ata_da.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index c0be395..b1d5ea8 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -484,12 +484,20 @@ static void adaschedule(struct cam_periph *periph) { struct ada_softc *softc = (struct ada_softc *)periph->softc; + uint32_t prio; + /* Check if cam_periph_getccb() was called. */ + prio = periph->immediate_priority; + + /* Check if we have more work to do. */ if (bioq_first(&softc->bio_queue) || (!softc->trim_running && bioq_first(&softc->trim_queue))) { - /* Have more work to do, so ensure we stay scheduled */ - xpt_schedule(periph, CAM_PRIORITY_NORMAL); + prio = CAM_PRIORITY_NORMAL; } + + /* Schedule CCB if any of above is true. */ + if (prio != CAM_PRIORITY_NONE) + xpt_schedule(periph, prio); } /* |
