Module Name: src Committed By: hannken Date: Tue Apr 13 07:58:55 UTC 2010
Modified Files: src/sys/dev: fss.c Log Message: fss_softc_free: don't detach a disk that is not attached. Disk is attached only if the backing store thread is running. Resolves PR #43153: fss error branch error To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/dev/fss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/fss.c diff -u src/sys/dev/fss.c:1.67 src/sys/dev/fss.c:1.68 --- src/sys/dev/fss.c:1.67 Mon Apr 12 22:29:11 2010 +++ src/sys/dev/fss.c Tue Apr 13 07:58:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: fss.c,v 1.67 2010/04/12 22:29:11 pooka Exp $ */ +/* $NetBSD: fss.c,v 1.68 2010/04/13 07:58:54 hannken Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.67 2010/04/12 22:29:11 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.68 2010/04/13 07:58:54 hannken Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -473,9 +473,9 @@ while (sc->sc_bs_lwp != NULL) kpause("fssdetach", false, 1, &sc->sc_slock); mutex_exit(&sc->sc_slock); - } - disk_detach(sc->sc_dkdev); + disk_detach(sc->sc_dkdev); + } if (sc->sc_copied != NULL) kmem_free(sc->sc_copied, howmany(sc->sc_clcount, NBBY));