diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 05:31:59 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 05:31:59 +0300 |
| commit | 707c5960f102f8cdafb9406047b158abc71b391f (patch) | |
| tree | 31d195b1c48cefa2d04da7cc801824f87a0a9887 /include/linux/pid_namespace.h | |
| parent | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (diff) | |
| parent | 3d3d35b1e94ec918fc0ae670663235bf197d8609 (diff) | |
| download | linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz | |
Merge branch 'nsfs' into for-next
Diffstat (limited to 'include/linux/pid_namespace.h')
| -rw-r--r-- | include/linux/pid_namespace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 1997ffc295a7..b9cf6c51b181 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h @@ -8,6 +8,7 @@ #include <linux/threads.h> #include <linux/nsproxy.h> #include <linux/kref.h> +#include <linux/ns_common.h> struct pidmap { atomic_t nr_free; @@ -43,7 +44,7 @@ struct pid_namespace { kgid_t pid_gid; int hide_pid; int reboot; /* group exit code if this pidns was rebooted */ - unsigned int proc_inum; + struct ns_common ns; }; extern struct pid_namespace init_pid_ns; |