From owner-cvs-src@FreeBSD.ORG  Fri Sep  5 11:27:41 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 3A4F016A4C0; Fri,  5 Sep 2003 11:27:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1426F43FCB; Fri,  5 Sep 2003 11:27:40 -0700 (PDT)
	(envelope-from dg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85IRd0U048005;
	Fri, 5 Sep 2003 11:27:39 -0700 (PDT)
	(envelope-from dg@repoman.freebsd.org)
Received: (from dg@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85IRdM6048004;
	Fri, 5 Sep 2003 11:27:39 -0700 (PDT)
Message-Id: <200309051827.h85IRdM6048004@repoman.freebsd.org>
From: David Greenman <dg@FreeBSD.org>
Date: Fri, 5 Sep 2003 11:27:39 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: 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 18:27:41 -0000

dg          2003/09/05 11:27:39 PDT

  FreeBSD src repository

  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