From owner-cvs-src@FreeBSD.ORG  Sat May  3 10:37:10 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 86DDD37B404
	for <cvs-src@FreeBSD.org>; Sat,  3 May 2003 10:37:10 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id 3626F43FDF
	for <cvs-src@FreeBSD.org>; Sat,  3 May 2003 10:37:09 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 638 invoked by uid 1000); 3 May 2003 17:37:09 -0000
Date: Sat, 3 May 2003 10:37:09 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: "Kenneth D. Merry" <ken@FreeBSD.org>
In-Reply-To: <20030503002146.BD38537B49A@hub.freebsd.org>
Message-ID: <Pine.BSF.4.21.0305031033160.607-100000@root.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/cam/scsi scsi_da.c
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: Sat, 03 May 2003 17:37:11 -0000

On Fri, 2 May 2003, Kenneth D. Merry wrote:
>   Modified files:
>     sys/cam/scsi         scsi_da.c 
>   Log:
>   Fix three problems in large (>2TB) device handling:
>    - Make sure we don't release the READ CAPACITY CCB twice

Does the "s/break/return" fix this?

> @@ -1548,8 +1548,8 @@
>  					softc->state = DA_STATE_PROBE2;
>  					free(rdcap, M_TEMP);
>  					xpt_release_ccb(done_ccb);
> -					cam_periph_unlock(periph);
> -					break;
> +					xpt_schedule(periph, /*priority*/5);
> +					return;
>  				}
>  			} else {
>  				block_size = scsi_4btoul(rcaplong->length);

-Nate