CVS commit: [netbsd-5] src/sys/dev/raidframe

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Fri May 20 19:24:54 UTC 2011

Modified Files:
        src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c

Log Message:
Pull up following revision(s) (requested by buhrow in ticket #1615):
        sys/dev/raidframe/rf_netbsdkintf.c: revision 1.280 via patch
PR/44340: Brian Buhrow: Raid sets containing wedges cannot be unconfigured
and reconfigured without a reboot.


To generate a diff of this commit:
cvs rdiff -u -r1.250.4.10 -r1.250.4.11 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.250.4.10 src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.11
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.10	Fri Jan  7 23:27:51 2011
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Fri May 20 19:24:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.250.4.10 2011/01/07 23:27:51 riz Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.250.4.11 2011/05/20 19:24:54 bouyer Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -139,7 +139,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250.4.10 2011/01/07 23:27:51 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250.4.11 2011/05/20 19:24:54 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -851,6 +851,7 @@
 			free(cf, M_RAIDFRAME);
 			
 			/* Detach the disk. */
+			dkwedge_delall(&rs->sc_dkdev);
 			disk_detach(&rs->sc_dkdev);
 			disk_destroy(&rs->sc_dkdev);
 		}
@@ -1201,6 +1202,7 @@
 		free(cf, M_RAIDFRAME);
 
 		/* Detach the disk. */
+		dkwedge_delall(&rs->sc_dkdev);
 		disk_detach(&rs->sc_dkdev);
 		disk_destroy(&rs->sc_dkdev);