[src/trunk]: src/sys/dev/scsipi Don't kill outstanding requests when detachin...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a3257711e43e
branches:  trunk
changeset: 764482:a3257711e43e
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Apr 25 14:14:22 2011 +0000

description:
Don't kill outstanding requests when detaching a scsibus on shutdown.
Both the controller and tyhe targets are still running.

diffstat:

 sys/dev/scsipi/scsiconf.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r cdc94394b9f1 -r a3257711e43e sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Mon Apr 25 11:39:42 2011 +0000
+++ b/sys/dev/scsipi/scsiconf.c Mon Apr 25 14:14:22 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.260 2011/04/18 01:47:28 rmind Exp $     */
+/*     $NetBSD: scsiconf.c,v 1.261 2011/04/25 14:14:22 hannken Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.260 2011/04/18 01:47:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.261 2011/04/25 14:14:22 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -269,6 +269,8 @@
                        periph = scsipi_lookup_periph(chan, ctarget, clun);
                        if (periph == NULL)
                                continue;
+                       if ((flags & DETACH_SHUTDOWN) != 0)
+                               return EBUSY;
                        TAILQ_FOREACH(xs, &periph->periph_xferq, device_q) {
                                callout_stop(&xs->xs_callout);
                                xs->error = XS_DRIVER_STUFFUP;