diff options
author | jamie <jamie@FreeBSD.org> | 2009-06-15 19:01:53 +0000 |
---|---|---|
committer | jamie <jamie@FreeBSD.org> | 2009-06-15 19:01:53 +0000 |
commit | f950eed7d778168cbdc3411fb2604c92e03531b8 (patch) | |
tree | a6d05b7f6dd58090ebf3e1b0556017742e4368b1 /sys/kern | |
parent | 5675a54fb1a409499766ce55a009367c043fdc28 (diff) | |
download | FreeBSD-src-f950eed7d778168cbdc3411fb2604c92e03531b8.zip FreeBSD-src-f950eed7d778168cbdc3411fb2604c92e03531b8.tar.gz |
Get vnets from creds instead of threads where they're available, and from
passed threads instead of curthread.
Reviewed by: zec, julian
Approved by: bz (mentor)
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_sysctl.c | 2 | ||||
-rw-r--r-- | sys/kern/uipc_socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index a9c2a33..a9022ce 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1599,7 +1599,7 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, sx_xlock(&sysctlmemlock); } else memlocked = 0; - CURVNET_SET(TD_TO_VNET(curthread)); + CURVNET_SET(TD_TO_VNET(td)); for (;;) { req.oldidx = 0; diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 71856b3..2abdc2c 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -359,7 +359,7 @@ socreate(int dom, struct socket **aso, int type, int proto, if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(TD_TO_VNET(td)); + so = soalloc(CRED_TO_VNET(cred)); if (so == NULL) return (ENOBUFS); |