lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[VLAN]: Make the /proc/net/vlan/conf file show per-net info.

Browse Source 
It is created in a proper net, so make is show info, related
to this particular net.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2008-04-16 00:52:24 -07:00
committed by David S. Miller
parent a59a8c1c86
commit 80de2d9821
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/8021q/vlanproc.c
View File

@@ -80,7 +80,8 @@ static const struct seq_operations vlan_seq_ops = {
static int vlan_seq_open(struct inode *inode, struct file *file) static int vlan_seq_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &vlan_seq_ops); return seq_open_net(inode, file, &vlan_seq_ops,
sizeof(struct seq_net_private));
} }
static const struct file_operations vlan_fops = { static const struct file_operations vlan_fops = {
@@ -88,7 +89,7 @@ static const struct file_operations vlan_fops = {
.open = vlan_seq_open, .open = vlan_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release, .release = seq_release_net,
}; };
/* /*
@@ -211,6 +212,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(dev_base_lock) __acquires(dev_base_lock)
{ {
struct net_device *dev; struct net_device *dev;
struct net *net = seq_file_net(seq);
loff_t i = 1; loff_t i = 1;
read_lock(&dev_base_lock); read_lock(&dev_base_lock);
@@ -218,7 +220,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
if (*pos == 0) if (*pos == 0)
return SEQ_START_TOKEN; return SEQ_START_TOKEN;
for_each_netdev(&init_net, dev) { for_each_netdev(net, dev) {
if (!is_vlan_dev(dev)) if (!is_vlan_dev(dev))
continue; continue;
@@ -232,14 +234,15 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct net_device *dev; struct net_device *dev;
struct net *net = seq_file_net(seq);
++*pos; ++*pos;
dev = (struct net_device *)v; dev = (struct net_device *)v;
if (v == SEQ_START_TOKEN) if (v == SEQ_START_TOKEN)
dev = net_device_entry(&init_net.dev_base_head); dev = net_device_entry(&net->dev_base_head);
for_each_netdev_continue(&init_net, dev) { for_each_netdev_continue(net, dev) {
if (!is_vlan_dev(dev)) if (!is_vlan_dev(dev))
continue; continue;