ipc: simplify ipc initialization

Now that we know that rhashtable_init() will not fail, we can get rid of a
lot of the unnecessary cleanup paths when the call errored out.

[manfred@colorfullife.com: variable name added to util.h to resolve checkpatch warning]
Link: http://lkml.kernel.org/r/20180712185241.4017-11-manfred@colorfullife.com
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Kees Cook <keescook@chromium.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 13 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 7c1387c9510d..a2aae8c1410d 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -88,16 +88,12 @@ struct ipc_proc_iface {
  */
 static int __init ipc_init(void)
 {
-        int err_sem, err_msg;
-
         proc_mkdir("sysvipc", NULL);
-        err_sem = sem_init();
-        WARN(err_sem, "ipc: sysv sem_init failed: %d\n", err_sem);
-        err_msg = msg_init();
-        WARN(err_msg, "ipc: sysv msg_init failed: %d\n", err_msg);
+        sem_init();
+        msg_init();
         shm_init();
 
-        return err_msg ? err_msg : err_sem;
+        return 0;
 }
 device_initcall(ipc_init);
 
@@ -116,21 +112,17 @@ static const struct rhashtable_params ipc_kht_params = {
  * Set up the sequence range to use for the ipc identifier range (limited
  * below IPCMNI) then initialise the keys hashtable and ids idr.
  */
-int ipc_init_ids(struct ipc_ids *ids)
+void ipc_init_ids(struct ipc_ids *ids)
 {
-        int err;
         ids->in_use = 0;
         ids->seq = 0;
         init_rwsem(&ids->rwsem);
-        err = rhashtable_init(&ids->key_ht, &ipc_kht_params);
-        if (err)
-                return err;
+        rhashtable_init(&ids->key_ht, &ipc_kht_params);
         idr_init(&ids->ipcs_idr);
         ids->max_id = -1;
 #ifdef CONFIG_CHECKPOINT_RESTORE
         ids->next_id = -1;
 #endif
-        return 0;
 }
 
 #ifdef CONFIG_PROC_FS