Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / net / core / net_namespace.c

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index da775f53f3fd1fb4449f855309a8008650a8af4d..ce780c722e48ca2bf35534895ef0b7dc0a9541d5 100644 (file)
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -337,17 +337,17 @@ EXPORT_SYMBOL_GPL(__put_net);
 
 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);
        if (IS_ERR(file))
                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 = get_proc_ns(file_inode(file));
+       if (ns->ops == &netns_operations)
+               net = get_net(container_of(ns, struct net, ns));
        else
                net = ERR_PTR(-EINVAL);
 
@@ -386,6 +386,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);
 }