From owner-p4-projects@FreeBSD.ORG  Tue Feb 21 22:45:26 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6663F16A423; Tue, 21 Feb 2006 22:45:26 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3F96A16A420
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:45:26 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1480543D45
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:45:26 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LMjQGr080509
	for <perforce@freebsd.org>; Tue, 21 Feb 2006 22:45:26 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LMjPZf080506
	for perforce@freebsd.org; Tue, 21 Feb 2006 22:45:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 21 Feb 2006 22:45:25 GMT
Message-Id: <200602212245.k1LMjPZf080506@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92150 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Feb 2006 22:45:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=92150

Change 92150 by jhb@jhb_slimer on 2006/02/21 22:44:35

	- Don't use callout_drain() when we can't use it.
	- Axe unused callout tohandle.

Affected files ...

.. //depot/projects/smpng/sys/dev/fdc/fdc.c#20 edit

Differences ...

==== //depot/projects/smpng/sys/dev/fdc/fdc.c#20 (text+ko) ====

@@ -250,7 +250,6 @@
 #define FD_NO_TRACK	 -2
 	int	options;	/* FDOPT_* */
 	struct	callout toffhandle;
-	struct	callout tohandle;
 	struct g_geom *fd_geom;
 	struct g_provider *fd_provider;
 	device_t dev;
@@ -647,7 +646,12 @@
 		fdc->fdout |= (FDO_MOEN0 << fd->fdsu);
 		callout_reset(&fd->toffhandle, hz, fd_turnon, fd);
 	} else {
-		callout_drain(&fd->toffhandle);
+		/*
+		 * We can't call drain from a callout and we can't call it
+		 * while holding a lock needed by the callout being drained,
+		 * so use stop for now.
+		 */
+		callout_stop(&fd->toffhandle);
 		fd->flags &= ~(FD_MOTOR|FD_MOTORWAIT);
 		fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu);
 	}
@@ -1199,7 +1203,8 @@
 	mtx_lock(&fdc->fdc_mtx);
 	/* If we go from idle, cancel motor turnoff */
 	if (fd->fd_iocount++ == 0)
-		callout_drain(&fd->toffhandle);
+		/* XXX: Can't drain while holding mutex. */
+		callout_stop(&fd->toffhandle);
 	if (fd->flags & FD_MOTOR) {
 		/* The motor is on, send it directly to the controller */
 		bioq_disksort(&fdc->head, bp);
@@ -1940,7 +1945,6 @@
 	fd->fdsu = fdsu;
 	fd->options = 0;
 	callout_init(&fd->toffhandle, 1);
-	callout_init(&fd->tohandle, 1);
 
 	/* initialize densities for subdevices */
 	fdsettype(fd, fd_native_types[fd->type]);