diff --git a/ipc/msg.c b/ipc/msg.c
index f2bb4c193ecf33..9fb58de557fba5 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -1316,10 +1316,10 @@ int msg_init_ns(struct ipc_namespace *ns)
 	ipc_init_ids(&ns->ids[IPC_MSG_IDS]);
 	return 0;
 
-	fail_msg_hdrs:
-		percpu_counter_destroy(&ns->percpu_msg_bytes);
-	fail_msg_bytes:
-		return ret;
+fail_msg_hdrs:
+	percpu_counter_destroy(&ns->percpu_msg_bytes);
+fail_msg_bytes:
+	return ret;
 }
 
 #ifdef CONFIG_IPC_NS
diff --git a/ipc/util.h b/ipc/util.h
index 1b0086c6346f26..b2906e36653942 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -72,7 +72,7 @@ void msg_exit_ns(struct ipc_namespace *ns);
 void shm_exit_ns(struct ipc_namespace *ns);
 #else
 static inline void sem_init_ns(struct ipc_namespace *ns) { }
-static inline int msg_init_ns(struct ipc_namespace *ns) { return 0;}
+static inline int msg_init_ns(struct ipc_namespace *ns) { return 0; }
 static inline void shm_init_ns(struct ipc_namespace *ns) { }
 
 static inline void sem_exit_ns(struct ipc_namespace *ns) { }