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

[TCP]: Cleanup /proc/tcp[6] creation/removal.

Browse Source 
Replace seq_open with seq_open_net and remove tcp_seq_release
completely.  seq_release_net will do this job just fine.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-04-13 22:12:41 -07:00
committed by David S. Miller
parent 9427c4b36b
commit 52d6f3f11b
1 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
net/ipv4/tcp_ipv4.c
View File

@@ -2211,46 +2211,19 @@ static void tcp_seq_stop(struct seq_file *seq, void *v)
static int tcp_seq_open(struct inode *inode, struct file *file) static int tcp_seq_open(struct inode *inode, struct file *file)
{ {
struct tcp_seq_afinfo *afinfo = PDE(inode)->data; struct tcp_seq_afinfo *afinfo = PDE(inode)->data;
struct seq_file *seq;
struct tcp_iter_state *s; struct tcp_iter_state *s;
struct net *net; int err;
int rc;
if (unlikely(afinfo == NULL)) if (unlikely(afinfo == NULL))
return -EINVAL; return -EINVAL;
s = kzalloc(sizeof(*s), GFP_KERNEL); err = seq_open_net(inode, file, &afinfo->seq_ops,
if (!s) sizeof(struct tcp_iter_state));
return -ENOMEM; if (err < 0)
return err;
rc = -ENXIO;
net = get_proc_net(inode);
if (!net)
goto out_kfree;
s = ((struct seq_file *)file->private_data)->private;
s->family = afinfo->family; s->family = afinfo->family;
s->p.net = net;
rc = seq_open(file, &afinfo->seq_ops);
if (rc)
goto out_put_net;
seq = file->private_data;
seq->private = s;
out:
return rc;
out_put_net:
put_net(net);
out_kfree:
kfree(s);
goto out;
}
static int tcp_seq_release(struct inode *inode, struct file *file)
{
struct seq_file *seq = file->private_data;
put_net(seq_file_net(seq));
seq_release_private(inode, file);
return 0; return 0;
} }
@@ -2263,7 +2236,7 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
afinfo->seq_fops->open = tcp_seq_open; afinfo->seq_fops->open = tcp_seq_open;
afinfo->seq_fops->read = seq_read; afinfo->seq_fops->read = seq_read;
afinfo->seq_fops->llseek = seq_lseek; afinfo->seq_fops->llseek = seq_lseek;
afinfo->seq_fops->release = tcp_seq_release; afinfo->seq_fops->release = seq_release_net;
afinfo->seq_ops.start = tcp_seq_start; afinfo->seq_ops.start = tcp_seq_start;
afinfo->seq_ops.next = tcp_seq_next; afinfo->seq_ops.next = tcp_seq_next;