diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-09-17 23:19:03 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-09-17 23:19:03 +0000 |
| commit | 04b10274871a4ac0d0f563c8968ab72cc34270e0 (patch) | |
| tree | 91b036c323f4dff23654c319489e7c0ff05319f1 /sys/scsi | |
| parent | 77f1e1b4f7393c8f3c333096dab2f8da7ddf760f (diff) | |
revert scsi_base.c r1.195 and scsiconf.h r1.138 as it screws up with some
disks in atascsi.
as reported in pr6470
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/scsi_base.c | 24 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 3 |
2 files changed, 9 insertions, 18 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index d13c2017556..ca804c9b368 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.195 2010/09/14 01:39:44 dlg Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.196 2010/09/17 23:19:02 dlg Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -527,9 +527,7 @@ scsi_xsh_del(struct scsi_xshandler *xsh) break; case RUNQ_POOLQ: TAILQ_REMOVE(&link->pool->queue, &xsh->ioh, q_entry); - link->pending--; - if (ISSET(link->state, SDEV_S_DYING) && link->pending == 0) - wakeup_one(&link->pending); + link->openings++; break; default: panic("unexpected xsh state %u", xsh->ioh.q_state); @@ -554,10 +552,9 @@ scsi_xsh_runqueue(struct scsi_link *link) runq = 0; mtx_enter(&link->pool->mtx); - while (!ISSET(link->state, SDEV_S_DYING) && - link->pending < link->openings && + while (!ISSET(link->state, SDEV_S_DYING) && link->openings && ((ioh = TAILQ_FIRST(&link->queue)) != NULL)) { - link->pending++; + link->openings--; TAILQ_REMOVE(&link->queue, ioh, q_entry); TAILQ_INSERT_TAIL(&link->pool->queue, ioh, q_entry); @@ -684,14 +681,11 @@ scsi_link_shutdown(struct scsi_link *link) xsh->link == link) { TAILQ_REMOVE(&iopl->queue, &xsh->ioh, q_entry); xsh->ioh.q_state = RUNQ_IDLE; - link->pending--; + link->openings++; TAILQ_INSERT_TAIL(&sleepers, &xsh->ioh, q_entry); } } - - while (link->pending > 0) - msleep(&link->pending, &iopl->mtx, PRIBIO, "pendxs", 0); mtx_leave(&iopl->mtx); while ((ioh = TAILQ_FIRST(&sleepers)) != NULL) { @@ -706,8 +700,8 @@ scsi_link_open(struct scsi_link *link) int open = 0; mtx_enter(&link->pool->mtx); - if (link->pending < link->openings) { - link->pending++; + if (link->openings) { + link->openings--; open = 1; } mtx_leave(&link->pool->mtx); @@ -719,9 +713,7 @@ void scsi_link_close(struct scsi_link *link) { mtx_enter(&link->pool->mtx); - link->pending--; - if (ISSET(link->state, SDEV_S_DYING) && link->pending == 0) - wakeup_one(&link->pending); + link->openings++; mtx_leave(&link->pool->mtx); scsi_xsh_runqueue(link); diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 8cee11a3f72..1c38b9ded84 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.138 2010/09/14 01:39:44 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.139 2010/09/17 23:19:02 dlg Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -396,7 +396,6 @@ struct scsi_link { struct scsi_runq queue; u_int running; - u_short pending; struct scsi_iopool *pool; }; |