From owner-p4-projects@FreeBSD.ORG  Sat May  2 10:22:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D63941065672; Sat,  2 May 2009 10:22:11 +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 96588106566B
	for <perforce@freebsd.org>; Sat,  2 May 2009 10:22:11 +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 850E98FC08
	for <perforce@freebsd.org>; Sat,  2 May 2009 10:22:11 +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 n42AMBrL029540
	for <perforce@freebsd.org>; Sat, 2 May 2009 10:22:11 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n42AMAcv029538
	for perforce@freebsd.org; Sat, 2 May 2009 10:22:10 GMT
	(envelope-from zec@fer.hr)
Date: Sat, 2 May 2009 10:22:10 GMT
Message-Id: <200905021022.n42AMAcv029538@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 161470 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, 02 May 2009 10:22:13 -0000

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

Change 161470 by zec@zec_tpx32 on 2009/05/02 10:22:09

	Reduce controversy by not throwing CURVNET_SET() / RESTORE()
	macros at NFS code, which is already known to be disfunctional
	with options VIMAGE builds.  This will probably be reintroduced
	later in an integral NFS + VIMAGE fix.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#8 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#8 (text+ko) ====

@@ -51,7 +51,6 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-#include <sys/vimage.h>
 
 #include <net/radix.h>
 
@@ -142,7 +141,6 @@
 	}
 #endif
 
-	CURVNET_SET(TD_TO_VNET(curthread)); /* XXX MARKO */
 	i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen;
 	np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO);
 	saddr = (struct sockaddr *) (np + 1);
@@ -215,10 +213,8 @@
 	bcopy(argp->ex_secflavors, np->netc_secflavors,
 	    sizeof(np->netc_secflavors));
 	refcount_init(&np->netc_anon.cr_ref, 1);
-	CURVNET_RESTORE();
 	return (0);
 out:
-	CURVNET_RESTORE();
 	free(np, M_NETADDR);
 	return (error);
 }