Module Name: src
Committed By: martin
Date: Mon Sep 18 18:57:33 UTC 2023
Modified Files:
src/sys/dev/raidframe [netbsd-10]: rf_netbsdkintf.c
Log Message:
Pull up following revision(s) (requested by oster in ticket #376):
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.413
A component that is in state rf_ds_reconstructing has failed, and should
not be consulted for DIOCGCACHE.
Fixes an observed panic when rf_get_component_caches() does an IOCTL to
a failed device while reconstruction is in progress.
To generate a diff of this commit:
cvs rdiff -u -r1.410.4.1 -r1.410.4.2 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.410.4.1 src/sys/dev/raidframe/rf_netbsdkintf.c:1.410.4.2
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.410.4.1 Wed Jun 21 16:55:01 2023
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Mon Sep 18 18:57:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.410.4.1 2023/06/21 16:55:01 martin Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.410.4.2 2023/09/18 18:57:33 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.410.4.1 2023/06/21 16:55:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.410.4.2 2023/09/18 18:57:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_raid_autoconfig.h"
@@ -3773,8 +3773,7 @@ rf_get_component_caches(RF_Raid_t *raidP
* Check any non-dead disk, even when currently being
* reconstructed.
*/
- if (!RF_DEAD_DISK(raidPtr->Disks[c].status)
- || raidPtr->Disks[c].status == rf_ds_reconstructing) {
+ if (!RF_DEAD_DISK(raidPtr->Disks[c].status)) {
error = VOP_IOCTL(raidPtr->raid_cinfo[c].ci_vp,
DIOCGCACHE, &dkpart, FREAD, NOCRED);
if (error) {
