Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / ipc / namespace.c

diff --git a/ipc/namespace.c b/ipc/namespace.c
index 3c3e5223e7e50f2c376a6a2abc9979bb598a350e..8054c8e5faf1da309ef7b44d9ecebd4000883277 100644 (file)
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -104,7 +104,6 @@ static void free_ipc_ns(struct ipc_namespace *ns)
        sem_exit_ns(ns);
        msg_exit_ns(ns);
        shm_exit_ns(ns);
-       kfree(ns);
        atomic_dec(&nr_ipc_ns);
 
        /*
@@ -113,6 +112,7 @@ static void free_ipc_ns(struct ipc_namespace *ns)
         */
        ipcns_notify(IPCNS_REMOVED);
        put_user_ns(ns->user_ns);
+       kfree(ns);
 }
 
 /*