svn commit: r193162 - in head/sys/fs: nfsclient nfsserver
Marko Zec
zec at FreeBSD.org
Sun May 31 11:57:51 UTC 2009
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;
More information about the svn-src-all
mailing list