Module Name: src Committed By: jld Date: Mon Mar 1 21:10:27 UTC 2010
Modified Files: src/sys/dev/raidframe: rf_disks.c Log Message: When setting up a non-autoconfigured RAID set, fail a component if the attempt to read its label fails. OKed by os...@. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/dev/raidframe/rf_disks.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_disks.c diff -u src/sys/dev/raidframe/rf_disks.c:1.72 src/sys/dev/raidframe/rf_disks.c:1.73 --- src/sys/dev/raidframe/rf_disks.c:1.72 Tue Nov 17 18:54:26 2009 +++ src/sys/dev/raidframe/rf_disks.c Mon Mar 1 21:10:26 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.72 2009/11/17 18:54:26 jld Exp $ */ +/* $NetBSD: rf_disks.c,v 1.73 2010/03/01 21:10:26 jld Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -60,7 +60,7 @@ ***************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.72 2009/11/17 18:54:26 jld Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.73 2010/03/01 21:10:26 jld Exp $"); #include <dev/raidframe/raidframevar.h> @@ -132,7 +132,9 @@ goto fail; if (disks[c].status == rf_ds_optimal) { - raidfetch_component_label(raidPtr, c); + ret = raidfetch_component_label(raidPtr, c); + if (ret) + goto fail; } if (disks[c].status != rf_ds_optimal) {