Thread (6 messages) 6 messages, 5 authors, 2007-10-30

Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface

From: Stephen Hemminger <hidden>
Date: 2007-10-30 15:31:56

On Tue, 30 Oct 2007 16:11:47 +0300
Alexey Dobriyan [off-list ref] wrote:
 
+static const struct file_operations ipv6_route_proc_fops = {
+	.open		= ipv6_route_open,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= single_release,
+};
+
This needs
	.owner		= THIS_MODULE,

quoted hunk ↗ jump to hunk
 static int rt6_stats_seq_show(struct seq_file *seq, void *v)
 {
 	seq_printf(seq, "%04x %04x %04x %04x %04x %04x %04x\n",
@@ -2499,9 +2477,11 @@ void __init ip6_route_init(void)
 
 	fib6_init();
 #ifdef 	CONFIG_PROC_FS
-	p = proc_net_create(&init_net, "ipv6_route", 0, rt6_proc_info);
-	if (p)
+	p = create_proc_entry("ipv6_route", 0, init_net.proc_net);
+	if (p) {
 		p->owner = THIS_MODULE;
+		p->proc_fops = &ipv6_route_proc_fops;
+	}
 
 	proc_net_fops_create(&init_net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
 #endif
Use proc_net_fops_create()
	proc_net_fops_create(&init_net, "ipv6_route", S_IRUGO, &ipv6_route_proc_fops)


You can get rid of #ifdef since proc_net_fops_create stub does correct thing
if PROC_FS is not configured.


-- 
Stephen Hemminger [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help