Commit dfcceb26 authored Jun 05, 2008 by Nadia Derbey Committed by Linus Torvalds Jun 06, 2008

ipc: only output msgmni value at boot time

When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://lkml.org/lkml/2008/2/11/171), I have added a KERN_INFO message
that is output each time msgmni is recomputed.

In http://lkml.org/lkml/2008/4/29/575

 Tony Luck complained that this
message references an ipc namespace address that is useless.

I first thought of using an audit_log instead of a printk, as suggested by
Serge Hallyn.  But unfortunately, we do not have any other information
than the namespace address to provide here too.  So I chose to move the
message and output it only at boot time, removing the reference to the
namespace.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Cc: Pierre Peiffer <peifferp@gmail.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 68aa0a20

ipc/msg.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -98,20 +98,15 @@ void recompute_msgmni(struct ipc_namespace *ns)

		if (allowed < MSGMNI) {
		ns->msg_ctlmni = MSGMNI;
		goto out_callback;
		return;
		}

		if (allowed > IPCMNI / nb_ns) {
		ns->msg_ctlmni = IPCMNI / nb_ns;
		goto out_callback;
		return;
		}

		ns->msg_ctlmni = allowed;

		out_callback:

		printk(KERN_INFO "msgmni has been set to %d for ipc namespace %p\n",
		ns->msg_ctlmni, ns);
		}

		void msg_init_ns(struct ipc_namespace *ns)
		@@ -136,6 +131,10 @@ void msg_exit_ns(struct ipc_namespace *ns)
		void __init msg_init(void)
		{
		msg_init_ns(&init_ipc_ns);

		printk(KERN_INFO "msgmni has been set to %d\n",
		init_ipc_ns.msg_ctlmni);

		ipc_init_proc_interface("sysvipc/msg",
		" key msqid perms cbytes qnum lspid lrpid uid gid cuid cgid stime rtime ctime\n",
		IPC_MSG_IDS, sysvipc_msg_proc_show);

Admin message