Commit 7eed8fde authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds

lib/string_helpers.c:string_get_size(): remove redundant prefixes

While commit 3c9f3681 ("[SCSI] lib: add generic helper to print
sizes rounded to the correct SI range") says that Z and Y are included
in preparation for 128 bit computers, they just waste .text currently.
If and when we get u128, string_get_size needs updating anyway (and ISO
needs to come up with four more prefixes).

Also there's no need to include and test for the NULL sentinel; once we
reach "E" size is at most 18.  [The test is also wrong; it should be
units_str[units][i+1]; if we've reached NULL we're already doomed.]
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43e5b666
...@@ -28,11 +28,10 @@ int string_get_size(u64 size, const enum string_size_units units, ...@@ -28,11 +28,10 @@ int string_get_size(u64 size, const enum string_size_units units,
char *buf, int len) char *buf, int len)
{ {
static const char *const units_10[] = { static const char *const units_10[] = {
"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL "B", "kB", "MB", "GB", "TB", "PB", "EB"
}; };
static const char *const units_2[] = { static const char *const units_2[] = {
"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"
NULL
}; };
static const char *const *const units_str[] = { static const char *const *const units_str[] = {
[STRING_UNITS_10] = units_10, [STRING_UNITS_10] = units_10,
...@@ -49,7 +48,7 @@ int string_get_size(u64 size, const enum string_size_units units, ...@@ -49,7 +48,7 @@ int string_get_size(u64 size, const enum string_size_units units,
tmp[0] = '\0'; tmp[0] = '\0';
i = 0; i = 0;
if (size >= divisor[units]) { if (size >= divisor[units]) {
while (size >= divisor[units] && units_str[units][i]) { while (size >= divisor[units]) {
remainder = do_div(size, divisor[units]); remainder = do_div(size, divisor[units]);
i++; i++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment