From owner-p4-projects@FreeBSD.ORG  Mon Aug  3 18:29:22 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B49D1065672; Mon,  3 Aug 2009 18:29:22 +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 090E6106566C
	for <perforce@freebsd.org>; Mon,  3 Aug 2009 18:29:22 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EB9818FC12
	for <perforce@freebsd.org>; Mon,  3 Aug 2009 18:29:21 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n73ITLBL086432
	for <perforce@freebsd.org>; Mon, 3 Aug 2009 18:29:21 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n73ITLBd086430
	for perforce@freebsd.org; Mon, 3 Aug 2009 18:29:21 GMT
	(envelope-from zec@fer.hr)
Date: Mon, 3 Aug 2009 18:29:21 GMT
Message-Id: <200908031829.n73ITLBd086430@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166978 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: Mon, 03 Aug 2009 18:29:23 -0000

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

Change 166978 by zec@zec_tpx32 on 2009/08/03 18:28:56

	More hard-coding of NFS ops to vnet0.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#26 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#26 (text+ko) ====

@@ -1552,18 +1552,16 @@
 			*tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE);
 			tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF);
 #ifdef INET
-#ifndef VIMAGE
+			CURVNET_SET(vnet0);
 			IN_IFADDR_RLOCK();
 			if (!TAILQ_EMPTY(&V_in_ifaddrhead))
 				*tl++ = IA_SIN(TAILQ_FIRST(&V_in_ifaddrhead))->sin_addr.s_addr;
 			else
 #endif
-#endif
 				*tl++ = create_verf;
 #ifdef INET
-#ifndef VIMAGE
 			IN_IFADDR_RUNLOCK();
-#endif
+			CURVNET_RESTORE();
 #endif
 			*tl = ++create_verf;
 		} else {