From mboxrd@z Thu Jan 1 00:00:00 1970 From: Corey Minyard Subject: Re: [PATCH -next 2/2] seq_putc: Convert to return void and convert uses too. Date: Wed, 12 Nov 2014 09:25:00 -0600 Message-ID: <54637BCC.7040705@acm.org> References: <56c4c0d5ec721134cff4913e5e3f8923169c35ef.1415645477.git.joe@perches.com> Reply-To: minyard@acm.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Hideaki YOSHIFUJI , netdev@vger.kernel.org, James Morris , Petr Mladek , linux-kernel@vger.kernel.org, coreteam@netfilter.org, netfilter-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Alexey Kuznetsov , openipmi-developer@lists.sourceforge.net, "David S. Miller" To: Joe Perches , Steven Rostedt , Alexander Viro , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik Return-path: In-Reply-To: <56c4c0d5ec721134cff4913e5e3f8923169c35ef.1415645477.git.joe@perches.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openipmi-developer-bounces@lists.sourceforge.net List-Id: netfilter-devel.vger.kernel.org Ok by me for the IPMI part. Reviewed-by: Corey Minyard On 11/10/2014 12:58 PM, Joe Perches wrote: > Using the return value of seq_putc is error-prone, so > make it return void instead. > > Reverse the logic in seq_putc to make it like seq_puts. > > Signed-off-by: Joe Perches > --- > drivers/char/ipmi/ipmi_msghandler.c | 4 +++- > fs/seq_file.c | 11 ++++++----- > include/linux/seq_file.h | 2 +- > net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +++- > net/netfilter/nf_conntrack_expect.c | 4 +++- > 5 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c > index f816211..c12fb30 100644 > --- a/drivers/char/ipmi/ipmi_msghandler.c > +++ b/drivers/char/ipmi/ipmi_msghandler.c > @@ -1953,7 +1953,9 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v) > seq_printf(m, "%x", intf->channels[0].address); > for (i = 1; i < IPMI_MAX_CHANNELS; i++) > seq_printf(m, " %x", intf->channels[i].address); > - return seq_putc(m, '\n'); > + seq_putc(m, '\n'); > + > + return 0; > } > > static int smi_ipmb_proc_open(struct inode *inode, struct file *file) > diff --git a/fs/seq_file.c b/fs/seq_file.c > index e6be05a..5ca5af9 100644 > --- a/fs/seq_file.c > +++ b/fs/seq_file.c > @@ -673,13 +673,14 @@ int seq_open_private(struct file *filp, const struct seq_operations *ops, > } > EXPORT_SYMBOL(seq_open_private); > > -int seq_putc(struct seq_file *m, char c) > +void seq_putc(struct seq_file *m, char c) > { > - if (m->count < m->size) { > - m->buf[m->count++] = c; > - return 0; > + if (m->count >= m->size) { > + seq_set_overflow(m); > + return; > } > - return -1; > + > + m->buf[m->count++] = c; > } > EXPORT_SYMBOL(seq_putc); > > diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h > index 9b02cb6..c1e47ff 100644 > --- a/include/linux/seq_file.h > +++ b/include/linux/seq_file.h > @@ -115,7 +115,7 @@ ssize_t seq_read(struct file *, char __user *, size_t, loff_t *); > loff_t seq_lseek(struct file *, loff_t, int); > int seq_release(struct inode *, struct file *); > int seq_escape(struct seq_file *, const char *, const char *); > -int seq_putc(struct seq_file *m, char c); > +void seq_putc(struct seq_file *m, char c); > void seq_puts(struct seq_file *m, const char *s); > int seq_write(struct seq_file *seq, const void *data, size_t len); > > diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > index a460a87..f0dfe92 100644 > --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > @@ -300,7 +300,9 @@ static int exp_seq_show(struct seq_file *s, void *v) > __nf_ct_l3proto_find(exp->tuple.src.l3num), > __nf_ct_l4proto_find(exp->tuple.src.l3num, > exp->tuple.dst.protonum)); > - return seq_putc(s, '\n'); > + seq_putc(s, '\n'); > + > + return 0; > } > > static const struct seq_operations exp_seq_ops = { > diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c > index 91a1837..7a17070 100644 > --- a/net/netfilter/nf_conntrack_expect.c > +++ b/net/netfilter/nf_conntrack_expect.c > @@ -561,7 +561,9 @@ static int exp_seq_show(struct seq_file *s, void *v) > helper->expect_policy[expect->class].name); > } > > - return seq_putc(s, '\n'); > + seq_putc(s, '\n'); > + > + return 0; > } > > static const struct seq_operations exp_seq_ops = { ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk