diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2012-06-11 08:16:35 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-06-11 08:16:35 -0400 |
commit | a4808147dcf1ecf2f76212a78fd9692b3c112f47 (patch) | |
tree | 18d51f7b18416f3483e58b23da87d5f239325107 /fs/seq_file.c | |
parent | 90306c41dc3d8e5f12ecd0193dae99e0e7f6e896 (diff) |
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>
Diffstat (limited to 'fs/seq_file.c')
-rw-r--r-- | fs/seq_file.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c index 0cbd0494b79e..14cf9de1dbe1 100644 --- 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) | |||
385 | } | 385 | } |
386 | EXPORT_SYMBOL(seq_escape); | 386 | EXPORT_SYMBOL(seq_escape); |
387 | 387 | ||
388 | int seq_printf(struct seq_file *m, const char *f, ...) | 388 | int seq_vprintf(struct seq_file *m, const char *f, va_list args) |
389 | { | 389 | { |
390 | va_list args; | ||
391 | int len; | 390 | int len; |
392 | 391 | ||
393 | if (m->count < m->size) { | 392 | if (m->count < m->size) { |
394 | va_start(args, f); | ||
395 | len = vsnprintf(m->buf + m->count, m->size - m->count, f, args); | 393 | len = vsnprintf(m->buf + m->count, m->size - m->count, f, args); |
396 | va_end(args); | ||
397 | if (m->count + len < m->size) { | 394 | if (m->count + len < m->size) { |
398 | m->count += len; | 395 | m->count += len; |
399 | return 0; | 396 | return 0; |
@@ -402,6 +399,19 @@ int seq_printf(struct seq_file *m, const char *f, ...) | |||
402 | seq_set_overflow(m); | 399 | seq_set_overflow(m); |
403 | return -1; | 400 | return -1; |
404 | } | 401 | } |
402 | EXPORT_SYMBOL(seq_vprintf); | ||
403 | |||
404 | int seq_printf(struct seq_file *m, const char *f, ...) | ||
405 | { | ||
406 | int ret; | ||
407 | va_list args; | ||
408 | |||
409 | va_start(args, f); | ||
410 | ret = seq_vprintf(m, f, args); | ||
411 | va_end(args); | ||
412 | |||
413 | return ret; | ||
414 | } | ||
405 | EXPORT_SYMBOL(seq_printf); | 415 | EXPORT_SYMBOL(seq_printf); |
406 | 416 | ||
407 | /** | 417 | /** |