diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-25 19:43:59 -0700 |
| commit | dfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch) | |
| tree | 4a229937bc32c470ebb75a51bdd39572d91ac0ce /fs | |
| parent | f89e6e3834035c6e8203042f3527931aa7f52496 (diff) | |
| parent | 878628fbf2589eb24357e42027d5f54b1dafd3c8 (diff) | |
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/proc_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index 4caa5f774fb7..13cd7835d0df 100644 --- 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; } |