diff options
| author | dyoung <dyoung@NetBSD.org> | 2009-07-23 21:38:33 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2009-07-23 21:38:33 +0000 |
| commit | 90dc63ec1458c01403cc40177a67652b26d0550c (patch) | |
| tree | 0f8a8a05f9721a0d87bbc0355597820667febe32 /sys/dev | |
| parent | 487ea78a9ca06400e1353f72c9a4f042c4ecd0c1 (diff) | |
Extract ldlastclose() and use it in ldclose(). At the top of
ldbegindetach(), call disk_begindetach(..., ldlastclose, ...).
Compiles. Not tested.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ld.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/sys/dev/ld.c b/sys/dev/ld.c index 9dfcf8aa8a4..e626b6b0cce 100644 --- a/sys/dev/ld.c +++ b/sys/dev/ld.c @@ -1,4 +1,4 @@ -/* $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. @@ -34,7 +34,7 @@ */ #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" @@ -71,6 +71,7 @@ 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; @@ -183,8 +184,10 @@ ldbegindetach(struct ld_softc *sc, int flags) if ((sc->sc_flags & LDF_ENABLED) == 0) return (0); - if ((flags & DETACH_FORCE) == 0 && sc->sc_dk.dk_openmask != 0) - return (EBUSY); + rv = disk_begindetach(&sc->sc_dk, ldlastclose, sc->sc_dv, flags); + + if (rv != 0) + return rv; s = splbio(); sc->sc_maxqueuecnt = 0; @@ -321,6 +324,19 @@ ldopen(dev_t dev, int flags, int fmt, struct lwp *l) 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) @@ -345,12 +361,8 @@ ldclose(dev_t dev, int flags, int fmt, struct lwp *l) 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_flush != NULL && (*sc->sc_flush)(sc, 0) != 0) - aprint_error_dev(sc->sc_dv, "unable to flush cache\n"); - if ((sc->sc_flags & LDF_KLABEL) == 0) - sc->sc_flags &= ~LDF_VLABEL; - } + if (sc->sc_dk.dk_openmask == 0) + ldlastclose(sc->sc_dv); mutex_exit(&sc->sc_dk.dk_openlock); return (0); |
