Left-shift another else{} chunk. No functional changes.
This commit is contained in:
parent
b7bb3e3c62
commit
abbecc25a2
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rf_reconstruct.c,v 1.62 2003/12/31 03:51:28 oster Exp $ */
|
/* $NetBSD: rf_reconstruct.c,v 1.63 2003/12/31 04:00:01 oster Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
************************************************************/
|
************************************************************/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.62 2003/12/31 03:51:28 oster Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.63 2003/12/31 04:00:01 oster Exp $");
|
||||||
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/buf.h>
|
#include <sys/buf.h>
|
||||||
|
@ -451,17 +451,18 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
|
||||||
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
||||||
return(retcode);
|
return(retcode);
|
||||||
|
|
||||||
} else {
|
}
|
||||||
|
|
||||||
/* Ok, so we can at least do a lookup...
|
/* Ok, so we can at least do a lookup...
|
||||||
How about actually getting a vp for it? */
|
How about actually getting a vp for it? */
|
||||||
|
|
||||||
if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred,
|
if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
|
||||||
proc)) != 0) {
|
|
||||||
RF_LOCK_MUTEX(raidPtr->mutex);
|
RF_LOCK_MUTEX(raidPtr->mutex);
|
||||||
raidPtr->reconInProgress--;
|
raidPtr->reconInProgress--;
|
||||||
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
||||||
return(retcode);
|
return(retcode);
|
||||||
}
|
}
|
||||||
|
|
||||||
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart,
|
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart,
|
||||||
FREAD, proc->p_ucred, proc);
|
FREAD, proc->p_ucred, proc);
|
||||||
if (retcode) {
|
if (retcode) {
|
||||||
|
@ -487,9 +488,6 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
|
||||||
raidPtr->Disks[col].numBlocks = raidPtr->Disks[col].numBlocks *
|
raidPtr->Disks[col].numBlocks = raidPtr->Disks[col].numBlocks *
|
||||||
rf_sizePercentage / 100;
|
rf_sizePercentage / 100;
|
||||||
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
RF_UNLOCK_MUTEX(raidPtr->mutex);
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
spareDiskPtr = &raidPtr->Disks[col];
|
spareDiskPtr = &raidPtr->Disks[col];
|
||||||
spareDiskPtr->status = rf_ds_used_spare;
|
spareDiskPtr->status = rf_ds_used_spare;
|
||||||
|
|
Loading…
Reference in New Issue