diff options
author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2008-10-18 23:28:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:39 -0400 |
commit | 85dd030edb174376ef43bc95e5fae4755af1ec98 (patch) | |
tree | 60e0ca69da813ce50dacdc9fdfe9597e33ac6119 | |
parent | 40b6a76237563c70466ec7315f644ba87d57dbe5 (diff) |
seq_file: don't call bitmap_scnprintf_len()
"m->count + len < m->size" is true commonly, so bitmap_scnprintf()
is commonly called. this fix saves a call to bitmap_scnprintf_len().
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Paul Menage <menage@google.com>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/seq_file.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c index bd20f7f5a933..11c85fec6b4f 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c | |||
@@ -452,17 +452,18 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, char *esc) | |||
452 | 452 | ||
453 | int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits) | 453 | int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits) |
454 | { | 454 | { |
455 | size_t len = bitmap_scnprintf_len(nr_bits); | 455 | if (m->count < m->size) { |
456 | 456 | int len = bitmap_scnprintf(m->buf + m->count, | |
457 | if (m->count + len < m->size) { | 457 | m->size - m->count, bits, nr_bits); |
458 | bitmap_scnprintf(m->buf + m->count, m->size - m->count, | 458 | if (m->count + len < m->size) { |
459 | bits, nr_bits); | 459 | m->count += len; |
460 | m->count += len; | 460 | return 0; |
461 | return 0; | 461 | } |
462 | } | 462 | } |
463 | m->count = m->size; | 463 | m->count = m->size; |
464 | return -1; | 464 | return -1; |
465 | } | 465 | } |
466 | EXPORT_SYMBOL(seq_bitmap); | ||
466 | 467 | ||
467 | static void *single_start(struct seq_file *p, loff_t *pos) | 468 | static void *single_start(struct seq_file *p, loff_t *pos) |
468 | { | 469 | { |