diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 17:13:49 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 17:13:49 +0000 |
commit | 9da4ff9be0005fda5ba6d021ccff292caaca62f6 (patch) | |
tree | b3bdf7cd5c66003daeb0f71ac899d004c887677e /sys/scsi/scsiconf.c | |
parent | f4451ac9824b3e8c645bc2be6cfca6659bf11fcc (diff) |
Add DVACT_QUIECE support. This is called before splhigh() and before
DVACT_SUSPEND, therefore DVACT_QUIECE can do standard sleeping operations
to get ready.
Discussed quite a while back with kettenis and jakemsr, oga suddenly needed
it as well and wrote half of it, so it was time to finish it.
proofread by miod.
Diffstat (limited to 'sys/scsi/scsiconf.c')
-rw-r--r-- | sys/scsi/scsiconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 4c9b23e62e4..c96b94abb4f 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.163 2010/08/25 00:31:35 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.164 2010/08/31 17:13:48 deraadt Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -248,7 +248,11 @@ scsi_activate_lun(struct scsibus_softc *sc, int target, int lun, int act) #endif /* NMPATH */ config_activate(dev); break; - + case DVACT_QUIESCE: + case DVACT_SUSPEND: + case DVACT_RESUME: + config_suspend(dev, act); + break; case DVACT_DEACTIVATE: atomic_setbits_int(&link->state, SDEV_S_DYING); #if NMPATH > 0 @@ -258,10 +262,6 @@ scsi_activate_lun(struct scsibus_softc *sc, int target, int lun, int act) #endif /* NMPATH */ config_deactivate(dev); break; - case DVACT_SUSPEND: - case DVACT_RESUME: - config_suspend(dev, act); - break; default: break; } |