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, 4 insertions, 16 deletions

diff --git a/ipc/namespace.c b/ipc/namespace.c
index f59a89966f92..21607791d62c 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -55,28 +55,16 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
         ns->user_ns = get_user_ns(user_ns);
         ns->ucounts = ucounts;
 
-        err = sem_init_ns(ns);
+        err = mq_init_ns(ns);
         if (err)
                 goto fail_put;
-        err = msg_init_ns(ns);
-        if (err)
-                goto fail_destroy_sem;
-        err = shm_init_ns(ns);
-        if (err)
-                goto fail_destroy_msg;
 
-        err = mq_init_ns(ns);
-        if (err)
-                goto fail_destroy_shm;
+        sem_init_ns(ns);
+        msg_init_ns(ns);
+        shm_init_ns(ns);
 
         return ns;
 
-fail_destroy_shm:
-        shm_exit_ns(ns);
-fail_destroy_msg:
-        msg_exit_ns(ns);
-fail_destroy_sem:
-        sem_exit_ns(ns);
 fail_put:
         put_user_ns(ns->user_ns);
         ns_free_inum(&ns->ns);