| kern_sysctl.c (187656) | kern_sysctl.c (187864) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Mike Karels at Berkeley Software Design, Inc. 7 * 8 * Quite extensively rewritten by Poul-Henning Kamp of the FreeBSD --- 22 unchanged lines hidden (view full) --- 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 36 */ 37 38#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Mike Karels at Berkeley Software Design, Inc. 7 * 8 * Quite extensively rewritten by Poul-Henning Kamp of the FreeBSD --- 22 unchanged lines hidden (view full) --- 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 36 */ 37 38#include <sys/cdefs.h> |
| 39__FBSDID("$FreeBSD: head/sys/kern/kern_sysctl.c 187656 2009-01-23 22:40:35Z jhb $"); | 39__FBSDID("$FreeBSD: head/sys/kern/kern_sysctl.c 187864 2009-01-28 19:58:05Z ed $"); |
| 40 41#include "opt_compat.h" 42#include "opt_mac.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/kernel.h> 47#include <sys/sysctl.h> --- 720 unchanged lines hidden (view full) --- 768 769 if (error) 770 return (error); 771 772 error = SYSCTL_OUT(req, oid, len * sizeof *oid); 773 return (error); 774} 775 | 40 41#include "opt_compat.h" 42#include "opt_mac.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/kernel.h> 47#include <sys/sysctl.h> --- 720 unchanged lines hidden (view full) --- 768 769 if (error) 770 return (error); 771 772 error = SYSCTL_OUT(req, oid, len * sizeof *oid); 773 return (error); 774} 775 |
| 776SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY, 0, 0, 777 sysctl_sysctl_name2oid, "I", ""); | 776SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY|CTLFLAG_MPSAFE, 777 0, 0, sysctl_sysctl_name2oid, "I", ""); |
| 778 779static int 780sysctl_sysctl_oidfmt(SYSCTL_HANDLER_ARGS) 781{ 782 struct sysctl_oid *oid; 783 int error; 784 785 error = sysctl_find_oid(arg1, arg2, &oid, NULL, req); --- 5 unchanged lines hidden (view full) --- 791 error = SYSCTL_OUT(req, &oid->oid_kind, sizeof(oid->oid_kind)); 792 if (error) 793 return (error); 794 error = SYSCTL_OUT(req, oid->oid_fmt, strlen(oid->oid_fmt) + 1); 795 return (error); 796} 797 798 | 778 779static int 780sysctl_sysctl_oidfmt(SYSCTL_HANDLER_ARGS) 781{ 782 struct sysctl_oid *oid; 783 int error; 784 785 error = sysctl_find_oid(arg1, arg2, &oid, NULL, req); --- 5 unchanged lines hidden (view full) --- 791 error = SYSCTL_OUT(req, &oid->oid_kind, sizeof(oid->oid_kind)); 792 if (error) 793 return (error); 794 error = SYSCTL_OUT(req, oid->oid_fmt, strlen(oid->oid_fmt) + 1); 795 return (error); 796} 797 798 |
| 799static SYSCTL_NODE(_sysctl, 4, oidfmt, CTLFLAG_RD, sysctl_sysctl_oidfmt, ""); | 799static SYSCTL_NODE(_sysctl, 4, oidfmt, CTLFLAG_RD|CTLFLAG_MPSAFE, 800 sysctl_sysctl_oidfmt, ""); |
| 800 801static int 802sysctl_sysctl_oiddescr(SYSCTL_HANDLER_ARGS) 803{ 804 struct sysctl_oid *oid; 805 int error; 806 807 error = sysctl_find_oid(arg1, arg2, &oid, NULL, req); --- 648 unchanged lines hidden --- | 801 802static int 803sysctl_sysctl_oiddescr(SYSCTL_HANDLER_ARGS) 804{ 805 struct sysctl_oid *oid; 806 int error; 807 808 error = sysctl_find_oid(arg1, arg2, &oid, NULL, req); --- 648 unchanged lines hidden --- |