Commit 6c04ab0e authored May 25, 2018 by Hugh Dickins Committed by Linus Torvalds May 25, 2018

proc: fix smaps and meminfo alignment

The 4.17-rc /proc/meminfo and /proc/<pid>/smaps look ugly: single-digit
numbers (commonly 0) are misaligned.

Remove seq_put_decimal_ull_width()'s leftover optimization for single
digits: it's wrong now that num_to_str() takes care of the width.

Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1805241554210.1326@eggly.anvils


Fixes: d1be35cb ("proc: add seq_put_decimal_ull_width to speed up /proc/pid/smaps")
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Andrei Vagin <avagin@openvz.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8addc2d0

fs/seq_file.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -709,11 +709,6 @@ void seq_put_decimal_ull_width(struct seq_file m, const char delimiter,
		if (m->count + width >= m->size)
		goto overflow;

		if (num < 10) {
		m->buf[m->count++] = num + '0';
		return;
		}

		len = num_to_str(m->buf + m->count, m->size - m->count, num, width);
		if (!len)
		goto overflow;

Admin message