CVS commit: src/sys/dev

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Sun Nov 20 02:35:19 UTC 2016

Modified Files:
        src/sys/dev: ccd.c
        src/sys/dev/ata: wd.c

Log Message:
Avoid calling bufq_free() from critical section.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/ccd.c
cvs rdiff -u -r1.426 -r1.427 src/sys/dev/ata/wd.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/ccd.c
diff -u src/sys/dev/ccd.c:1.167 src/sys/dev/ccd.c:1.168
--- src/sys/dev/ccd.c:1.167	Sun Aug  7 02:40:41 2016
+++ src/sys/dev/ccd.c	Sun Nov 20 02:35:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ccd.c,v 1.167 2016/08/07 02:40:41 pgoyette Exp $	*/
+/*	$NetBSD: ccd.c,v 1.168 2016/11/20 02:35:19 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.167 2016/08/07 02:40:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.168 2016/11/20 02:35:19 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -1291,8 +1291,9 @@ ccdioctl(dev_t dev, u_long cmd, void *da
 			kmem_free(vpp, ccio->ccio_ndisks * sizeof(*vpp));
 			kmem_free(cpp, ccio->ccio_ndisks * sizeof(*cpp));
 			disk_detach(&cs->sc_dkdev);
+			mutex_exit(&cs->sc_dvlock);
 			bufq_free(cs->sc_bufq);
-			goto out;
+			return error;
 		}
 
 		/* We can free the temporary variables now. */

Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.426 src/sys/dev/ata/wd.c:1.427
--- src/sys/dev/ata/wd.c:1.426	Fri Aug  5 06:54:22 2016
+++ src/sys/dev/ata/wd.c	Sun Nov 20 02:35:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.426 2016/08/05 06:54:22 christos Exp $ */
+/*	$NetBSD: wd.c,v 1.427 2016/11/20 02:35:19 pgoyette Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.426 2016/08/05 06:54:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.427 2016/11/20 02:35:19 pgoyette Exp $");
 
 #include "opt_ata.h"
 
@@ -482,12 +482,12 @@ wddetach(device_t self, int flags)
 	/* Kill off any queued buffers. */
 	bufq_drain(sc->sc_q);
 
-	bufq_free(sc->sc_q);
 	sc->atabus->ata_killpending(sc->drvp);
 	if (flags & DETACH_POWEROFF)
 		wd_standby(sc, AT_POLL);
 
 	splx(s);
+	bufq_free(sc->sc_q);
 
 	/* Detach disk. */
 	disk_detach(&sc->sc_dk);