summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2018-05-25 14:47:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-05-25 18:12:11 -0700
commit6c04ab0eddc9a38e6c14ae4b6217db1e34436b8c (patch)
treeb212e57df1c838d3d33598bf6f5908e4e36c7a6e
parent8addc2d00fe171c89b5fcbafe583c2b90574d301 (diff)
downloadlinux-6c04ab0eddc9a38e6c14ae4b6217db1e34436b8c.tar.gz
linux-6c04ab0eddc9a38e6c14ae4b6217db1e34436b8c.tar.bz2
linux-6c04ab0eddc9a38e6c14ae4b6217db1e34436b8c.zip
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: d1be35cb6f96 ("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>
-rw-r--r--fs/seq_file.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c
index c6c27f1f9c98..4cc090b50cc5 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -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;