diff options
| author | mjg <mjg@FreeBSD.org> | 2014-03-31 02:19:57 +0000 |
|---|---|---|
| committer | mjg <mjg@FreeBSD.org> | 2014-03-31 02:19:57 +0000 |
| commit | ae2823466fe35f50ff85af2bd94e6c0084781b88 (patch) | |
| tree | 56a0601414e15abe11a711cbc6a547beaf35b9f5 | |
| parent | 11fbc59f9b71fd5d059d03fd72cf18b52ab38ac9 (diff) | |
| download | FreeBSD-src-ae2823466fe35f50ff85af2bd94e6c0084781b88.zip FreeBSD-src-ae2823466fe35f50ff85af2bd94e6c0084781b88.tar.gz | |
MFC r263530:
Mark the following sysctls as MPSAFE:
kern.file
kern.proc.filedesc
kern.proc.ofiledesc
| -rw-r--r-- | sys/kern/kern_descrip.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 97d899f..48f62fa 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2976,7 +2976,7 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS) return (error); } -SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD, +SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_file, "S,xfile", "Entire file table"); #ifdef KINFO_OFILE_SIZE @@ -3234,8 +3234,9 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (0); } -static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc, CTLFLAG_RD, - sysctl_kern_proc_ofiledesc, "Process ofiledesc entries"); +static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc, + CTLFLAG_RD||CTLFLAG_MPSAFE, sysctl_kern_proc_ofiledesc, + "Process ofiledesc entries"); #endif /* COMPAT_FREEBSD7 */ #ifdef KINFO_FILE_SIZE @@ -3747,8 +3748,9 @@ fill_shm_info(struct file *fp, struct kinfo_file *kif) return (0); } -static SYSCTL_NODE(_kern_proc, KERN_PROC_FILEDESC, filedesc, CTLFLAG_RD, - sysctl_kern_proc_filedesc, "Process filedesc entries"); +static SYSCTL_NODE(_kern_proc, KERN_PROC_FILEDESC, filedesc, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc_filedesc, + "Process filedesc entries"); #ifdef DDB /* |
