mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
lib/bitmap.c: simplify bitmap_print_to_pagebuf()
len is guaranteed to lie in [1, PAGE_SIZE]. If scnprintf is called with a buffer size of 1, it is guaranteed to return 0. So in the extremely unlikely case of having just one byte remaining in the page, let's just call scnprintf anyway. The only difference is that this will write a '\0' to that final byte in the page, but that's an improvement: We now guarantee that after the call, buf is a properly terminated C string of length exactly the return value. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Rasmus Villemoes <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Cc: Yury Norov <[email protected]> Cc: Rasmus Villemoes <[email protected]> Cc: Sudeep Holla <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
1 parent
ce1091d471
commit
8ec3d76863
1 file changed
+2
-5
+2
-5
@@ -471,12 +471,9 @@ int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp,
|
||||
int nmaskbits)
|
||||
{
|
||||
ptrdiff_t len = PAGE_SIZE - offset_in_page(buf);
|
||||
int n = 0;
|
||||
|
||||
if (len > 1)
|
||||
n = list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) :
|
||||
scnprintf(buf, len, "%*pb\n", nmaskbits, maskp);
|
||||
return n;
|
||||
return list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) :
|
||||
scnprintf(buf, len, "%*pb\n", nmaskbits, maskp);
|
||||
}
|
||||
EXPORT_SYMBOL(bitmap_print_to_pagebuf);
|
||||
|
||||
|
||||
Reference in new issue
Block a user