diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 22:56:04 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-04 14:31:00 -0500 |
| commit | 435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch) | |
| tree | d482ef15334a703bbe406dab021880ce3d320870 /include/net | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
common object embedded into various struct ....ns
for now - just move corresponding ->proc_inum instances over there
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 @@ | |||
| 26 | #endif | 26 | #endif |
| 27 | #include <net/netns/nftables.h> | 27 | #include <net/netns/nftables.h> |
| 28 | #include <net/netns/xfrm.h> | 28 | #include <net/netns/xfrm.h> |
| 29 | #include <linux/ns_common.h> | ||
| 29 | 30 | ||
| 30 | struct user_namespace; | 31 | struct user_namespace; |
| 31 | struct proc_dir_entry; | 32 | struct proc_dir_entry; |
| @@ -60,7 +61,7 @@ struct net { | |||
| 60 | 61 | ||
| 61 | struct user_namespace *user_ns; /* Owning user namespace */ | 62 | struct user_namespace *user_ns; /* Owning user namespace */ |
| 62 | 63 | ||
| 63 | unsigned int proc_inum; | 64 | struct ns_common ns; |
| 64 | 65 | ||
| 65 | struct proc_dir_entry *proc_net; | 66 | struct proc_dir_entry *proc_net; |
| 66 | struct proc_dir_entry *proc_net_stat; | 67 | struct proc_dir_entry *proc_net_stat; |
