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

[mirror_ubuntu-bionic-kernel.git] / include / linux / user_namespace.h

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 9f3579ff543dd5e37cea2636ed5e44a069f03906..8297e5b341d863aa627a3b44a70d025bc8bc7c30 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -3,6 +3,7 @@
 
 #include <linux/kref.h>
 #include <linux/nsproxy.h>
+#include <linux/ns_common.h>
 #include <linux/sched.h>
 #include <linux/err.h>
 
@@ -30,7 +31,7 @@ struct user_namespace {
        int                     level;
        kuid_t                  owner;
        kgid_t                  group;
-       unsigned int            proc_inum;
+       struct ns_common        ns;
        unsigned long           flags;
 
        /* Register of per-UID persistent keyrings for this namespace */