From owner-svn-src-head@FreeBSD.ORG  Sun May 31 11:57:51 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 661541065670;
	Sun, 31 May 2009 11:57:51 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 547008FC1D;
	Sun, 31 May 2009 11:57:51 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VBvpVD042286;
	Sun, 31 May 2009 11:57:51 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VBvpeM042284;
	Sun, 31 May 2009 11:57:51 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200905311157.n4VBvpeM042284@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Sun, 31 May 2009 11:57:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193162 - in head/sys/fs: nfsclient nfsserver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 May 2009 11:57:51 -0000

Author: zec
Date: Sun May 31 11:57:51 2009
New Revision: 193162
URL: http://svn.freebsd.org/changeset/base/193162

Log:
  Unbreak options VIMAGE kernel builds.
  
  Approved by:	julian (mentor)

Modified:
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Sun May 31 10:27:24 2009	(r193161)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Sun May 31 11:57:51 2009	(r193162)
@@ -1374,7 +1374,7 @@ again:
 	}
 	mtx_unlock(&dnp->n_mtx);
 
-	CURVNET_SET(nmp->nm_sockreq.nr_so->so_vnet);
+	CURVNET_SET(P_TO_VNET(&proc0));
 #ifdef INET
 	INIT_VNET_INET(curvnet);
 	if (!TAILQ_EMPTY(&V_in_ifaddrhead))

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sun May 31 10:27:24 2009	(r193161)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sun May 31 11:57:51 2009	(r193162)
@@ -2673,6 +2673,7 @@ nfsrv_v4rootexport(void *argp, struct uc
 int
 nfsrv_getsocksndseq(struct socket *so, tcp_seq *maxp, tcp_seq *unap)
 {
+	INIT_VNET_INET(so->so_vnet);
 	struct inpcb *inp;
 	struct tcpcb *tp;
 	int error = EPIPE;