diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-03 15:32:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-03 15:32:14 +1100 |
| commit | 2023c011ea7e56652a0d319676ba46854296a457 (patch) | |
| tree | 9d5d51dc281ce02a31c79f5ad741c4bec645b049 /fs | |
| parent | fee36d0ededc5614b17371098baf025410accd40 (diff) | |
| parent | f0bdb7ba5af5a7028479e9067ee74e9d66eea6df (diff) | |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
drivers/net/s2io.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/proc_net.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index 4caa5f774fb7..7034facf8b8f 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -44,20 +44,21 @@ 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); +#ifdef CONFIG_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; } @@ -218,3 +219,4 @@ int __init proc_net_init(void) return register_pernet_subsys(&proc_net_ns_ops); } +#endif /* CONFIG_NET */ |