aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-13 22:12:13 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-13 22:12:13 -0700
commit9427c4b36b8fe652df1d7c89eae678948e1f4b32 (patch)
treed2e018d9b09656e04e80ae3d3e88993e76753fbb
parent1abf4fb20d38cf58c92b27f4d6ad4fa92a3bb553 (diff)
downloadkernel_samsung_aries-9427c4b36b8fe652df1d7c89eae678948e1f4b32.zip
kernel_samsung_aries-9427c4b36b8fe652df1d7c89eae678948e1f4b32.tar.gz
kernel_samsung_aries-9427c4b36b8fe652df1d7c89eae678948e1f4b32.tar.bz2
[TCP]: Move seq_ops from tcp_iter_state to tcp_seq_afinfo.
No need to create seq_operations for each instance of 'netstat'. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/tcp.h3
-rw-r--r--net/ipv4/tcp_ipv4.c14
-rw-r--r--net/ipv6/tcp_ipv6.c4
3 files changed, 12 insertions, 9 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index f5b61e0..2c9a650 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1328,8 +1328,8 @@ struct tcp_seq_afinfo {
struct module *owner;
char *name;
sa_family_t family;
- int (*seq_show) (struct seq_file *m, void *v);
struct file_operations *seq_fops;
+ struct seq_operations seq_ops;
};
struct tcp_iter_state {
@@ -1338,7 +1338,6 @@ struct tcp_iter_state {
enum tcp_seq_states state;
struct sock *syn_wait_sk;
int bucket, sbucket, num, uid;
- struct seq_operations seq_ops;
};
extern int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 978d9db..c50dd17 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2229,13 +2229,9 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
goto out_kfree;
s->family = afinfo->family;
- s->seq_ops.start = tcp_seq_start;
- s->seq_ops.next = tcp_seq_next;
- s->seq_ops.show = afinfo->seq_show;
- s->seq_ops.stop = tcp_seq_stop;
s->p.net = net;
- rc = seq_open(file, &s->seq_ops);
+ rc = seq_open(file, &afinfo->seq_ops);
if (rc)
goto out_put_net;
seq = file->private_data;
@@ -2269,6 +2265,10 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
afinfo->seq_fops->llseek = seq_lseek;
afinfo->seq_fops->release = tcp_seq_release;
+ afinfo->seq_ops.start = tcp_seq_start;
+ afinfo->seq_ops.next = tcp_seq_next;
+ afinfo->seq_ops.stop = tcp_seq_stop;
+
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);
if (p)
p->data = afinfo;
@@ -2414,8 +2414,10 @@ static struct tcp_seq_afinfo tcp4_seq_afinfo = {
.owner = THIS_MODULE,
.name = "tcp",
.family = AF_INET,
- .seq_show = tcp4_seq_show,
.seq_fops = &tcp4_seq_fops,
+ .seq_ops = {
+ .show = tcp4_seq_show,
+ },
};
static int tcp4_proc_init_net(struct net *net)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 80eab71..8bf59ee 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2125,8 +2125,10 @@ static struct tcp_seq_afinfo tcp6_seq_afinfo = {
.owner = THIS_MODULE,
.name = "tcp6",
.family = AF_INET6,
- .seq_show = tcp6_seq_show,
.seq_fops = &tcp6_seq_fops,
+ .seq_ops = {
+ .show = tcp6_seq_show,
+ },
};
int tcp6_proc_init(struct net *net)