fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void

The seq_<foo> function return values were frequently misused.

See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

All uses of these return values have been removed, so convert the
return types to void.

Miscellanea:

o Move seq_put_decimal_<type> and seq_escape prototypes closer the
  other seq_vprintf prototypes
o Reorder seq_putc and seq_puts to return early on overflow
o Add argument names to seq_vprintf and seq_printf
o Update the seq_escape kernel-doc
o Convert a couple of leading spaces to tabs in seq_escape

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 45 insertions, 50 deletions

diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 0717aa96ce39..9bc20e2119a3 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -135,8 +135,9 @@ __dump_tlb_entries(struct omap_iommu *obj, struct cr_regs *crs, int num)
 static ssize_t iotlb_dump_cr(struct omap_iommu *obj, struct cr_regs *cr,
                              struct seq_file *s)
 {
-        return seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram,
+        seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram,
                           (cr->cam & MMU_CAM_P) ? 1 : 0);
+        return 0;
 }
 
 static size_t omap_dump_tlb_entries(struct omap_iommu *obj, struct seq_file *s)
diff --git a/fs/nsfs.c b/fs/nsfs.c
index e4905fbf3396..8f20d6016e20 100644
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -142,7 +142,8 @@ static int nsfs_show_path(struct seq_file *seq, struct dentry *dentry)
         struct inode *inode = d_inode(dentry);
         const struct proc_ns_operations *ns_ops = dentry->d_fsdata;
 
-        return seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino);
+        seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino);
+        return 0;
 }
 
 static const struct super_operations nsfs_ops = {
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 263b125dbcf4..225586e141ca 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -372,16 +372,16 @@ EXPORT_SYMBOL(seq_release);
  *      @esc:   set of characters that need escaping
  *
  *      Puts string into buffer, replacing each occurrence of character from
- *      @esc with usual octal escape.  Returns 0 in case of success, -1 - in
- *      case of overflow.
+ *      @esc with usual octal escape.
+ *      Use seq_has_overflowed() to check for errors.
  */
-int seq_escape(struct seq_file *m, const char *s, const char *esc)
+void seq_escape(struct seq_file *m, const char *s, const char *esc)
 {
         char *end = m->buf + m->size;
-        char *p;
+        char *p;
         char c;
 
-        for (p = m->buf + m->count; (c = *s) != '\0' && p < end; s++) {
+        for (p = m->buf + m->count; (c = *s) != '\0' && p < end; s++) {
                 if (!strchr(esc, c)) {
                         *p++ = c;
                         continue;
@@ -394,14 +394,13 @@ int seq_escape(struct seq_file *m, const char *s, const char *esc)
                         continue;
                 }
                 seq_set_overflow(m);
-                return -1;
-        }
+                return;
+        }
         m->count = p - m->buf;
-        return 0;
 }
 EXPORT_SYMBOL(seq_escape);
 
-int seq_vprintf(struct seq_file *m, const char *f, va_list args)
+void seq_vprintf(struct seq_file *m, const char *f, va_list args)
 {
         int len;
 
@@ -409,24 +408,20 @@ int seq_vprintf(struct seq_file *m, const char *f, va_list args)
                 len = vsnprintf(m->buf + m->count, m->size - m->count, f, args);
                 if (m->count + len < m->size) {
                         m->count += len;
-                        return 0;
+                        return;
                 }
         }
         seq_set_overflow(m);
-        return -1;
 }
 EXPORT_SYMBOL(seq_vprintf);
 
-int seq_printf(struct seq_file *m, const char *f, ...)
+void seq_printf(struct seq_file *m, const char *f, ...)
 {
-        int ret;
         va_list args;
 
         va_start(args, f);
-        ret = seq_vprintf(m, f, args);
+        seq_vprintf(m, f, args);
         va_end(args);
-
-        return ret;
 }
 EXPORT_SYMBOL(seq_printf);
 
@@ -664,26 +659,25 @@ 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;
-        }
-        return -1;
+        if (m->count >= m->size)
+                return;
+
+        m->buf[m->count++] = c;
 }
 EXPORT_SYMBOL(seq_putc);
 
-int seq_puts(struct seq_file *m, const char *s)
+void seq_puts(struct seq_file *m, const char *s)
 {
         int len = strlen(s);
-        if (m->count + len < m->size) {
-                memcpy(m->buf + m->count, s, len);
-                m->count += len;
-                return 0;
+
+        if (m->count + len >= m->size) {
+                seq_set_overflow(m);
+                return;
         }
-        seq_set_overflow(m);
-        return -1;
+        memcpy(m->buf + m->count, s, len);
+        m->count += len;
 }
 EXPORT_SYMBOL(seq_puts);
 
@@ -694,8 +688,8 @@ EXPORT_SYMBOL(seq_puts);
  * This routine is very quick when you show lots of numbers.
  * In usual cases, it will be better to use seq_printf(). It's easier to read.
  */
-int seq_put_decimal_ull(struct seq_file *m, char delimiter,
-                        unsigned long long num)
+void seq_put_decimal_ull(struct seq_file *m, char delimiter,
+                         unsigned long long num)
 {
         int len;
 
@@ -707,35 +701,33 @@ int seq_put_decimal_ull(struct seq_file *m, char delimiter,
 
         if (num < 10) {
                 m->buf[m->count++] = num + '0';
-                return 0;
+                return;
         }
 
         len = num_to_str(m->buf + m->count, m->size - m->count, num);
         if (!len)
                 goto overflow;
         m->count += len;
-        return 0;
+        return;
+
 overflow:
         seq_set_overflow(m);
-        return -1;
 }
 EXPORT_SYMBOL(seq_put_decimal_ull);
 
-int seq_put_decimal_ll(struct seq_file *m, char delimiter,
-                        long long num)
+void seq_put_decimal_ll(struct seq_file *m, char delimiter, long long num)
 {
         if (num < 0) {
                 if (m->count + 3 >= m->size) {
                         seq_set_overflow(m);
-                        return -1;
+                        return;
                 }
                 if (delimiter)
                         m->buf[m->count++] = delimiter;
                 num = -num;
                 delimiter = '-';
         }
-        return seq_put_decimal_ull(m, delimiter, num);
-
+        seq_put_decimal_ull(m, delimiter, num);
 }
 EXPORT_SYMBOL(seq_put_decimal_ll);
 
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index adeadbd6d7bf..dde00defbaa5 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -114,13 +114,18 @@ int seq_open(struct file *, const struct seq_operations *);
 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);
-int seq_puts(struct seq_file *m, const char *s);
 int seq_write(struct seq_file *seq, const void *data, size_t len);
 
-__printf(2, 3) int seq_printf(struct seq_file *, const char *, ...);
-__printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args);
+__printf(2, 0)
+void seq_vprintf(struct seq_file *m, const char *fmt, va_list args);
+__printf(2, 3)
+void seq_printf(struct seq_file *m, const char *fmt, ...);
+void seq_putc(struct seq_file *m, char c);
+void seq_puts(struct seq_file *m, const char *s);
+void seq_put_decimal_ull(struct seq_file *m, char delimiter,
+                         unsigned long long num);
+void seq_put_decimal_ll(struct seq_file *m, char delimiter, long long num);
+void seq_escape(struct seq_file *m, const char *s, const char *esc);
 
 void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
                   int rowsize, int groupsize, const void *buf, size_t len,
@@ -138,10 +143,6 @@ int single_release(struct inode *, struct file *);
 void *__seq_open_private(struct file *, const struct seq_operations *, int);
 int seq_open_private(struct file *, const struct seq_operations *, int);
 int seq_release_private(struct inode *, struct file *);
-int seq_put_decimal_ull(struct seq_file *m, char delimiter,
-                        unsigned long long num);
-int seq_put_decimal_ll(struct seq_file *m, char delimiter,
-                        long long num);
 
 static inline struct user_namespace *seq_user_ns(struct seq_file *seq)
 {