From 5b1cf88fab385d3834da0464849d0c1d4ac5eaa9 Mon Sep 17 00:00:00 2001 From: Nadia Derbey Date: Thu, 5 Jun 2008 22:46:38 -0700 Subject: [PATCH] --- yaml --- r: 97814 b: refs/heads/master c: dfcceb26f89da86ec4ac9583c4515504af8c6c84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/ipc/msg.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 177e4414ffc2..f8ca43604185 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68aa0a206a7a2dd8655a50b36e8274eb87b84544 +refs/heads/master: dfcceb26f89da86ec4ac9583c4515504af8c6c84 diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c index 32494e8cc7a5..b4eee1c6101d 100644 --- a/trunk/ipc/msg.c +++ b/trunk/ipc/msg.c @@ -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);