From owner-p4-projects@FreeBSD.ORG  Sat Aug 20 18:27:09 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D3B5E16A421; Sat, 20 Aug 2005 18:27:08 +0000 (GMT)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9013F16A41F;
	Sat, 20 Aug 2005 18:27:08 +0000 (GMT) (envelope-from nate@root.org)
Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 45C0A43D45;
	Sat, 20 Aug 2005 18:27:08 +0000 (GMT) (envelope-from nate@root.org)
Received: from [10.0.0.250] (adsl-64-171-187-230.dsl.snfc21.pacbell.net
	[64.171.187.230])
	by www.cryptography.com (8.12.8/8.12.8) with ESMTP id j7KIR9o5028721
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Sat, 20 Aug 2005 11:27:10 -0700
Message-ID: <430775F8.1060207@root.org>
Date: Sat, 20 Aug 2005 11:27:04 -0700
From: Nate Lawson <nate@root.org>
User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Scott Long <scottl@FreeBSD.org>
References: <200508200355.j7K3tNUw095441@repoman.freebsd.org>
In-Reply-To: <200508200355.j7K3tNUw095441@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews <perforce@FreeBSD.org>
Subject: Re: PERFORCE change 82304 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, 20 Aug 2005 18:27:09 -0000

Scott Long wrote:
> http://perforce.freebsd.org/chv.cgi?CH=82304
> 
> Change 82304 by scottl@scottl-junior on 2005/08/20 03:54:47
> 
> 	Fix unintentional diffs, most relating to $Id$ expansion.
> 
> ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#5 (text+ko) ====
> 
> @@ -38,7 +38,7 @@
>  /* Functions accessed by the peripheral drivers */
>  #ifdef _KERNEL
>  void		xpt_polled_action(union ccb *ccb);
> -union ccb	*xpt_alloc_ccb(int wait);
> +union ccb	*xpt_alloc_ccb(void);
>  union ccb	*xpt_alloc_ccb_nowait(void);
>  void		xpt_free_ccb(union ccb *free_ccb);
>  void		xpt_release_ccb(union ccb *released_ccb);
> 
> ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#5 (text+ko) ====
> 
> @@ -495,7 +495,7 @@
>  						inccb->ccb_h.pinfo.priority);
>  			ccb_malloced = 0;
>  		} else {
> -			ccb = xpt_alloc_ccb(M_WAITOK);
> +			ccb = xpt_alloc_ccb();
>  
>  			if (ccb != NULL)
>  				xpt_setup_ccb(&ccb->ccb_h, periph->path,

Are you sure you wanted to revert this?

-- 
Nate