seq_file: Add seq_vprintf function and export it

The existing seq_printf function is rewritten in terms of the new
seq_vprintf which is also exported to modules. This allows GFS2
(and potentially other seq_file users) to have a vprintf based
interface and to avoid an extra copy into a temporary buffer in
some cases.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 0cbd0494b79e0fe13f7b73a9273013f12f98e818..14cf9de1dbe1751645ea1734d20808c9df6c398e 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -385,15 +385,12 @@ int seq_escape(struct seq_file *m, const char *s, const char *esc)
 }
 EXPORT_SYMBOL(seq_escape);
 
-int seq_printf(struct seq_file *m, const char *f, ...)
+int seq_vprintf(struct seq_file *m, const char *f, va_list args)
 {
-       va_list args;
        int len;
 
        if (m->count < m->size) {
-               va_start(args, f);
                len = vsnprintf(m->buf + m->count, m->size - m->count, f, args);
-               va_end(args);
                if (m->count + len < m->size) {
                        m->count += len;
                        return 0;
@@ -402,6 +399,19 @@ int seq_printf(struct seq_file *m, const char *f, ...)
        seq_set_overflow(m);
        return -1;
 }
+EXPORT_SYMBOL(seq_vprintf);
+
+int seq_printf(struct seq_file *m, const char *f, ...)
+{
+       int ret;
+       va_list args;
+
+       va_start(args, f);
+       ret = seq_vprintf(m, f, args);
+       va_end(args);
+
+       return ret;
+}
 EXPORT_SYMBOL(seq_printf);
 
 /**

diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index fc61854f62247b9cbaf7bf490d8580f99d54b34e..83c44eefe698ba97a72700b8cac63a37fb558c82 100644 (file)
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -86,6 +86,7 @@ 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);
 
 int seq_path(struct seq_file *, const struct path *, const char *);
 int seq_dentry(struct seq_file *, struct dentry *, const char *);