Module Name: src
Committed By: snj
Date: Sun Mar 28 17:25:12 UTC 2010
Modified Files:
src/sys/dev [netbsd-5]: fss.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1345):
sys/dev/fss.c: revision 1.64
Fix a race where the backing store thread runs (and exits immediately)
before kthread_create() returns.
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.1 -r1.60.4.2 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.60.4.1 src/sys/dev/fss.c:1.60.4.2
--- src/sys/dev/fss.c:1.60.4.1 Fri Nov 7 23:32:19 2008
+++ src/sys/dev/fss.c Sun Mar 28 17:25:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.60.4.1 2008/11/07 23:32:19 snj Exp $ */
+/* $NetBSD: fss.c,v 1.60.4.2 2010/03/28 17:25:12 snj Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.60.4.1 2008/11/07 23:32:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.60.4.2 2010/03/28 17:25:12 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -446,11 +446,12 @@
sc->sc_indir_data = NULL;
}
+ sc->sc_flags |= FSS_BS_THREAD;
if ((error = kthread_create(PRI_BIO, 0, NULL, fss_bs_thread, sc,
- &sc->sc_bs_lwp, device_xname(sc->sc_dev))) != 0)
+ &sc->sc_bs_lwp, device_xname(sc->sc_dev))) != 0) {
+ sc->sc_flags &= ~FSS_BS_THREAD;
return error;
-
- sc->sc_flags |= FSS_BS_THREAD;
+ }
disk_attach(sc->sc_dkdev);
