From 705fe7ce357e0cba3f0de0c45c82f97e7dbf42dc Mon Sep 17 00:00:00 2001 From: Marko Zec Date: Sun, 31 May 2009 11:57:51 +0000 Subject: [PATCH] Unbreak options VIMAGE kernel builds. Approved by: julian (mentor) --- sys/fs/nfsclient/nfs_clvnops.c | 2 +- sys/fs/nfsserver/nfs_nfsdport.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 047e3eb65a86..937453c9e058 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -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)) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index fdb8ed7ecd86..730a750db8e0 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2673,6 +2673,7 @@ nfsrv_v4rootexport(void *argp, struct ucred *cred, struct thread *p) 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;