From owner-cvs-all@FreeBSD.ORG  Thu Feb 23 19:11:16 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B4F8616A420;
	Thu, 23 Feb 2006 19:11:16 +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 866DD43D53;
	Thu, 23 Feb 2006 19:11:16 +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 k1NJBGew014648;
	Thu, 23 Feb 2006 19:11:16 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJBGOV014647;
	Thu, 23 Feb 2006 19:11:16 GMT (envelope-from jhb)
Message-Id: <200602231911.k1NJBGOV014647@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 23 Feb 2006 19:11:16 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/fdc fdc.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Feb 2006 19:11:16 -0000

jhb         2006-02-23 19:11:16 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/fdc          fdc.c 
  Log:
  - Use callout_init_mtx() to initialize toffhandle callout using the fdc's
    mutex.
  - Don't use callout_drain() to stop the toffhandle callout while holding the
    fdc mutex (this could deadlock) in functions called from softclock
    (callouts aren't allowed to do voluntary sleeps).  Instead, use
    callout_stop().  Note that since we hold the associated mutex and are now
    using callout_init_mtx(), callout_stop() is just as effective as
    callout_drain().  (Though callout_drain() is still needed in detach to
    make sure softclock isn't contesting on our mutex before we destroy the
    mutex.)
  - Remove unused callout 'tohandle' from softc.
  
  MFC after:      1 week
  
  Revision  Changes    Path
  1.309     +5 -9      src/sys/dev/fdc/fdc.c