From owner-p4-projects@FreeBSD.ORG  Mon Jan 22 11:24:26 2007
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 17EB416A406; Mon, 22 Jan 2007 11:24:26 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CF68916A405
	for <perforce@FreeBSD.org>; Mon, 22 Jan 2007 11:24:25 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C01F213C469
	for <perforce@FreeBSD.org>; Mon, 22 Jan 2007 11:24:25 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MBOPD7041420
	for <perforce@FreeBSD.org>; Mon, 22 Jan 2007 11:24:25 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MBOPDx041417
	for perforce@freebsd.org; Mon, 22 Jan 2007 11:24:25 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 22 Jan 2007 11:24:25 GMT
Message-Id: <200701221124.l0MBOPDx041417@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 113307 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, 22 Jan 2007 11:24:26 -0000

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

Change 113307 by zec@zec_tca51 on 2007/01/22 11:24:04

	Set / restore curvnetb in vfs_hang_addrlist() - a hack
	to allow NFS exports to work from a system running on a
	kernel compiled with options VIMAGE.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/vfs_export.c#4 edit

Differences ...

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

@@ -37,6 +37,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.339 2006/12/16 15:50:36 rodrigc Exp $");
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/dirent.h>
 #include <sys/domain.h>
@@ -50,6 +52,7 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
+#include <sys/vimage.h>
 
 #include <net/radix.h>
 
@@ -129,6 +132,7 @@
 	}
 #endif
 
+	CURVNETB_SET(curthread->td_vimage->v_vnetb); /* 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);
@@ -183,8 +187,10 @@
 	bcopy(argp->ex_anon.cr_groups, np->netc_anon.cr_groups,
 	    sizeof(np->netc_anon.cr_groups));
 	refcount_init(&np->netc_anon.cr_ref, 1);
+	CURVNETB_RESTORE();
 	return (0);
 out:
+	CURVNETB_RESTORE();
 	free(np, M_NETADDR);
 	return (error);
 }