summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2016-01-02 16:10:06 +0000
committermlelstv <mlelstv@NetBSD.org>2016-01-02 16:10:06 +0000
commitbda5dde6e1061ddb48eae6bc23df0c588737bd95 (patch)
tree2a052bd06200d81286b63a879b7793d3e480ad95 /sys/dev/raidframe
parent9a997e85bd17f014178df1825aba76013724b559 (diff)
RAIDF_INITED state also includes disk attachments, don't undo operations
that haven't been committed.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index d01f7d654c9..7a9876e0535 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.332 2016/01/02 16:06:25 mlelstv Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.333 2016/01/02 16:10:06 mlelstv 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.332 2016/01/02 16:06:25 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.333 2016/01/02 16:10:06 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1026,17 +1026,20 @@ raid_detach_unlocked(struct raid_softc *rs)
return EBUSY;
if ((rs->sc_flags & RAIDF_INITED) == 0)
- ; /* not initialized: nothing to do */
- else if ((error = rf_Shutdown(raidPtr)) != 0)
+ return 0;
+
+ rs->sc_flags &= ~RAIDF_SHUTDOWN;
+
+ if ((error = rf_Shutdown(raidPtr)) != 0)
return error;
- else
- rs->sc_flags &= ~(RAIDF_INITED|RAIDF_SHUTDOWN);
/* Detach the disk. */
dkwedge_delall(&rs->sc_dkdev);
disk_detach(&rs->sc_dkdev);
disk_destroy(&rs->sc_dkdev);
+ rs->sc_flags &= ~RAIDF_INITED;
+
/* Free the softc */
aprint_normal_dev(rs->sc_dev, "detached\n");