Commit dda61925 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[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: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 997feb5e

include/net/udp.h

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ struct udp_seq_afinfo { 
	char			*name;

	sa_family_t		family;

	struct hlist_head	*hashtable;

	int 			(*seq_show) (struct seq_file *m, void *v);

	struct file_operations	*seq_fops;

	struct seq_operations	seq_ops;

};



struct udp_iter_state {
@@ -198,7 +198,6 @@ struct udp_iter_state { 
	sa_family_t		family;

	struct hlist_head	*hashtable;

	int			bucket;

	struct seq_operations	seq_ops;

};



#ifdef CONFIG_PROC_FS

net/ipv4/udp.c

+8 −6
Original line number Diff line number Diff line
@@ -1591,13 +1591,9 @@ static int udp_seq_open(struct inode *inode, struct file *file) 


	s->family		= afinfo->family;

	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;



	rc = seq_open(file, &s->seq_ops);

	rc = seq_open(file, &afinfo->seq_ops);

	if (rc)

		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->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);

	if (p)

		p->data = afinfo;
@@ -1690,8 +1690,10 @@ static struct udp_seq_afinfo udp4_seq_afinfo = { 
	.name		= "udp",

	.family		= AF_INET,

	.hashtable	= udp_hash,

	.seq_show	= udp4_seq_show,

	.seq_fops	= &udp4_seq_fops,

	.seq_ops	= {

		.show		= udp4_seq_show,

	},

};



static int udp4_proc_init_net(struct net *net)

net/ipv4/udplite.c

+3 −1
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ static struct udp_seq_afinfo udplite4_seq_afinfo = { 
	.name		= "udplite",

	.family		= AF_INET,

	.hashtable	= udplite_hash,

	.seq_show	= udp4_seq_show,

	.seq_fops	= &udplite4_seq_fops,

	.seq_ops	= {

		.show		= udp4_seq_show,

	},

};



static int udplite4_proc_init_net(struct net *net)

net/ipv6/udp.c

+3 −1
Original line number Diff line number Diff line
@@ -983,8 +983,10 @@ static struct udp_seq_afinfo udp6_seq_afinfo = { 
	.name		= "udp6",

	.family		= AF_INET6,

	.hashtable	= udp_hash,

	.seq_show	= udp6_seq_show,

	.seq_fops	= &udp6_seq_fops,

	.seq_ops	= {

		.show		= udp6_seq_show,

	},

};



int udp6_proc_init(struct net *net)

net/ipv6/udplite.c

+3 −1
Original line number Diff line number Diff line
@@ -102,8 +102,10 @@ static struct udp_seq_afinfo udplite6_seq_afinfo = { 
	.name		= "udplite6",

	.family		= AF_INET6,

	.hashtable	= udplite_hash,

	.seq_show	= udp6_seq_show,

	.seq_fops	= &udplite6_seq_fops,

	.seq_ops	= {

		.show		= udp6_seq_show,

	},

};



static int udplite6_proc_init_net(struct net *net)