lkml.org 
[lkml]   [2014]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFA][PATCH 2/8] netfilter: Remove return values for print_conntrack callbacks
Steven Rostedt <rostedt@goodmis.org> wrote:
> From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
>
> [ REQUEST FOR ACKS ]
>
> The seq_printf() and friends are having their return values removed.
> The print_conntrack() returns the result of seq_printf(), which is
> meaningless when seq_printf() returns void. Might as well remove the
> return values of print_conntrack() as well.
[..]

> diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
> index 4c48e434bb1f..91f207c2cb69 100644
> --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
> +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
> @@ -147,7 +147,10 @@ static int ct_seq_show(struct seq_file *s, void *v)
> ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
> goto release;
>
> - if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct))
> + if (l4proto->print_conntrack)
> + l4proto->print_conntrack(s, ct);
> +
> + if (seq_has_overflowed(s))
> goto release;

Its not obvious to me why nf_conntrack_l3proto_ipv4_compat now calls
seq_has_overflowed ...

> > diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
> index cf65a1e040dd..348aa3602787 100644
> --- a/net/netfilter/nf_conntrack_standalone.c
> +++ b/net/netfilter/nf_conntrack_standalone.c
> @@ -199,8 +199,8 @@ static int ct_seq_show(struct seq_file *s, void *v)
> ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
> goto release;
>
> - if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct))
> - goto release;
> + if (l4proto->print_conntrack)
> + l4proto->print_conntrack(s, ct);
>
> if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
> l3proto, l4proto))

... while nf_conntrack_standalone does not.


\
 
 \ /
  Last update: 2014-10-29 23:21    [W:0.168 / U:1.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site