diff options
Diffstat (limited to 'ipc/msg.c')
-rw-r--r-- | ipc/msg.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1238,7 +1238,7 @@ COMPAT_SYSCALL_DEFINE5(msgrcv, int, msqid, compat_uptr_t, msgp, | |||
1238 | } | 1238 | } |
1239 | #endif | 1239 | #endif |
1240 | 1240 | ||
1241 | int msg_init_ns(struct ipc_namespace *ns) | 1241 | void msg_init_ns(struct ipc_namespace *ns) |
1242 | { | 1242 | { |
1243 | ns->msg_ctlmax = MSGMAX; | 1243 | ns->msg_ctlmax = MSGMAX; |
1244 | ns->msg_ctlmnb = MSGMNB; | 1244 | ns->msg_ctlmnb = MSGMNB; |
@@ -1246,7 +1246,7 @@ int msg_init_ns(struct ipc_namespace *ns) | |||
1246 | 1246 | ||
1247 | atomic_set(&ns->msg_bytes, 0); | 1247 | atomic_set(&ns->msg_bytes, 0); |
1248 | atomic_set(&ns->msg_hdrs, 0); | 1248 | atomic_set(&ns->msg_hdrs, 0); |
1249 | return ipc_init_ids(&ns->ids[IPC_MSG_IDS]); | 1249 | ipc_init_ids(&ns->ids[IPC_MSG_IDS]); |
1250 | } | 1250 | } |
1251 | 1251 | ||
1252 | #ifdef CONFIG_IPC_NS | 1252 | #ifdef CONFIG_IPC_NS |
@@ -1287,12 +1287,11 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it) | |||
1287 | } | 1287 | } |
1288 | #endif | 1288 | #endif |
1289 | 1289 | ||
1290 | int __init msg_init(void) | 1290 | void __init msg_init(void) |
1291 | { | 1291 | { |
1292 | const int err = msg_init_ns(&init_ipc_ns); | 1292 | msg_init_ns(&init_ipc_ns); |
1293 | 1293 | ||
1294 | ipc_init_proc_interface("sysvipc/msg", | 1294 | ipc_init_proc_interface("sysvipc/msg", |
1295 | " key msqid perms cbytes qnum lspid lrpid uid gid cuid cgid stime rtime ctime\n", | 1295 | " key msqid perms cbytes qnum lspid lrpid uid gid cuid cgid stime rtime ctime\n", |
1296 | IPC_MSG_IDS, sysvipc_msg_proc_show); | 1296 | IPC_MSG_IDS, sysvipc_msg_proc_show); |
1297 | return err; | ||
1298 | } | 1297 | } |