nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

[UDP]: Move seq_ops from udp_iter_state to udp_seq_afinfo.

Browse source 
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>
This commit is contained in:
Denis V. Lunev 2008-03-28 18:24:26 -07:00 committed by David S. Miller
parent 997feb5e7a
commit dda61925f8
5 changed files with 18 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/udp.h
View file

@ -189,8 +189,8 @@ struct udp_seq_afinfo {
char *name; char *name;
sa_family_t family; sa_family_t family;
struct hlist_head *hashtable; struct hlist_head *hashtable;
int (*seq_show) (struct seq_file *m, void *v);
struct file_operations *seq_fops; struct file_operations *seq_fops;
struct seq_operations seq_ops;
}; };
struct udp_iter_state { struct udp_iter_state {
@ -198,7 +198,6 @@ struct udp_iter_state {
sa_family_t family; sa_family_t family;
struct hlist_head *hashtable; struct hlist_head *hashtable;
int bucket; int bucket;
struct seq_operations seq_ops;
}; };
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

14
net/ipv4/udp.c
View file

@ -1591,13 +1591,9 @@ static int udp_seq_open(struct inode *inode, struct file *file)
s->family = afinfo->family; s->family = afinfo->family;
s->hashtable = afinfo->hashtable; s->hashtable = afinfo->hashtable;
s->seq_ops.start = udp_seq_start;
s->seq_ops.next = udp_seq_next;
s->seq_ops.show = afinfo->seq_show;
s->seq_ops.stop = udp_seq_stop;
s->p.net = net; s->p.net = net;
rc = seq_open(file, &s->seq_ops); rc = seq_open(file, &afinfo->seq_ops);
if (rc) if (rc)
goto out_put_net; goto out_put_net;
@ -1634,6 +1630,10 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
afinfo->seq_fops->llseek = seq_lseek; afinfo->seq_fops->llseek = seq_lseek;
afinfo->seq_fops->release = udp_seq_release; afinfo->seq_fops->release = udp_seq_release;
afinfo->seq_ops.start = udp_seq_start;
afinfo->seq_ops.next = udp_seq_next;
afinfo->seq_ops.stop = udp_seq_stop;
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops); p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);
if (p) if (p)
p->data = afinfo; p->data = afinfo;
@ -1690,8 +1690,10 @@ static struct udp_seq_afinfo udp4_seq_afinfo = {
.name = "udp", .name = "udp",
.family = AF_INET, .family = AF_INET,
.hashtable = udp_hash, .hashtable = udp_hash,
.seq_show = udp4_seq_show,
.seq_fops = &udp4_seq_fops, .seq_fops = &udp4_seq_fops,
.seq_ops = {
.show = udp4_seq_show,
},
}; };
static int udp4_proc_init_net(struct net *net) static int udp4_proc_init_net(struct net *net)

4
net/ipv4/udplite.c
View file

@ -77,8 +77,10 @@ static struct udp_seq_afinfo udplite4_seq_afinfo = {
.name = "udplite", .name = "udplite",
.family = AF_INET, .family = AF_INET,
.hashtable = udplite_hash, .hashtable = udplite_hash,
.seq_show = udp4_seq_show,
.seq_fops = &udplite4_seq_fops, .seq_fops = &udplite4_seq_fops,
.seq_ops = {
.show = udp4_seq_show,
},
}; };
static int udplite4_proc_init_net(struct net *net) static int udplite4_proc_init_net(struct net *net)

4
net/ipv6/udp.c
View file

@ -983,8 +983,10 @@ static struct udp_seq_afinfo udp6_seq_afinfo = {
.name = "udp6", .name = "udp6",
.family = AF_INET6, .family = AF_INET6,
.hashtable = udp_hash, .hashtable = udp_hash,
.seq_show = udp6_seq_show,
.seq_fops = &udp6_seq_fops, .seq_fops = &udp6_seq_fops,
.seq_ops = {
.show = udp6_seq_show,
},
}; };
int udp6_proc_init(struct net *net) int udp6_proc_init(struct net *net)

4
net/ipv6/udplite.c
View file

@ -102,8 +102,10 @@ static struct udp_seq_afinfo udplite6_seq_afinfo = {
.name = "udplite6", .name = "udplite6",
.family = AF_INET6, .family = AF_INET6,
.hashtable = udplite_hash, .hashtable = udplite_hash,
.seq_show = udp6_seq_show,
.seq_fops = &udplite6_seq_fops, .seq_fops = &udplite6_seq_fops,
.seq_ops = {
.show = udp6_seq_show,
},
}; };
static int udplite6_proc_init_net(struct net *net) static int udplite6_proc_init_net(struct net *net)