* [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
@ 2007-10-30 13:11 Alexey Dobriyan
2007-10-30 13:35 ` Benjamin Thery
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alexey Dobriyan @ 2007-10-30 13:11 UTC (permalink / raw)
To: netdev
One proc_net_create() user less.
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
---
net/ipv6/route.c | 70 +++++++++++++++++++------------------------------------
1 file changed, 25 insertions(+), 45 deletions(-)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2288,71 +2288,49 @@ struct rt6_proc_arg
static int rt6_info_route(struct rt6_info *rt, void *p_arg)
{
- struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg;
+ struct seq_file *m = p_arg;
- if (arg->skip < arg->offset / RT6_INFO_LEN) {
- arg->skip++;
- return 0;
- }
-
- if (arg->len >= arg->length)
- return 0;
-
- arg->len += sprintf(arg->buffer + arg->len,
- NIP6_SEQFMT " %02x ",
- NIP6(rt->rt6i_dst.addr),
+ seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_dst.addr),
rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
- arg->len += sprintf(arg->buffer + arg->len,
- NIP6_SEQFMT " %02x ",
- NIP6(rt->rt6i_src.addr),
+ seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_src.addr),
rt->rt6i_src.plen);
#else
- arg->len += sprintf(arg->buffer + arg->len,
- "00000000000000000000000000000000 00 ");
+ seq_puts(m, "00000000000000000000000000000000 00 ");
#endif
if (rt->rt6i_nexthop) {
- arg->len += sprintf(arg->buffer + arg->len,
- NIP6_SEQFMT,
+ seq_printf(m, NIP6_SEQFMT,
NIP6(*((struct in6_addr *)rt->rt6i_nexthop->primary_key)));
} else {
- arg->len += sprintf(arg->buffer + arg->len,
- "00000000000000000000000000000000");
+ seq_puts(m, "00000000000000000000000000000000");
}
- arg->len += sprintf(arg->buffer + arg->len,
- " %08x %08x %08x %08x %8s\n",
+ seq_printf(m, " %08x %08x %08x %08x %8s\n",
rt->rt6i_metric, atomic_read(&rt->u.dst.__refcnt),
rt->u.dst.__use, rt->rt6i_flags,
rt->rt6i_dev ? rt->rt6i_dev->name : "");
return 0;
}
-static int rt6_proc_info(char *buffer, char **start, off_t offset, int length)
+static int ipv6_route_show(struct seq_file *m, void *v)
{
- struct rt6_proc_arg arg = {
- .buffer = buffer,
- .offset = offset,
- .length = length,
- };
-
- fib6_clean_all(rt6_info_route, 0, &arg);
-
- *start = buffer;
- if (offset)
- *start += offset % RT6_INFO_LEN;
-
- arg.len -= offset % RT6_INFO_LEN;
-
- if (arg.len > length)
- arg.len = length;
- if (arg.len < 0)
- arg.len = 0;
+ fib6_clean_all(rt6_info_route, 0, m);
+ return 0;
+}
- return arg.len;
+static int ipv6_route_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, ipv6_route_show, NULL);
}
+static const struct file_operations ipv6_route_proc_fops = {
+ .open = ipv6_route_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
2007-10-30 13:11 [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface Alexey Dobriyan
@ 2007-10-30 13:35 ` Benjamin Thery
2007-10-30 13:46 ` Benjamin Thery
2007-10-30 15:30 ` Stephen Hemminger
2007-10-30 22:41 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Benjamin Thery @ 2007-10-30 13:35 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: netdev
Alexey Dobriyan wrote:
> One proc_net_create() user less.
Funny, I was working on a similar patch.
See comment below.
> Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
> ---
>
> net/ipv6/route.c | 70 +++++++++++++++++++------------------------------------
> 1 file changed, 25 insertions(+), 45 deletions(-)
>
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -2288,71 +2288,49 @@ struct rt6_proc_arg
>
> static int rt6_info_route(struct rt6_info *rt, void *p_arg)
> {
> - struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg;
> + struct seq_file *m = p_arg;
>
> - if (arg->skip < arg->offset / RT6_INFO_LEN) {
> - arg->skip++;
> - return 0;
> - }
> -
> - if (arg->len >= arg->length)
> - return 0;
> -
> - arg->len += sprintf(arg->buffer + arg->len,
> - NIP6_SEQFMT " %02x ",
> - NIP6(rt->rt6i_dst.addr),
> + seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_dst.addr),
> rt->rt6i_dst.plen);
>
> #ifdef CONFIG_IPV6_SUBTREES
> - arg->len += sprintf(arg->buffer + arg->len,
> - NIP6_SEQFMT " %02x ",
> - NIP6(rt->rt6i_src.addr),
> + seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_src.addr),
> rt->rt6i_src.plen);
> #else
> - arg->len += sprintf(arg->buffer + arg->len,
> - "00000000000000000000000000000000 00 ");
> + seq_puts(m, "00000000000000000000000000000000 00 ");
> #endif
>
> if (rt->rt6i_nexthop) {
> - arg->len += sprintf(arg->buffer + arg->len,
> - NIP6_SEQFMT,
> + seq_printf(m, NIP6_SEQFMT,
> NIP6(*((struct in6_addr *)rt->rt6i_nexthop->primary_key)));
> } else {
> - arg->len += sprintf(arg->buffer + arg->len,
> - "00000000000000000000000000000000");
> + seq_puts(m, "00000000000000000000000000000000");
> }
> - arg->len += sprintf(arg->buffer + arg->len,
> - " %08x %08x %08x %08x %8s\n",
> + seq_printf(m, " %08x %08x %08x %08x %8s\n",
> rt->rt6i_metric, atomic_read(&rt->u.dst.__refcnt),
> rt->u.dst.__use, rt->rt6i_flags,
> rt->rt6i_dev ? rt->rt6i_dev->name : "");
> return 0;
> }
>
> -static int rt6_proc_info(char *buffer, char **start, off_t offset, int length)
> +static int ipv6_route_show(struct seq_file *m, void *v)
> {
> - struct rt6_proc_arg arg = {
> - .buffer = buffer,
> - .offset = offset,
> - .length = length,
> - };
> -
> - fib6_clean_all(rt6_info_route, 0, &arg);
> -
> - *start = buffer;
> - if (offset)
> - *start += offset % RT6_INFO_LEN;
> -
> - arg.len -= offset % RT6_INFO_LEN;
> -
> - if (arg.len > length)
> - arg.len = length;
> - if (arg.len < 0)
> - arg.len = 0;
> + fib6_clean_all(rt6_info_route, 0, m);
> + return 0;
> +}
>
> - return arg.len;
> +static int ipv6_route_open(struct inode *inode, struct file *file)
> +{
> + return single_open(file, ipv6_route_show, NULL);
> }
>
> +static const struct file_operations ipv6_route_proc_fops = {
> + .open = ipv6_route_open,
> + .read = seq_read,
> + .llseek = seq_lseek,
> + .release = single_release,
> +};
> +
> 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;
> + }
You should use proc_net_fops_create() instead of the above code.
It does the same thing.
Otherwise the patch looks fine to me.
Tested on i386.
Benjamin
> proc_net_fops_create(&init_net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
> #endif
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
B e n j a m i n T h e r y - BULL/DT/Open Software R&D
http://www.bull.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
2007-10-30 13:35 ` Benjamin Thery
@ 2007-10-30 13:46 ` Benjamin Thery
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Thery @ 2007-10-30 13:46 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: netdev
Cosmetic comment:
I forgot to say there are a few indentation "errors" when
I apply your patch. See below.
Benjamin Thery wrote:
> Alexey Dobriyan wrote:
>> One proc_net_create() user less.
>
> Funny, I was working on a similar patch.
>
> See comment below.
>
>
>> Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
>> ---
>>
>> net/ipv6/route.c | 70 +++++++++++++++++++------------------------------------
>> 1 file changed, 25 insertions(+), 45 deletions(-)
>>
>> --- a/net/ipv6/route.c
>> +++ b/net/ipv6/route.c
>> @@ -2288,71 +2288,49 @@ struct rt6_proc_arg
>>
>> static int rt6_info_route(struct rt6_info *rt, void *p_arg)
>> {
>> - struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg;
>> + struct seq_file *m = p_arg;
>>
>> - if (arg->skip < arg->offset / RT6_INFO_LEN) {
>> - arg->skip++;
>> - return 0;
>> - }
>> -
>> - if (arg->len >= arg->length)
>> - return 0;
>> -
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - NIP6_SEQFMT " %02x ",
>> - NIP6(rt->rt6i_dst.addr),
>> + seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_dst.addr),
>> rt->rt6i_dst.plen);
>>
>> #ifdef CONFIG_IPV6_SUBTREES
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - NIP6_SEQFMT " %02x ",
>> - NIP6(rt->rt6i_src.addr),
>> + seq_printf(m, NIP6_SEQFMT " %02x ", NIP6(rt->rt6i_src.addr),
>> rt->rt6i_src.plen);
Indent is wrong for the above line.
>> #else
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - "00000000000000000000000000000000 00 ");
>> + seq_puts(m, "00000000000000000000000000000000 00 ");
>> #endif
>>
>> if (rt->rt6i_nexthop) {
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - NIP6_SEQFMT,
>> + seq_printf(m, NIP6_SEQFMT,
>> NIP6(*((struct in6_addr *)rt->rt6i_nexthop->primary_key)));
Idem.
>> } else {
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - "00000000000000000000000000000000");
>> + seq_puts(m, "00000000000000000000000000000000");
>> }
>> - arg->len += sprintf(arg->buffer + arg->len,
>> - " %08x %08x %08x %08x %8s\n",
>> + seq_printf(m, " %08x %08x %08x %08x %8s\n",
>> rt->rt6i_metric, atomic_read(&rt->u.dst.__refcnt),
>> rt->u.dst.__use, rt->rt6i_flags,
>> rt->rt6i_dev ? rt->rt6i_dev->name : "");
Indent of the 3 above lines.
>> return 0;
>> }
>>
>> -static int rt6_proc_info(char *buffer, char **start, off_t offset, int length)
>> +static int ipv6_route_show(struct seq_file *m, void *v)
>> {
>> - struct rt6_proc_arg arg = {
>> - .buffer = buffer,
>> - .offset = offset,
>> - .length = length,
>> - };
>> -
>> - fib6_clean_all(rt6_info_route, 0, &arg);
>> -
>> - *start = buffer;
>> - if (offset)
>> - *start += offset % RT6_INFO_LEN;
>> -
>> - arg.len -= offset % RT6_INFO_LEN;
>> -
>> - if (arg.len > length)
>> - arg.len = length;
>> - if (arg.len < 0)
>> - arg.len = 0;
>> + fib6_clean_all(rt6_info_route, 0, m);
>> + return 0;
>> +}
>>
>> - return arg.len;
>> +static int ipv6_route_open(struct inode *inode, struct file *file)
>> +{
>> + return single_open(file, ipv6_route_show, NULL);
>> }
>>
>> +static const struct file_operations ipv6_route_proc_fops = {
>> + .open = ipv6_route_open,
>> + .read = seq_read,
>> + .llseek = seq_lseek,
>> + .release = single_release,
>> +};
>> +
>> 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;
>> + }
>
> You should use proc_net_fops_create() instead of the above code.
> It does the same thing.
>
> Otherwise the patch looks fine to me.
> Tested on i386.
>
> Benjamin
>
>> proc_net_fops_create(&init_net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
>> #endif
>>
>> -
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
>
--
B e n j a m i n T h e r y - BULL/DT/Open Software R&D
http://www.bull.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
2007-10-30 13:11 [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface Alexey Dobriyan
2007-10-30 13:35 ` Benjamin Thery
@ 2007-10-30 15:30 ` Stephen Hemminger
2007-10-30 15:37 ` Patrick McHardy
2007-10-30 22:41 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2007-10-30 15:30 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: netdev
On Tue, 30 Oct 2007 16:11:47 +0300
Alexey Dobriyan <adobriyan@sw.ru> 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,
>
> 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 <shemminger@linux-foundation.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
2007-10-30 15:30 ` Stephen Hemminger
@ 2007-10-30 15:37 ` Patrick McHardy
0 siblings, 0 replies; 6+ messages in thread
From: Patrick McHardy @ 2007-10-30 15:37 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Stephen Hemminger, netdev
Stephen Hemminger wrote:
> On Tue, 30 Oct 2007 16:11:47 +0300
> Alexey Dobriyan <adobriyan@sw.ru> 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,
Your ip_queue conversion patch was also missing this, I've
fixed it up.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface
2007-10-30 13:11 [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface Alexey Dobriyan
2007-10-30 13:35 ` Benjamin Thery
2007-10-30 15:30 ` Stephen Hemminger
@ 2007-10-30 22:41 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2007-10-30 22:41 UTC (permalink / raw)
To: adobriyan; +Cc: netdev
From: Alexey Dobriyan <adobriyan@sw.ru>
Date: Tue, 30 Oct 2007 16:11:47 +0300
> One proc_net_create() user less.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Please make the corrections suggested in the feedback
for this patch and resubmit.
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-10-30 22:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-30 13:11 [PATCH 1/2] Convert /proc/net/ipv6_route to seq_file interface Alexey Dobriyan
2007-10-30 13:35 ` Benjamin Thery
2007-10-30 13:46 ` Benjamin Thery
2007-10-30 15:30 ` Stephen Hemminger
2007-10-30 15:37 ` Patrick McHardy
2007-10-30 22:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).