Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / fs / proc / proc_net.c

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 4caa5f774fb7975136d04e2baf81826e1c392dba..13cd7835d0dfdc5027c61df7270bbb61d51d2273 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -44,7 +44,9 @@ int seq_open_net(struct inode *ino, struct file *f,
                put_net(net);
                return -ENOMEM;
        }
+#ifdef CONFIG_NET_NS
        p->net = net;
+#endif
        return 0;
 }
 EXPORT_SYMBOL_GPL(seq_open_net);
@@ -52,12 +54,10 @@ EXPORT_SYMBOL_GPL(seq_open_net);
 int seq_release_net(struct inode *ino, struct file *f)
 {
        struct seq_file *seq;
-       struct seq_net_private *p;
 
        seq = f->private_data;
-       p = seq->private;
 
-       put_net(p->net);
+       put_net(seq_file_net(seq));
        seq_release_private(ino, f);
        return 0;
 }