diff options
| -rw-r--r-- | fs/seq_file.c | 18 | ||||
| -rw-r--r-- | include/linux/seq_file.h | 1 |
2 files changed, 15 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 | /** |
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index fc61854f6224..83c44eefe698 100644 --- 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); | |||
| 86 | int seq_write(struct seq_file *seq, const void *data, size_t len); | 86 | int seq_write(struct seq_file *seq, const void *data, size_t len); |
| 87 | 87 | ||
| 88 | __printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); | 88 | __printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); |
| 89 | __printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args); | ||
| 89 | 90 | ||
| 90 | int seq_path(struct seq_file *, const struct path *, const char *); | 91 | int seq_path(struct seq_file *, const struct path *, const char *); |
| 91 | int seq_dentry(struct seq_file *, struct dentry *, const char *); | 92 | int seq_dentry(struct seq_file *, struct dentry *, const char *); |
