From owner-p4-projects@FreeBSD.ORG  Fri Jul 25 06:53:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47E361065678; Fri, 25 Jul 2008 06:53:20 +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 0BA78106564A
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 06:53:20 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outQ.internet-mail-service.net (outq.internet-mail-service.net
	[216.240.47.240])
	by mx1.freebsd.org (Postfix) with ESMTP id DC8AA8FC1C
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 06:53:19 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from idiom.com (mx0.idiom.com [216.240.32.160])
	by out.internet-mail-service.net (Postfix) with ESMTP id B987724BC;
	Thu, 24 Jul 2008 23:53:46 -0700 (PDT)
Received: from julian-mac.elischer.org (localhost [127.0.0.1])
	by idiom.com (Postfix) with ESMTP id 514132D6020;
	Thu, 24 Jul 2008 23:53:19 -0700 (PDT)
Message-ID: <48897836.2090700@elischer.org>
Date: Thu, 24 Jul 2008 23:52:38 -0700
From: Julian Elischer <julian@elischer.org>
User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707)
MIME-Version: 1.0
To: Marko Zec <zec@FreeBSD.org>
References: <200807250625.m6P6PgiP005667@repoman.freebsd.org>
In-Reply-To: <200807250625.m6P6PgiP005667@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 145869 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: Fri, 25 Jul 2008 06:53:20 -0000

Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=145869
> 
> Change 145869 by zec@zec_tpx32 on 2008/07/25 06:24:55
> 
> 	Unbreak VIMAGE build.

you should be able to get diffs between vimage and vimage-devel to get
hints as to things to fix.. devel is derived from vimage so updates 
should bring fixes from vimage.. (if I got the script right)

> 
> Affected files ...
> 
> .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#8 edit
> .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#5 edit
> 
> Differences ...
> 
> ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#8 (text+ko) ====
> 
> @@ -123,11 +123,10 @@
>  static int
>  sysctl_net_ipport_check(SYSCTL_HANDLER_ARGS)
>  {
> -#ifdef VIMAGE
>  	INIT_VNET_INET(curvnet);
> +	int error;
> +
>  	SYSCTL_RESOLVE_V_ARG1();
> -#endif
> -	int error;
>  
>  	error = sysctl_handle_int(oidp, arg1, arg2, req);
>  	if (error == 0) {
> @@ -1281,15 +1280,16 @@
>  void
>  inp_apply_all(void (*func)(struct inpcb *, void *), void *arg)
>  {
> +	INIT_VNET_INET(curvnet);
>  	struct inpcb *inp;
>  
> -	INP_INFO_RLOCK(&tcbinfo);
> -	LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) {
> +	INP_INFO_RLOCK(&V_tcbinfo);
> +	LIST_FOREACH(inp, V_tcbinfo.ipi_listhead, inp_list) {
>  		INP_WLOCK(inp);
>  		func(inp, arg);
>  		INP_WUNLOCK(inp);
>  	}
> -	INP_INFO_RUNLOCK(&tcbinfo);
> +	INP_INFO_RUNLOCK(&V_tcbinfo);
>  }
>  
>  struct socket *
> 
> ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#5 (text+ko) ====
> 
> @@ -944,11 +944,12 @@
>  tcp_offload_syncache_expand(struct in_conninfo *inc, struct tcpopt *to,
>      struct tcphdr *th, struct socket **lsop, struct mbuf *m)
>  {
> +	INIT_VNET_INET(curvnet);
>  	int rc;
>  	
> -	INP_INFO_WLOCK(&tcbinfo);
> +	INP_INFO_WLOCK(&V_tcbinfo);
>  	rc = syncache_expand(inc, to, th, lsop, m);
> -	INP_INFO_WUNLOCK(&tcbinfo);
> +	INP_INFO_WUNLOCK(&V_tcbinfo);
>  
>  	return (rc);
>  }