d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove a recently added comment from kernel_sysctlbyname() that isn't

Browse Source 
needed.
- Move the release of the sysctl sx lock after the vsunlock() in
  userland_sysctl() to restore the original memlock behavior of
  minimizing the amount of memory wired to handle sysctl requests.

MFC after:	1 week
This commit is contained in:
John Baldwin 2009-03-10 17:00:28 +00:00
parent 5ee23799eb
commit 72150f4cf7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=189631
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_sysctl.c
View File

@ -1200,14 +1200,6 @@ kernel_sysctlbyname(struct thread *td, char *name, void *old, size_t *oldlenp,
oid[1] = 3; /* name2oid */
oidlen = sizeof(oid);
/*
* XXX: Prone to a possible race condition between lookup and
* execution? Maybe put locking around it?
*
* Userland is just as racy, so I think the current implementation
* is fine.
*/
error = kernel_sysctl(td, oid, 2, oid, &oidlen,
(void *)name, strlen(name), &plen, flags);
if (error)
@ -1520,10 +1512,10 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old,
}
CURVNET_RESTORE();
SYSCTL_XUNLOCK();
if (req.lock == REQ_WIRED && req.validlen > 0)
vsunlock(req.oldptr, req.validlen);
SYSCTL_XUNLOCK();
if (error && error != ENOMEM)
return (error);