Module Name: src
Committed By: mlelstv
Date: Sat Jan 2 16:10:06 UTC 2016
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
RAIDF_INITED state also includes disk attachments, don't undo operations
that haven't been committed.
To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 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.332 src/sys/dev/raidframe/rf_netbsdkintf.c:1.333
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.332 Sat Jan 2 16:06:25 2016
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Jan 2 16:10:06 2016
@@ -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 *
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");
