Date: Fri, 30 Mar 2007 18:06:29 GMT From: Jung-uk Kim <jkim@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 116943 for review Message-ID: <200703301806.l2UI6TkE059975@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=116943 Change 116943 by jkim@jkim_hammer on 2007/03/30 18:05:35 IFC @116942 Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#14 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.107 2007/03/12 12:16:52 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -54,11 +54,13 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mount.h> +#include <sys/msg.h> #include <sys/mutex.h> #include <sys/namei.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/sbuf.h> +#include <sys/sem.h> #include <sys/smp.h> #include <sys/socket.h> #include <sys/sysctl.h> @@ -1031,14 +1033,8 @@ static int linprocfs_domsgmni(PFS_FILL_ARGS) { - int msgmni; - size_t size; - size = sizeof(msgmni); - if (kernel_sysctlbyname(td, "kern.ipc.msgmni", &msgmni, &size, - 0, 0, 0, 0) != 0) - msgmni = 0; - sbuf_printf(sb, "%i\n", msgmni); + sbuf_printf(sb, "%d\n", msginfo.msgmni); return (0); } @@ -1061,34 +1057,9 @@ static int linprocfs_dosem(PFS_FILL_ARGS) { - int semmsl, semmns, semopm, semmni; - size_t size; - /* Field 1: SEMMSL */ - size = sizeof(semmsl); - if (kernel_sysctlbyname(td, "kern.ipc.semmsl", &semmsl, &size, - 0, 0, 0, 0) != 0) - semmsl = 0; - - /* Field 2: SEMMNS */ - size = sizeof(semmns); - if (kernel_sysctlbyname(td, "kern.ipc.semmns", &semmns, &size, - 0, 0, 0, 0) != 0) - semmns = 0; - - /* Field 3: SEMOPM */ - size = sizeof(semopm); - if (kernel_sysctlbyname(td, "kern.ipc.semopm", &semopm, &size, - 0, 0, 0, 0) != 0) - semopm = 0; - - /* Field 4: SEMMNI */ - size = sizeof(semmni); - if (kernel_sysctlbyname(td, "kern.ipc.semmni", &semmni, &size, - 0, 0, 0, 0) != 0) - semmni = 0; - - sbuf_printf(sb, "%i %i %i %i\n", semmsl, semmns, semopm, semmni); + sbuf_printf(sb, "%d %d %d %d\n", seminfo.semmsl, seminfo.semmns, + seminfo.semopm, seminfo.semmni); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703301806.l2UI6TkE059975>