 @@ -1,14 +1,14 @@
-/*	$NetBSD: ld.c,v 1.65 2009/05/07 09:11:42 cegger Exp $	*/
+/*	$NetBSD: ld.c,v 1.66 2009/07/23 21:38:33 dyoung Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Charles M. Hannum.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Disk driver for use by RAID controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.65 2009/05/07 09:11:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.66 2009/07/23 21:38:33 dyoung Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/endian.h>
 #include <sys/disklabel.h>
 @@ -61,26 +61,27 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.65
 #endif
 #include <dev/ldvar.h>
 #include <prop/proplib.h>
 static void	ldgetdefaultlabel(struct ld_softc *, struct disklabel *);
 static void	ldgetdisklabel(struct ld_softc *);
 static void	ldminphys(struct buf *bp);
 static bool	ld_shutdown(device_t, int);
 static void	ldstart(struct ld_softc *, struct buf *);
 static void	ld_set_properties(struct ld_softc *);
 static void	ld_config_interrupts (device_t);
 static int	ldlastclose(device_t);
 extern struct	cfdriver ld_cd;
 static dev_type_open(ldopen);
 static dev_type_close(ldclose);
 static dev_type_read(ldread);
 static dev_type_write(ldwrite);
 static dev_type_ioctl(ldioctl);
 static dev_type_strategy(ldstrategy);
 static dev_type_dump(lddump);
 static dev_type_size(ldsize);
 const struct bdevsw ld_bdevsw = {
 @@ -173,28 +174,30 @@ ldadjqparam(struct ld_softc *sc, int xma
 	splx(s);
 	return (0);
+}
 int
 ldbegindetach(struct ld_softc *sc, int flags)
+{
 	int s, rv = 0;
 	if ((sc->sc_flags & LDF_ENABLED) == 0)
 		return (0);
-	if ((flags & DETACH_FORCE) == 0 && sc->sc_dk.dk_openmask != 0)
+	rv = disk_begindetach(&sc->sc_dk, ldlastclose, sc->sc_dv, flags);
 		return (EBUSY);
 	if (rv != 0)
 		return rv;
 	s = splbio();
 	sc->sc_maxqueuecnt = 0;
 	sc->sc_flags |= LDF_DETACH;
 	while (sc->sc_queuecnt > 0) {
 		sc->sc_flags |= LDF_DRAIN;
 		rv = tsleep(&sc->sc_queuecnt, PRIBIO, "lddrn", 0);
 		if (rv)
 			break;
+	}
 	splx(s);
 	return (rv);
 @@ -311,56 +314,65 @@ ldopen(dev_t dev, int flags, int fmt, st
 	case S_IFBLK:
 		sc->sc_dk.dk_bopenmask |= (1 << part);
 		break;
+	}
 	sc->sc_dk.dk_openmask =
 	    sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
 	error = 0;
  bad1:
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	return (error);
+}
 static int
 ldlastclose(device_t self)
+{
 	struct ld_softc *sc = device_private(self);
 	if (sc->sc_flush != NULL && (*sc->sc_flush)(sc, 0) != 0)
 		aprint_error_dev(self, "unable to flush cache\n");
 	if ((sc->sc_flags & LDF_KLABEL) == 0)
 		sc->sc_flags &= ~LDF_VLABEL;
 	return 0;
+}
 /* ARGSUSED */
 static int
 ldclose(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct ld_softc *sc;
 	int part, unit;
 	unit = DISKUNIT(dev);
 	part = DISKPART(dev);
 	sc = device_lookup_private(&ld_cd, unit);
 	mutex_enter(&sc->sc_dk.dk_openlock);
 	switch (fmt) {
 	case S_IFCHR:
 		sc->sc_dk.dk_copenmask &= ~(1 << part);
 		break;
 	case S_IFBLK:
 		sc->sc_dk.dk_bopenmask &= ~(1 << part);
 		break;
+	}
 	sc->sc_dk.dk_openmask =
 	    sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
-	if (sc->sc_dk.dk_openmask == 0) {
+	if (sc->sc_dk.dk_openmask == 0)
-		if (sc->sc_flush != NULL && (*sc->sc_flush)(sc, 0) != 0)
+		ldlastclose(sc->sc_dv);
 			aprint_error_dev(sc->sc_dv, "unable to flush cache\n");
 		if ((sc->sc_flags & LDF_KLABEL) == 0)
 			sc->sc_flags &= ~LDF_VLABEL;
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	return (0);
+}
 /* ARGSUSED */
 static int
 ldread(dev_t dev, struct uio *uio, int ioflag)
+{
 	return (physio(ldstrategy, NULL, dev, B_READ, ldminphys, uio));
+}