From owner-cvs-src@FreeBSD.ORG  Fri Sep  5 12:50:38 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6BFEC16A4DB
	for <cvs-src@FreeBSD.org>; Fri,  5 Sep 2003 12:50:38 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id A6A1E44025
	for <cvs-src@FreeBSD.org>; Fri,  5 Sep 2003 12:50:35 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 72187 invoked by uid 1000); 5 Sep 2003 19:50:36 -0000
Date: Fri, 5 Sep 2003 12:50:36 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: David Greenman <dg@FreeBSD.org>
In-Reply-To: <20030905182744.6630916A4E8@hub.freebsd.org>
Message-ID: <20030905124936.F72174@root.org>
References: <20030905182744.6630916A4E8@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/ata ata-all.c ata-disk.c ata-disk.h   
 atapi-all.c atapi-all.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2003 19:50:38 -0000

On Fri, 5 Sep 2003, David Greenman wrote:
>   Modified files:        (Branch: RELENG_4)
>     sys/dev/ata          ata-all.c ata-disk.c ata-disk.h
>                          atapi-all.c atapi-all.h
>   Log:
>   Fixed panics that will occur during attempts to rescan ATA disk devices
>   (which occur after disk errors). The panic is due to attempts to acquire
>   the ATA channel lock multiple times (at different levels), with the second
>   attempt trying to sleep in an interrupt context. The fix is to indicate
>   to the other levels that we already have the lock.
>   The problem has been fixed in -current a different way and isn't portable
>   to -stable.
>
>   Reviewed by:    sos@freebsd.org
>   Approved by:    re@freebsd.org
>
>   Revision   Changes    Path
>   1.50.2.47  +12 -12    src/sys/dev/ata/ata-all.c
>   1.60.2.27  +3 -2      src/sys/dev/ata/ata-disk.c
>   1.22.2.9   +1 -1      src/sys/dev/ata/ata-disk.h
>   1.46.2.20  +3 -2      src/sys/dev/ata/atapi-all.c
>   1.22.2.12  +1 -1      src/sys/dev/ata/atapi-all.h

Yikes, invasive.  Is there a way to do a "if (held(lock))" construct
instead?

-Nate