Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with unconfiguring components in the autoconfigure case.

This commit is contained in:
oster 2000-02-24 23:39:21 +00:00
parent a84d573e15
commit bdd659fc7f
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/raidframe/rf_driver.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_driver.c,v 1.30 2000/02/23 03:44:02 oster Exp $ */ /* $NetBSD: rf_driver.c,v 1.31 2000/02/24 23:39:21 oster Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -296,10 +296,17 @@ rf_UnconfigureVnodes( raidPtr )
for (r = 0; r < raidPtr->numRow; r++) { for (r = 0; r < raidPtr->numRow; r++) {
for (c = 0; c < raidPtr->numCol; c++) { for (c = 0; c < raidPtr->numCol; c++) {
printf("Closing vnode for row: %d col: %d\n", r, c); printf("Closing vnode for row: %d col: %d\n", r, c);
if (raidPtr->raid_cinfo[r][c].ci_vp) { if (raidPtr->raid_cinfo[r][c].ci_vp != NULL) {
VOP_UNLOCK(raidPtr->raid_cinfo[r][c].ci_vp, 0); if (raidPtr->Disks[r][c].auto_configured == 1) {
(void) vn_close(raidPtr->raid_cinfo[r][c].ci_vp, VOP_CLOSE(raidPtr->raid_cinfo[r][c].ci_vp,
FREAD | FWRITE, p->p_ucred, p); FREAD, NOCRED, 0);
vput(raidPtr->raid_cinfo[r][c].ci_vp);
} else {
VOP_UNLOCK(raidPtr->raid_cinfo[r][c].ci_vp, 0);
(void) vn_close(raidPtr->raid_cinfo[r][c].ci_vp,
FREAD | FWRITE, p->p_ucred, p);
}
raidPtr->raid_cinfo[r][c].ci_vp = NULL; raidPtr->raid_cinfo[r][c].ci_vp = NULL;
} else { } else {
printf("vnode was NULL\n"); printf("vnode was NULL\n");
@ -310,9 +317,16 @@ rf_UnconfigureVnodes( raidPtr )
for (r = 0; r < raidPtr->numSpare; r++) { for (r = 0; r < raidPtr->numSpare; r++) {
printf("Closing vnode for spare: %d\n", r); printf("Closing vnode for spare: %d\n", r);
if (raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp) { if (raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp) {
VOP_UNLOCK(raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp, 0); if (raidPtr->Disks[r][c].auto_configured == 1) {
(void) vn_close(raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp, VOP_CLOSE(raidPtr->raid_cinfo[0][raidPtr->numCol +r].ci_vp,
FREAD | FWRITE, p->p_ucred, p); FREAD, NOCRED, 0);
vput(raidPtr->raid_cinfo[0][raidPtr->numCol +r].ci_vp);
} else {
VOP_UNLOCK(raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp, 0);
(void) vn_close(raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp,
FREAD | FWRITE, p->p_ucred, p);
}
raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp = NULL; raidPtr->raid_cinfo[0][raidPtr->numCol + r].ci_vp = NULL;
} else { } else {
printf("vnode was NULL\n"); printf("vnode was NULL\n");