Commit f105f26e authored by Yejune Deng's avatar Yejune Deng Committed by David S. Miller
Browse files

net: ipv4: route.c: simplify procfs code 



proc_creat_seq() that directly take a struct seq_operations,
and deal with network namespaces in ->open.

Signed-off-by: default avatarYejune Deng <yejune.deng@gmail.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77f0cae1

net/ipv4/route.c

+4 −30
Original line number Diff line number Diff line
@@ -234,19 +234,6 @@ static const struct seq_operations rt_cache_seq_ops = { 
	.show   = rt_cache_seq_show,

};



static int rt_cache_seq_open(struct inode *inode, struct file *file)

{

	return seq_open(file, &rt_cache_seq_ops);

}



static const struct proc_ops rt_cache_proc_ops = {

	.proc_open	= rt_cache_seq_open,

	.proc_read	= seq_read,

	.proc_lseek	= seq_lseek,

	.proc_release	= seq_release,

};





static void *rt_cpu_seq_start(struct seq_file *seq, loff_t *pos)

{

	int cpu;
@@ -324,19 +311,6 @@ static const struct seq_operations rt_cpu_seq_ops = { 
	.show   = rt_cpu_seq_show,

};





static int rt_cpu_seq_open(struct inode *inode, struct file *file)

{

	return seq_open(file, &rt_cpu_seq_ops);

}



static const struct proc_ops rt_cpu_proc_ops = {

	.proc_open	= rt_cpu_seq_open,

	.proc_read	= seq_read,

	.proc_lseek	= seq_lseek,

	.proc_release	= seq_release,

};



#ifdef CONFIG_IP_ROUTE_CLASSID

static int rt_acct_proc_show(struct seq_file *m, void *v)

{
@@ -367,13 +341,13 @@ static int __net_init ip_rt_do_proc_init(struct net *net) 
{

	struct proc_dir_entry *pde;



	pde = proc_create("rt_cache", 0444, net->proc_net,

			  &rt_cache_proc_ops);

	pde = proc_create_seq("rt_cache", 0444, net->proc_net,

			      &rt_cache_seq_ops);

	if (!pde)

		goto err1;



	pde = proc_create("rt_cache", 0444,

			  net->proc_net_stat, &rt_cpu_proc_ops);

	pde = proc_create_seq("rt_cache", 0444, net->proc_net_stat,

			      &rt_cpu_seq_ops);

	if (!pde)

		goto err2;