diff options
author | Denis V. Lunev <den@openvz.org> | 2008-03-28 21:24:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-28 21:24:26 -0400 |
commit | dda61925f84d89e2f2a4597d6298a05a2bc05c20 (patch) | |
tree | 8d66baedac68ed6a1c026f0142ab405f5c733597 /net/ipv4/udp.c | |
parent | 997feb5e7a24ce155c1d3bea9d0b5c6530bb6197 (diff) |
[UDP]: Move seq_ops from udp_iter_state to udp_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>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index eb0c64da2634..bae94b3eaa43 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -1591,13 +1591,9 @@ static int udp_seq_open(struct inode *inode, struct file *file) | |||
1591 | 1591 | ||
1592 | s->family = afinfo->family; | 1592 | s->family = afinfo->family; |
1593 | s->hashtable = afinfo->hashtable; | 1593 | s->hashtable = afinfo->hashtable; |
1594 | s->seq_ops.start = udp_seq_start; | ||
1595 | s->seq_ops.next = udp_seq_next; | ||
1596 | s->seq_ops.show = afinfo->seq_show; | ||
1597 | s->seq_ops.stop = udp_seq_stop; | ||
1598 | s->p.net = net; | 1594 | s->p.net = net; |
1599 | 1595 | ||
1600 | rc = seq_open(file, &s->seq_ops); | 1596 | rc = seq_open(file, &afinfo->seq_ops); |
1601 | if (rc) | 1597 | if (rc) |
1602 | goto out_put_net; | 1598 | goto out_put_net; |
1603 | 1599 | ||
@@ -1634,6 +1630,10 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo) | |||
1634 | afinfo->seq_fops->llseek = seq_lseek; | 1630 | afinfo->seq_fops->llseek = seq_lseek; |
1635 | afinfo->seq_fops->release = udp_seq_release; | 1631 | afinfo->seq_fops->release = udp_seq_release; |
1636 | 1632 | ||
1633 | afinfo->seq_ops.start = udp_seq_start; | ||
1634 | afinfo->seq_ops.next = udp_seq_next; | ||
1635 | afinfo->seq_ops.stop = udp_seq_stop; | ||
1636 | |||
1637 | p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops); | 1637 | p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops); |
1638 | if (p) | 1638 | if (p) |
1639 | p->data = afinfo; | 1639 | p->data = afinfo; |
@@ -1690,8 +1690,10 @@ static struct udp_seq_afinfo udp4_seq_afinfo = { | |||
1690 | .name = "udp", | 1690 | .name = "udp", |
1691 | .family = AF_INET, | 1691 | .family = AF_INET, |
1692 | .hashtable = udp_hash, | 1692 | .hashtable = udp_hash, |
1693 | .seq_show = udp4_seq_show, | ||
1694 | .seq_fops = &udp4_seq_fops, | 1693 | .seq_fops = &udp4_seq_fops, |
1694 | .seq_ops = { | ||
1695 | .show = udp4_seq_show, | ||
1696 | }, | ||
1695 | }; | 1697 | }; |
1696 | 1698 | ||
1697 | static int udp4_proc_init_net(struct net *net) | 1699 | static int udp4_proc_init_net(struct net *net) |