2 files changed, 24 insertions, 25 deletions

diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 3bf40e246a80..804e4e4a2b62 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -94,7 +94,6 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
 #endif
 
 #if defined(CONFIG_IPC_NS)
-extern void free_ipc_ns(struct ipc_namespace *ns);
 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
                                        struct ipc_namespace *ns);
 extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 231ee5359abf..a1094ff0befa 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -83,6 +83,30 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
         up_write(&ids->rw_mutex);
 }
 
+static void free_ipc_ns(struct ipc_namespace *ns)
+{
+        /*
+         * Unregistering the hotplug notifier at the beginning guarantees
+         * that the ipc namespace won't be freed while we are inside the
+         * callback routine. Since the blocking_notifier_chain_XXX routines
+         * hold a rw lock on the notifier list, unregister_ipcns_notifier()
+         * won't take the rw lock before blocking_notifier_call_chain() has
+         * released the rd lock.
+         */
+        unregister_ipcns_notifier(ns);
+        sem_exit_ns(ns);
+        msg_exit_ns(ns);
+        shm_exit_ns(ns);
+        kfree(ns);
+        atomic_dec(&nr_ipc_ns);
+
+        /*
+         * Do the ipcns removal notification after decrementing nr_ipc_ns in
+         * order to have a correct value when recomputing msgmni.
+         */
+        ipcns_notify(IPCNS_REMOVED);
+}
+
 /*
  * put_ipc_ns - drop a reference to an ipc namespace.
  * @ns: the namespace to put
@@ -108,27 +132,3 @@ void put_ipc_ns(struct ipc_namespace *ns)
                 free_ipc_ns(ns);
         }
 }
-
-void free_ipc_ns(struct ipc_namespace *ns)
-{
-        /*
-         * Unregistering the hotplug notifier at the beginning guarantees
-         * that the ipc namespace won't be freed while we are inside the
-         * callback routine. Since the blocking_notifier_chain_XXX routines
-         * hold a rw lock on the notifier list, unregister_ipcns_notifier()
-         * won't take the rw lock before blocking_notifier_call_chain() has
-         * released the rd lock.
-         */
-        unregister_ipcns_notifier(ns);
-        sem_exit_ns(ns);
-        msg_exit_ns(ns);
-        shm_exit_ns(ns);
-        kfree(ns);
-        atomic_dec(&nr_ipc_ns);
-
-        /*
-         * Do the ipcns removal notification after decrementing nr_ipc_ns in
-         * order to have a correct value when recomputing msgmni.
-         */
-        ipcns_notify(IPCNS_REMOVED);
-}