diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-08-31 16:34:38 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-08-31 16:34:38 +0000 |
| commit | a1e0564362c3878f54123553b56b666d8ede6d5e (patch) | |
| tree | e68957c221a6a57419a58a279db5da8ecaead08f | |
| parent | activate function should return result of config_activate_children (diff) | |
| download | wireguard-openbsd-a1e0564362c3878f54123553b56b666d8ede6d5e.tar.xz wireguard-openbsd-a1e0564362c3878f54123553b56b666d8ede6d5e.zip | |
in the activate function, order the DVACT_ functions in the order they
can expect to be used
| -rw-r--r-- | sys/scsi/sd.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 6a5f9901651..8ca02b80fd4 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.206 2010/08/28 20:23:22 matthew Exp $ */ +/* $OpenBSD: sd.c,v 1.207 2010/08/31 16:34:38 deraadt Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -273,12 +273,6 @@ sdactivate(struct device *self, int act) switch (act) { case DVACT_ACTIVATE: break; - - case DVACT_DEACTIVATE: - sc->flags |= SDF_DYING; - bufq_drain(sc->sc_bufq); - break; - case DVACT_SUSPEND: /* * Stop the disk. Stopping the disk should flush the @@ -290,13 +284,15 @@ sdactivate(struct device *self, int act) scsi_start(sc->sc_link, SSS_STOP, SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_AUTOCONF); break; - case DVACT_RESUME: scsi_start(sc->sc_link, SSS_START, SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_AUTOCONF); break; + case DVACT_DEACTIVATE: + sc->flags |= SDF_DYING; + bufq_drain(sc->sc_bufq); + break; } - return (rv); } |