xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy address of proc_ns_ops into ns_common

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2014-11-01 02:32:53 -04:00
parent 6344c433a4
commit 33c429405a
13 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/core/net_namespace.c
View File

@@ -339,6 +339,7 @@ struct net *get_net_ns_by_fd(int fd)
{
struct proc_ns *ei;
struct file *file;
struct ns_common *ns;
struct net *net;
file = proc_ns_fget(fd);
@@ -346,8 +347,9 @@ struct net *get_net_ns_by_fd(int fd)
return ERR_CAST(file);
ei = get_proc_ns(file_inode(file));
if (ei->ns_ops == &netns_operations)
net = get_net(container_of(ei->ns, struct net, ns));
ns = ei->ns;
if (ns->ops == &netns_operations)
net = get_net(container_of(ns, struct net, ns));
else
net = ERR_PTR(-EINVAL);
@@ -386,6 +388,9 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
static __net_init int net_ns_net_init(struct net *net)
{
#ifdef CONFIG_NET_NS
net->ns.ops = &netns_operations;
#endif
return ns_alloc_inum(&net->ns);
}