Tue Apr 26 07:41:18 2011 UTC ()

Fixup previous.

The bug was in scsibusdetach(), which is not doing things in the proper
order: it has to detach its children and check for error.  If no error,
then it can release the resources that the children were using.

From David Young via source-changes-d.


(hannken)

diff -r1.261 -r1.262 src/sys/dev/scsipi/scsiconf.c

--- src/sys/dev/scsipi/scsiconf.c 2011/04/25 14:14:22	1.261
+++ src/sys/dev/scsipi/scsiconf.c 2011/04/26 07:41:18	1.262

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsiconf.c,v 1.261 2011/04/25 14:14:22 hannken Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.262 2011/04/26 07:41:18 hannken Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,27 +38,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.261 2011/04/25 14:14:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.262 2011/04/26 07:41:18 hannken Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/once.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/scsiio.h>
 @@ -246,60 +246,61 @@ scsibus_config(struct scsipi_channel *ch
 	config_pending_decr();
+}
 static int
 scsibusdetach(device_t self, int flags)
+{
 	struct scsibus_softc *sc = device_private(self);
 	struct scsipi_channel *chan = sc->sc_channel;
 	struct scsipi_periph *periph;
 	int ctarget, clun;
 	struct scsipi_xfer *xs;
 	int error;
 	/*
 	 * Detach all of the periphs.
 	 */
 	if ((error = scsipi_target_detach(chan, -1, -1, flags)) != 0)
 		return error;
 	pmf_device_deregister(self);
 	/*
 	 * Process outstanding commands (which will never complete as the
 	 * controller is gone).
+	 *
 	 * XXX Surely this is redundant?  If we get this far, the
 	 * XXX peripherals have all been detached.
 	 */
 	for (ctarget = 0; ctarget < chan->chan_ntargets; ctarget++) {
 		if (ctarget == chan->chan_id)
 			continue;
 		for (clun = 0; clun < chan->chan_nluns; clun++) {
 			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;
 				scsipi_done(xs);
+			}
+		}
+	}
 	/*
 	 * Detach all of the periphs.
 	 */
 	error = scsipi_target_detach(chan, -1, -1, flags);
 	/*
 	 * Now shut down the channel.
 	 * XXX only if no errors ?
 	 */
 	scsipi_channel_shutdown(chan);
-	return (error);
+	return 0;
+}
 /*
  * Probe the requested scsi bus. It must be already set up.
  * target and lun optionally narrow the search if not -1
  */
 int
 scsi_probe_bus(struct scsibus_softc *sc, int target, int lun)
+{
 	struct scsipi_channel *chan = sc->sc_channel;
 	int maxtarget, mintarget, maxlun, minlun;
 	int error;