mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 15:27:29 +00:00
[NET]: Consolidate net namespace related proc files creation.
Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
097e66c578
commit
e372c41401
8 changed files with 80 additions and 139 deletions
|
@ -187,7 +187,7 @@ EXPORT_SYMBOL(dev_mc_unsync);
|
|||
#ifdef CONFIG_PROC_FS
|
||||
static void *dev_mc_seq_start(struct seq_file *seq, loff_t *pos)
|
||||
{
|
||||
struct net *net = seq->private;
|
||||
struct net *net = seq_file_net(seq);
|
||||
struct net_device *dev;
|
||||
loff_t off = 0;
|
||||
|
||||
|
@ -241,26 +241,8 @@ static const struct seq_operations dev_mc_seq_ops = {
|
|||
|
||||
static int dev_mc_seq_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int res;
|
||||
res = seq_open(file, &dev_mc_seq_ops);
|
||||
if (!res) {
|
||||
seq = file->private_data;
|
||||
seq->private = get_proc_net(inode);
|
||||
if (!seq->private) {
|
||||
seq_release(inode, file);
|
||||
res = -ENXIO;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
static int dev_mc_seq_release(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq = file->private_data;
|
||||
struct net *net = seq->private;
|
||||
put_net(net);
|
||||
return seq_release(inode, file);
|
||||
return seq_open_net(inode, file, &dev_mc_seq_ops,
|
||||
sizeof(struct seq_net_private));
|
||||
}
|
||||
|
||||
static const struct file_operations dev_mc_seq_fops = {
|
||||
|
@ -268,7 +250,7 @@ static const struct file_operations dev_mc_seq_fops = {
|
|||
.open = dev_mc_seq_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = dev_mc_seq_release,
|
||||
.release = seq_release_net,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue