From owner-p4-projects@FreeBSD.ORG  Tue Jul  7 19:50:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD979106567E; Tue,  7 Jul 2009 19:50:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BBF5106564A
	for <perforce@freebsd.org>; Tue,  7 Jul 2009 19:50:14 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 79C3D8FC1D
	for <perforce@freebsd.org>; Tue,  7 Jul 2009 19:50:14 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n67JoEs1000274
	for <perforce@freebsd.org>; Tue, 7 Jul 2009 19:50:14 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n67JoErh000272
	for perforce@freebsd.org; Tue, 7 Jul 2009 19:50:14 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 7 Jul 2009 19:50:14 GMT
Message-Id: <200907071950.n67JoErh000272@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165779 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, 07 Jul 2009 19:50:16 -0000

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

Change 165779 by mav@mav_mavbook on 2009/07/07 19:49:55

	Allow SIM driver to announce maxio above MAXPHYS.
	It may be not error, so just limit it to not confuse above layers.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#41 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#41 (text+ko) ====

@@ -1251,7 +1251,7 @@
 	if (cpi.maxio == 0)
 		softc->disk->d_maxsize = DFLTPHYS;	/* traditional default */
 	else if (cpi.maxio > MAXPHYS)
-		softc->disk->d_maxsize = DFLTPHYS;	/* for safety */
+		softc->disk->d_maxsize = MAXPHYS;	/* for safety */
 	else
 		softc->disk->d_maxsize = cpi.maxio;
 	softc->disk->d_unit = periph->unit_number;