From owner-p4-projects@FreeBSD.ORG  Sat Jun 27 17:00:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 59A121065675; Sat, 27 Jun 2009 17:00:07 +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 0A601106564A
	for <perforce@freebsd.org>; Sat, 27 Jun 2009 17:00:06 +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 DE5628FC12
	for <perforce@freebsd.org>; Sat, 27 Jun 2009 17:00:06 +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 n5RH06ow061920
	for <perforce@freebsd.org>; Sat, 27 Jun 2009 17:00:06 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5RH06uG061918
	for perforce@freebsd.org; Sat, 27 Jun 2009 17:00:06 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 27 Jun 2009 17:00:06 GMT
Message-Id: <200906271700.n5RH06uG061918@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 165322 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: Sat, 27 Jun 2009 17:00:08 -0000

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

Change 165322 by mav@mav_mavbook on 2009/06/27 16:59:08

	Limit XPT_DEV_MATCH request by 50 entries to fit again into DFLTPHYS
	of 64K.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#9 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#9 (text+ko) ====

@@ -321,7 +321,7 @@
 	ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
 
 	ccb.ccb_h.func_code = XPT_DEV_MATCH;
-	bufsize = sizeof(struct dev_match_result) * 100;
+	bufsize = sizeof(struct dev_match_result) * 50;
 	ccb.cdm.match_buf_len = bufsize;
 	ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
 	if (ccb.cdm.matches == NULL) {
@@ -340,7 +340,7 @@
 
 	/*
 	 * We do the ioctl multiple times if necessary, in case there are
-	 * more than 100 nodes in the EDT.
+	 * more than 50 nodes in the EDT.
 	 */
 	do {
 		if (ioctl(fd, CAMIOCOMMAND, &ccb) == -1) {