diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 03:31:59 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 03:31:59 +0100 |
| commit | 707c5960f102f8cdafb9406047b158abc71b391f (patch) | |
| tree | 31d195b1c48cefa2d04da7cc801824f87a0a9887 /include/net | |
| parent | Merge branch 'iov_iter' into for-next (diff) | |
| parent | kill proc_ns completely (diff) | |
| download | linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz linux-707c5960f102f8cdafb9406047b158abc71b391f.zip | |
Merge branch 'nsfs' into for-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/net_namespace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index e0d64667a4b3..2e8756b8c775 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -26,6 +26,7 @@ #endif #include <net/netns/nftables.h> #include <net/netns/xfrm.h> +#include <linux/ns_common.h> struct user_namespace; struct proc_dir_entry; @@ -60,7 +61,7 @@ struct net { struct user_namespace *user_ns; /* Owning user namespace */ - unsigned int proc_inum; + struct ns_common ns; struct proc_dir_entry *proc_net; struct proc_dir_entry *proc_net_stat; |