Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / include / linux / ipc_namespace.h

diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index e365d5ec69cba1bfedb7e35707c8943091711bdf..1eee6bcfcf76a43856088b6314c2a52c0b2f10e1 100644 (file)
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -6,6 +6,7 @@
 #include <linux/rwsem.h>
 #include <linux/notifier.h>
 #include <linux/nsproxy.h>
+#include <linux/ns_common.h>
 
 struct user_namespace;
 
@@ -58,7 +59,7 @@ struct ipc_namespace {
        /* user_ns which owns the ipc ns */
        struct user_namespace *user_ns;
 
-       unsigned int    proc_inum;
+       struct ns_common ns;
 };
 
 extern struct ipc_namespace init_ipc_ns;