Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4808147 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

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: default avatarSteven Whitehouse <swhiteho@redhat.com>
Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
parent 90306c41

fs/seq_file.c

+14 −4
Original line number Diff line number Diff line
@@ -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);



/**

include/linux/seq_file.h

+1 −0
Original line number Diff line number Diff line
@@ -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 *);