diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-20 02:51:53 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-20 02:51:53 +0000 |
| commit | f19e4847c461b9d198dc6bcd73c07bb762a026e2 (patch) | |
| tree | 31dd86c4c1ead63e1b288ba001a956ebf3d570fb | |
| parent | 157f786ffba38897086fd1939522ae520bf25253 (diff) | |
bufq_drain() does not need to be done in deactivate; we only need
to deactivate transactions we are currently doing.
ok dlg
| -rw-r--r-- | sys/scsi/cd.c | 3 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 3 | ||||
| -rw-r--r-- | sys/scsi/st.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 507091946bc..759e0271e06 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.192 2010/09/14 04:02:43 dlg Exp $ */ +/* $OpenBSD: cd.c,v 1.193 2010/09/20 02:51:52 deraadt Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -254,7 +254,6 @@ cdactivate(struct device *self, int act) break; case DVACT_DEACTIVATE: sc->sc_flags |= CDF_DYING; - bufq_drain(&sc->sc_bufq); scsi_xsh_del(&sc->sc_xsh); break; } diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index d6cd0fb0093..8e78981de4b 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.214 2010/09/12 02:05:54 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.215 2010/09/20 02:51:52 deraadt Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -290,7 +290,6 @@ sdactivate(struct device *self, int act) break; case DVACT_DEACTIVATE: sc->flags |= SDF_DYING; - bufq_drain(&sc->sc_bufq); scsi_xsh_del(&sc->sc_xsh); break; } diff --git a/sys/scsi/st.c b/sys/scsi/st.c index ac39c9c1949..01dde017fb5 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.112 2010/09/14 04:49:42 dlg Exp $ */ +/* $OpenBSD: st.c,v 1.113 2010/09/20 02:51:52 deraadt Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -357,7 +357,6 @@ stactivate(struct device *self, int act) case DVACT_DEACTIVATE: st->flags |= ST_DYING; - bufq_drain(&st->sc_bufq); scsi_xsh_del(&st->sc_xsh); break; } |