Module Name: src
Committed By: pooka
Date: Wed Jun 10 14:17:14 UTC 2009
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
Attempt bailout if config_attach_pseudo() fails. Otherwise, a few
moments later, we'll take a fatal plunge because sc_dev is null.
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.264 src/sys/dev/raidframe/rf_netbsdkintf.c:1.265
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.264 Sat Jun 6 08:10:06 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Jun 10 14:17:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.264 2009/06/06 08:10:06 haad Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.265 2009/06/10 14:17:13 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.264 2009/06/06 08:10:06 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.265 2009/06/10 14:17:13 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1872,6 +1872,9 @@
if (rs->sc_dev==NULL) {
printf("raid%d: config_attach_pseudo failed\n",
raidPtr->raidid);
+ rs->sc_flags &= ~RAIDF_INITED;
+ free(cf, M_RAIDFRAME);
+ return;
}
/* disk_attach actually creates space for the CPU disklabel, among
