* [PATCH 0/7] seq_printf cleanups [not found] <20140929124246.3e39dac8@gandalf.local.home> @ 2014-09-29 23:08 ` Joe Perches 2014-09-29 23:08 ` [PATCH 2/7] netfilter: Convert print_tuple functions to return void Joe Perches 2014-10-28 15:32 ` [PATCH 0/7] seq_printf cleanups Steven Rostedt 0 siblings, 2 replies; 6+ messages in thread From: Joe Perches @ 2014-09-29 23:08 UTC (permalink / raw) To: Steven Rostedt Cc: Al Viro, Petr Mladek, Andrew Morton, Linus Torvalds, linux-doc, linux-kernel, linux-mtd, netdev, cluster-devel, linux-fsdevel, netfilter-devel, coreteam seq_printf should return void. Add a public bool seq_is_full function that can be used to shortcut unnecesary seq_printf/seq_puts calls when the seq buffer is full. Start removing the misuses of the seq_printf/seq_puts return value. Patchset brought forward from an unreplied to set of changes from back in December 2013. https://lkml.org/lkml/2013/12/11/713 Renamed seq_is_buf_full to seq_is_full. Joe Perches (7): seq_file: Rename static bool seq_overflow to public bool seq_is_full netfilter: Convert print_tuple functions to return void dlm: Use seq_is_full - remove seq_printf returns dlm: Use seq_puts, remove unnecessary trailing spaces fs: Convert show_fdinfo functions to void debugfs: Fix misuse of seq_printf return value docg3: Fix mixuse of seq_printf return value Documentation/filesystems/seq_file.txt | 28 +-- Documentation/filesystems/vfs.txt | 2 +- drivers/mtd/devices/docg3.c | 112 ++++++------ drivers/net/tun.c | 4 +- fs/debugfs/file.c | 14 +- fs/dlm/debug_fs.c | 260 +++++++++++++-------------- fs/eventfd.c | 15 +- fs/eventpoll.c | 19 +- fs/notify/fdinfo.c | 76 ++++---- fs/notify/fdinfo.h | 4 +- fs/proc/fd.c | 2 +- fs/seq_file.c | 28 +-- fs/signalfd.c | 10 +- fs/timerfd.c | 27 +-- include/linux/fs.h | 2 +- include/linux/seq_file.h | 8 + include/net/netfilter/nf_conntrack_core.h | 2 +- include/net/netfilter/nf_conntrack_l3proto.h | 4 +- include/net/netfilter/nf_conntrack_l4proto.h | 4 +- net/netfilter/nf_conntrack_l3proto_generic.c | 5 +- net/netfilter/nf_conntrack_proto_dccp.c | 10 +- net/netfilter/nf_conntrack_proto_generic.c | 5 +- net/netfilter/nf_conntrack_proto_gre.c | 10 +- net/netfilter/nf_conntrack_proto_sctp.c | 10 +- net/netfilter/nf_conntrack_proto_tcp.c | 10 +- net/netfilter/nf_conntrack_proto_udp.c | 10 +- net/netfilter/nf_conntrack_proto_udplite.c | 10 +- net/netfilter/nf_conntrack_standalone.c | 15 +- 28 files changed, 333 insertions(+), 373 deletions(-) -- 1.8.1.2.459.gbcd45b4.dirty ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/7] netfilter: Convert print_tuple functions to return void 2014-09-29 23:08 ` [PATCH 0/7] seq_printf cleanups Joe Perches @ 2014-09-29 23:08 ` Joe Perches 2014-09-30 10:22 ` Petr Mladek 2014-10-28 15:32 ` [PATCH 0/7] seq_printf cleanups Steven Rostedt 1 sibling, 1 reply; 6+ messages in thread From: Joe Perches @ 2014-09-29 23:08 UTC (permalink / raw) To: Steven Rostedt Cc: Al Viro, Petr Mladek, Andrew Morton, Linus Torvalds, Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik, David S. Miller, netfilter-devel, coreteam, netdev, linux-kernel Since adding a new function to seq_file (seq_is_full) there isn't any value for functions called from seq_show to return anything. Remove the int returns of the various print_tuple/<foo>_print_tuple functions. Signed-off-by: Joe Perches <joe@perches.com> --- include/net/netfilter/nf_conntrack_core.h | 2 +- include/net/netfilter/nf_conntrack_l3proto.h | 4 ++-- include/net/netfilter/nf_conntrack_l4proto.h | 4 ++-- net/netfilter/nf_conntrack_l3proto_generic.c | 5 ++--- net/netfilter/nf_conntrack_proto_dccp.c | 10 +++++----- net/netfilter/nf_conntrack_proto_generic.c | 5 ++--- net/netfilter/nf_conntrack_proto_gre.c | 10 +++++----- net/netfilter/nf_conntrack_proto_sctp.c | 10 +++++----- net/netfilter/nf_conntrack_proto_tcp.c | 10 +++++----- net/netfilter/nf_conntrack_proto_udp.c | 10 +++++----- net/netfilter/nf_conntrack_proto_udplite.c | 10 +++++----- net/netfilter/nf_conntrack_standalone.c | 15 +++++++-------- 12 files changed, 46 insertions(+), 49 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index cc0c188..f2f0fa3 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -72,7 +72,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) return ret; } -int +void print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_l3proto *l3proto, const struct nf_conntrack_l4proto *proto); diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h index adc1fa3..cdc920b 100644 --- a/include/net/netfilter/nf_conntrack_l3proto.h +++ b/include/net/netfilter/nf_conntrack_l3proto.h @@ -38,8 +38,8 @@ struct nf_conntrack_l3proto { const struct nf_conntrack_tuple *orig); /* Print out the per-protocol part of the tuple. */ - int (*print_tuple)(struct seq_file *s, - const struct nf_conntrack_tuple *); + void (*print_tuple)(struct seq_file *s, + const struct nf_conntrack_tuple *); /* * Called before tracking. diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 4c8d573..fead8ee 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h @@ -56,8 +56,8 @@ struct nf_conntrack_l4proto { u_int8_t pf, unsigned int hooknum); /* Print out the per-protocol part of the tuple. Return like seq_* */ - int (*print_tuple)(struct seq_file *s, - const struct nf_conntrack_tuple *); + void (*print_tuple)(struct seq_file *s, + const struct nf_conntrack_tuple *); /* Print out the private part of the conntrack. */ int (*print_conntrack)(struct seq_file *s, struct nf_conn *); diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c index e7eb807..cf9ace7 100644 --- a/net/netfilter/nf_conntrack_l3proto_generic.c +++ b/net/netfilter/nf_conntrack_l3proto_generic.c @@ -49,10 +49,9 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple, return true; } -static int generic_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void generic_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return 0; } static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff, diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c index cb372f9..40d96f9 100644 --- a/net/netfilter/nf_conntrack_proto_dccp.c +++ b/net/netfilter/nf_conntrack_proto_dccp.c @@ -618,12 +618,12 @@ out_invalid: return -NF_ACCEPT; } -static int dccp_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void dccp_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "sport=%hu dport=%hu ", - ntohs(tuple->src.u.dccp.port), - ntohs(tuple->dst.u.dccp.port)); + seq_printf(s, "sport=%hu dport=%hu ", + ntohs(tuple->src.u.dccp.port), + ntohs(tuple->dst.u.dccp.port)); } static int dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct) diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index d25f293..0a3ded1 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c @@ -39,10 +39,9 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple, } /* Print out the per-protocol part of the tuple. */ -static int generic_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void generic_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return 0; } static unsigned int *generic_get_timeouts(struct net *net) diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c index d566573..cd85336 100644 --- a/net/netfilter/nf_conntrack_proto_gre.c +++ b/net/netfilter/nf_conntrack_proto_gre.c @@ -226,12 +226,12 @@ static bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, } /* print gre part of tuple */ -static int gre_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void gre_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "srckey=0x%x dstkey=0x%x ", - ntohs(tuple->src.u.gre.key), - ntohs(tuple->dst.u.gre.key)); + seq_printf(s, "srckey=0x%x dstkey=0x%x ", + ntohs(tuple->src.u.gre.key), + ntohs(tuple->dst.u.gre.key)); } /* print private data for conntrack */ diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c index 1314d33..1b1d0e9 100644 --- a/net/netfilter/nf_conntrack_proto_sctp.c +++ b/net/netfilter/nf_conntrack_proto_sctp.c @@ -166,12 +166,12 @@ static bool sctp_invert_tuple(struct nf_conntrack_tuple *tuple, } /* Print out the per-protocol part of the tuple. */ -static int sctp_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void sctp_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "sport=%hu dport=%hu ", - ntohs(tuple->src.u.sctp.port), - ntohs(tuple->dst.u.sctp.port)); + seq_printf(s, "sport=%hu dport=%hu ", + ntohs(tuple->src.u.sctp.port), + ntohs(tuple->dst.u.sctp.port)); } /* Print out the private part of the conntrack. */ diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 44d1ea3..c2693e78 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -302,12 +302,12 @@ static bool tcp_invert_tuple(struct nf_conntrack_tuple *tuple, } /* Print out the per-protocol part of the tuple. */ -static int tcp_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void tcp_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "sport=%hu dport=%hu ", - ntohs(tuple->src.u.tcp.port), - ntohs(tuple->dst.u.tcp.port)); + seq_printf(s, "sport=%hu dport=%hu ", + ntohs(tuple->src.u.tcp.port), + ntohs(tuple->dst.u.tcp.port)); } /* Print out the private part of the conntrack. */ diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c index 9d7721c..6957281 100644 --- a/net/netfilter/nf_conntrack_proto_udp.c +++ b/net/netfilter/nf_conntrack_proto_udp.c @@ -63,12 +63,12 @@ static bool udp_invert_tuple(struct nf_conntrack_tuple *tuple, } /* Print out the per-protocol part of the tuple. */ -static int udp_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void udp_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "sport=%hu dport=%hu ", - ntohs(tuple->src.u.udp.port), - ntohs(tuple->dst.u.udp.port)); + seq_printf(s, "sport=%hu dport=%hu ", + ntohs(tuple->src.u.udp.port), + ntohs(tuple->dst.u.udp.port)); } static unsigned int *udp_get_timeouts(struct net *net) diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c index 2750e6c..c5903d1 100644 --- a/net/netfilter/nf_conntrack_proto_udplite.c +++ b/net/netfilter/nf_conntrack_proto_udplite.c @@ -71,12 +71,12 @@ static bool udplite_invert_tuple(struct nf_conntrack_tuple *tuple, } /* Print out the per-protocol part of the tuple. */ -static int udplite_print_tuple(struct seq_file *s, - const struct nf_conntrack_tuple *tuple) +static void udplite_print_tuple(struct seq_file *s, + const struct nf_conntrack_tuple *tuple) { - return seq_printf(s, "sport=%hu dport=%hu ", - ntohs(tuple->src.u.udp.port), - ntohs(tuple->dst.u.udp.port)); + seq_printf(s, "sport=%hu dport=%hu ", + ntohs(tuple->src.u.udp.port), + ntohs(tuple->dst.u.udp.port)); } static unsigned int *udplite_get_timeouts(struct net *net) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index cf65a1e..3c2ce5c 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -36,12 +36,13 @@ MODULE_LICENSE("GPL"); #ifdef CONFIG_NF_CONNTRACK_PROCFS -int +void print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_l3proto *l3proto, const struct nf_conntrack_l4proto *l4proto) { - return l3proto->print_tuple(s, tuple) || l4proto->print_tuple(s, tuple); + l3proto->print_tuple(s, tuple); + l4proto->print_tuple(s, tuple); } EXPORT_SYMBOL_GPL(print_tuple); @@ -202,9 +203,8 @@ static int ct_seq_show(struct seq_file *s, void *v) if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct)) goto release; - if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, - l3proto, l4proto)) - goto release; + print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, + l3proto, l4proto); if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL)) goto release; @@ -213,9 +213,8 @@ static int ct_seq_show(struct seq_file *s, void *v) if (seq_printf(s, "[UNREPLIED] ")) goto release; - if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple, - l3proto, l4proto)) - goto release; + print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple, + l3proto, l4proto); if (seq_print_acct(s, ct, IP_CT_DIR_REPLY)) goto release; -- 1.8.1.2.459.gbcd45b4.dirty ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/7] netfilter: Convert print_tuple functions to return void 2014-09-29 23:08 ` [PATCH 2/7] netfilter: Convert print_tuple functions to return void Joe Perches @ 2014-09-30 10:22 ` Petr Mladek 2014-09-30 13:04 ` Joe Perches 0 siblings, 1 reply; 6+ messages in thread From: Petr Mladek @ 2014-09-30 10:22 UTC (permalink / raw) To: Joe Perches Cc: Steven Rostedt, Al Viro, Andrew Morton, Linus Torvalds, Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik, David S. Miller, netfilter-devel, coreteam, netdev, linux-kernel On Mon 29-09-14 16:08:22, Joe Perches wrote: > Since adding a new function to seq_file (seq_is_full) > there isn't any value for functions called from seq_show to > return anything. Remove the int returns of the various > print_tuple/<foo>_print_tuple functions. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > include/net/netfilter/nf_conntrack_core.h | 2 +- > include/net/netfilter/nf_conntrack_l3proto.h | 4 ++-- > include/net/netfilter/nf_conntrack_l4proto.h | 4 ++-- > net/netfilter/nf_conntrack_l3proto_generic.c | 5 ++--- > net/netfilter/nf_conntrack_proto_dccp.c | 10 +++++----- > net/netfilter/nf_conntrack_proto_generic.c | 5 ++--- > net/netfilter/nf_conntrack_proto_gre.c | 10 +++++----- > net/netfilter/nf_conntrack_proto_sctp.c | 10 +++++----- > net/netfilter/nf_conntrack_proto_tcp.c | 10 +++++----- > net/netfilter/nf_conntrack_proto_udp.c | 10 +++++----- > net/netfilter/nf_conntrack_proto_udplite.c | 10 +++++----- > net/netfilter/nf_conntrack_standalone.c | 15 +++++++-------- > 12 files changed, 46 insertions(+), 49 deletions(-) > > diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h > index cc0c188..f2f0fa3 100644 > --- a/include/net/netfilter/nf_conntrack_core.h > +++ b/include/net/netfilter/nf_conntrack_core.h > @@ -72,7 +72,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) > return ret; > } > > -int > +void > print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, > const struct nf_conntrack_l3proto *l3proto, > const struct nf_conntrack_l4proto *proto); > diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h > index adc1fa3..cdc920b 100644 > --- a/include/net/netfilter/nf_conntrack_l3proto.h > +++ b/include/net/netfilter/nf_conntrack_l3proto.h > @@ -38,8 +38,8 @@ struct nf_conntrack_l3proto { > const struct nf_conntrack_tuple *orig); > > /* Print out the per-protocol part of the tuple. */ > - int (*print_tuple)(struct seq_file *s, > - const struct nf_conntrack_tuple *); > + void (*print_tuple)(struct seq_file *s, > + const struct nf_conntrack_tuple *); > > /* > * Called before tracking. > diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h > index 4c8d573..fead8ee 100644 > --- a/include/net/netfilter/nf_conntrack_l4proto.h > +++ b/include/net/netfilter/nf_conntrack_l4proto.h > @@ -56,8 +56,8 @@ struct nf_conntrack_l4proto { > u_int8_t pf, unsigned int hooknum); > > /* Print out the per-protocol part of the tuple. Return like seq_* */ > - int (*print_tuple)(struct seq_file *s, > - const struct nf_conntrack_tuple *); > + void (*print_tuple)(struct seq_file *s, > + const struct nf_conntrack_tuple *); > > /* Print out the private part of the conntrack. */ > int (*print_conntrack)(struct seq_file *s, struct nf_conn *); > diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c > index e7eb807..cf9ace7 100644 > --- a/net/netfilter/nf_conntrack_l3proto_generic.c > +++ b/net/netfilter/nf_conntrack_l3proto_generic.c > @@ -49,10 +49,9 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple, > return true; > } > > -static int generic_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void generic_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return 0; > } > > static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff, > diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c > index cb372f9..40d96f9 100644 > --- a/net/netfilter/nf_conntrack_proto_dccp.c > +++ b/net/netfilter/nf_conntrack_proto_dccp.c > @@ -618,12 +618,12 @@ out_invalid: > return -NF_ACCEPT; > } > > -static int dccp_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void dccp_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "sport=%hu dport=%hu ", > - ntohs(tuple->src.u.dccp.port), > - ntohs(tuple->dst.u.dccp.port)); > + seq_printf(s, "sport=%hu dport=%hu ", > + ntohs(tuple->src.u.dccp.port), > + ntohs(tuple->dst.u.dccp.port)); > } > > static int dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct) > diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c > index d25f293..0a3ded1 100644 > --- a/net/netfilter/nf_conntrack_proto_generic.c > +++ b/net/netfilter/nf_conntrack_proto_generic.c > @@ -39,10 +39,9 @@ static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple, > } > > /* Print out the per-protocol part of the tuple. */ > -static int generic_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void generic_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return 0; > } > > static unsigned int *generic_get_timeouts(struct net *net) > diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c > index d566573..cd85336 100644 > --- a/net/netfilter/nf_conntrack_proto_gre.c > +++ b/net/netfilter/nf_conntrack_proto_gre.c > @@ -226,12 +226,12 @@ static bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, > } > > /* print gre part of tuple */ > -static int gre_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void gre_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "srckey=0x%x dstkey=0x%x ", > - ntohs(tuple->src.u.gre.key), > - ntohs(tuple->dst.u.gre.key)); > + seq_printf(s, "srckey=0x%x dstkey=0x%x ", > + ntohs(tuple->src.u.gre.key), > + ntohs(tuple->dst.u.gre.key)); > } > > /* print private data for conntrack */ > diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c > index 1314d33..1b1d0e9 100644 > --- a/net/netfilter/nf_conntrack_proto_sctp.c > +++ b/net/netfilter/nf_conntrack_proto_sctp.c > @@ -166,12 +166,12 @@ static bool sctp_invert_tuple(struct nf_conntrack_tuple *tuple, > } > > /* Print out the per-protocol part of the tuple. */ > -static int sctp_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void sctp_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "sport=%hu dport=%hu ", > - ntohs(tuple->src.u.sctp.port), > - ntohs(tuple->dst.u.sctp.port)); > + seq_printf(s, "sport=%hu dport=%hu ", > + ntohs(tuple->src.u.sctp.port), > + ntohs(tuple->dst.u.sctp.port)); > } > > /* Print out the private part of the conntrack. */ > diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c > index 44d1ea3..c2693e78 100644 > --- a/net/netfilter/nf_conntrack_proto_tcp.c > +++ b/net/netfilter/nf_conntrack_proto_tcp.c > @@ -302,12 +302,12 @@ static bool tcp_invert_tuple(struct nf_conntrack_tuple *tuple, > } > > /* Print out the per-protocol part of the tuple. */ > -static int tcp_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void tcp_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "sport=%hu dport=%hu ", > - ntohs(tuple->src.u.tcp.port), > - ntohs(tuple->dst.u.tcp.port)); > + seq_printf(s, "sport=%hu dport=%hu ", > + ntohs(tuple->src.u.tcp.port), > + ntohs(tuple->dst.u.tcp.port)); > } > > /* Print out the private part of the conntrack. */ > diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c > index 9d7721c..6957281 100644 > --- a/net/netfilter/nf_conntrack_proto_udp.c > +++ b/net/netfilter/nf_conntrack_proto_udp.c > @@ -63,12 +63,12 @@ static bool udp_invert_tuple(struct nf_conntrack_tuple *tuple, > } > > /* Print out the per-protocol part of the tuple. */ > -static int udp_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void udp_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "sport=%hu dport=%hu ", > - ntohs(tuple->src.u.udp.port), > - ntohs(tuple->dst.u.udp.port)); > + seq_printf(s, "sport=%hu dport=%hu ", > + ntohs(tuple->src.u.udp.port), > + ntohs(tuple->dst.u.udp.port)); > } > > static unsigned int *udp_get_timeouts(struct net *net) > diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c > index 2750e6c..c5903d1 100644 > --- a/net/netfilter/nf_conntrack_proto_udplite.c > +++ b/net/netfilter/nf_conntrack_proto_udplite.c > @@ -71,12 +71,12 @@ static bool udplite_invert_tuple(struct nf_conntrack_tuple *tuple, > } > > /* Print out the per-protocol part of the tuple. */ > -static int udplite_print_tuple(struct seq_file *s, > - const struct nf_conntrack_tuple *tuple) > +static void udplite_print_tuple(struct seq_file *s, > + const struct nf_conntrack_tuple *tuple) > { > - return seq_printf(s, "sport=%hu dport=%hu ", > - ntohs(tuple->src.u.udp.port), > - ntohs(tuple->dst.u.udp.port)); > + seq_printf(s, "sport=%hu dport=%hu ", > + ntohs(tuple->src.u.udp.port), > + ntohs(tuple->dst.u.udp.port)); > } > > static unsigned int *udplite_get_timeouts(struct net *net) > diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c > index cf65a1e..3c2ce5c 100644 > --- a/net/netfilter/nf_conntrack_standalone.c > +++ b/net/netfilter/nf_conntrack_standalone.c > @@ -36,12 +36,13 @@ > MODULE_LICENSE("GPL"); > > #ifdef CONFIG_NF_CONNTRACK_PROCFS > -int > +void > print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, > const struct nf_conntrack_l3proto *l3proto, > const struct nf_conntrack_l4proto *l4proto) > { > - return l3proto->print_tuple(s, tuple) || l4proto->print_tuple(s, tuple); > + l3proto->print_tuple(s, tuple); > + l4proto->print_tuple(s, tuple); > } > EXPORT_SYMBOL_GPL(print_tuple); > > @@ -202,9 +203,8 @@ static int ct_seq_show(struct seq_file *s, void *v) > if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct)) > goto release; > > - if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, > - l3proto, l4proto)) > - goto release; > + print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, > + l3proto, l4proto); To be precise, we should add: if (seq_overflow(s)) goto release; > if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL)) > goto release; > @@ -213,9 +213,8 @@ static int ct_seq_show(struct seq_file *s, void *v) > if (seq_printf(s, "[UNREPLIED] ")) > goto release; > > - if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple, > - l3proto, l4proto)) > - goto release; > + print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple, > + l3proto, l4proto); same here > if (seq_print_acct(s, ct, IP_CT_DIR_REPLY)) > goto release; > -- > 1.8.1.2.459.gbcd45b4.dirty > Best Regards, Petr ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/7] netfilter: Convert print_tuple functions to return void 2014-09-30 10:22 ` Petr Mladek @ 2014-09-30 13:04 ` Joe Perches 0 siblings, 0 replies; 6+ messages in thread From: Joe Perches @ 2014-09-30 13:04 UTC (permalink / raw) To: Petr Mladek Cc: Steven Rostedt, Al Viro, Andrew Morton, Linus Torvalds, Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik, David S. Miller, netfilter-devel, coreteam, netdev, linux-kernel On Tue, 2014-09-30 at 12:22 +0200, Petr Mladek wrote: > On Mon 29-09-14 16:08:22, Joe Perches wrote: > > Since adding a new function to seq_file (seq_is_full) > > there isn't any value for functions called from seq_show to > > return anything. Remove the int returns of the various > > print_tuple/<foo>_print_tuple functions. [a bunch of quoted stuff] Please remember to cut out from your replies the unnecessary old stuff. It can take quite awhile to scan through looking for your comments. > > diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c [] > > @@ -202,9 +203,8 @@ static int ct_seq_show(struct seq_file *s, void *v) > > if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct)) > > goto release; > > > > - if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, > > - l3proto, l4proto)) > > - goto release; > > + print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, > > + l3proto, l4proto); > > To be precise, we should add: > > if (seq_overflow(s)) > goto release; Precision isn't all that useful when checking seq_<output>. There really isn't much value in checking each possible overflow site. A periodic check prior to or in the middle of a more costly/longish operation should be acceptable. The entire block that precedes any seq buffer full test will be redone when the buffer is expanded. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/7] seq_printf cleanups 2014-09-29 23:08 ` [PATCH 0/7] seq_printf cleanups Joe Perches 2014-09-29 23:08 ` [PATCH 2/7] netfilter: Convert print_tuple functions to return void Joe Perches @ 2014-10-28 15:32 ` Steven Rostedt 2014-10-28 15:51 ` Joe Perches 1 sibling, 1 reply; 6+ messages in thread From: Steven Rostedt @ 2014-10-28 15:32 UTC (permalink / raw) To: Joe Perches Cc: Al Viro, Petr Mladek, Andrew Morton, Linus Torvalds, linux-doc, linux-kernel, linux-mtd, netdev, cluster-devel, linux-fsdevel, netfilter-devel, coreteam Joe, If you haven't already done so, can you update checkpatch.pl to complain if someone checks the return value of seq_printf(), seq_puts(), or seq_putc(). It should state that those functions will soon be returning void. Thanks! -- Steve ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/7] seq_printf cleanups 2014-10-28 15:32 ` [PATCH 0/7] seq_printf cleanups Steven Rostedt @ 2014-10-28 15:51 ` Joe Perches 0 siblings, 0 replies; 6+ messages in thread From: Joe Perches @ 2014-10-28 15:51 UTC (permalink / raw) To: Steven Rostedt Cc: Al Viro, Petr Mladek, Andrew Morton, Linus Torvalds, linux-doc, linux-kernel, linux-mtd, netdev, cluster-devel, linux-fsdevel, netfilter-devel, coreteam On Tue, 2014-10-28 at 11:32 -0400, Steven Rostedt wrote: > If you haven't already done so, can you update checkpatch.pl to > complain if someone checks the return value of seq_printf(), > seq_puts(), or seq_putc(). I'm not sure that matters much as a rule because I hope soon the compiler will bleat when that happens. There are several more too: seq_vprintf seq_escape seq_write seq_bitmap seq_cpumask/seq_nodemask (and _list variants), seq_put_decimal_xxx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-28 15:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20140929124246.3e39dac8@gandalf.local.home>
2014-09-29 23:08 ` [PATCH 0/7] seq_printf cleanups Joe Perches
2014-09-29 23:08 ` [PATCH 2/7] netfilter: Convert print_tuple functions to return void Joe Perches
2014-09-30 10:22 ` Petr Mladek
2014-09-30 13:04 ` Joe Perches
2014-10-28 15:32 ` [PATCH 0/7] seq_printf cleanups Steven Rostedt
2014-10-28 15:51 ` Joe Perches
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).