summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoryamt <yamt@NetBSD.org>2011-05-28 00:53:04 +0000
committeryamt <yamt@NetBSD.org>2011-05-28 00:53:04 +0000
commitd1cdc187b4fa5505c8fd94cc6c3bbab62d517b8d (patch)
tree90b326d179ccf26a9a5429ca6224ce35f97ca7a3 /sys/dev/raidframe
parent0aec3ac2972a374b699ef60b6d1594d6bed9cdcc (diff)
rf_ReconstructInPlace: don't leave a vnode open on errors.
fixes a part of PR/44972.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index e30b6784038..5634368553a 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.114 2011/05/24 07:33:41 buhrow Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.115 2011/05/28 00:53:04 yamt Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.114 2011/05/24 07:33:41 buhrow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.115 2011/05/28 00:53:04 yamt Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -456,6 +456,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
How about actually getting a vp for it? */
if ((retcode = VOP_GETATTR(vp, &va, curlwp->l_cred)) != 0) {
+ vn_close(vp, FREAD | FWRITE, kauth_cred_get());
rf_lock_mutex2(raidPtr->mutex);
raidPtr->reconInProgress--;
rf_signal_cond2(raidPtr->waitForReconCond);
@@ -465,6 +466,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, curlwp->l_cred);
if (retcode) {
+ vn_close(vp, FREAD | FWRITE, kauth_cred_get());
rf_lock_mutex2(raidPtr->mutex);
raidPtr->reconInProgress--;
rf_signal_cond2(raidPtr->waitForReconCond);