Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits) [SCSI] sd: fix computation of the full size of the device [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact [SCSI] sun3x_esp: Convert && to || [SCSI] sd: remove command-size switching code [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API [SCSI] fix netlink kernel-doc [SCSI] sd: Fix handling of NO_SENSE check condition [SCSI] export busy state via q->lld_busy_fn() [SCSI] refactor sdev/starget/shost busy checking [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver. [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!) [SCSI] ipr: use memory_read_from_buffer() [SCSI] aic79xx: fix shadowed variables [SCSI] aic79xx: fix shadowed variables, add statics [SCSI] aic7xxx: update *_shipped files [SCSI] aic7xxx: update .reg files [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser [SCSI] scsi_dh: Initialize path state to be passive when path is not owned ...
Bu işleme şunda yer alıyor:
@@ -23,7 +23,7 @@
|
||||
int string_get_size(u64 size, const enum string_size_units units,
|
||||
char *buf, int len)
|
||||
{
|
||||
const char *units_10[] = { "B", "KB", "MB", "GB", "TB", "PB",
|
||||
const char *units_10[] = { "B", "kB", "MB", "GB", "TB", "PB",
|
||||
"EB", "ZB", "YB", NULL};
|
||||
const char *units_2[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB",
|
||||
"EiB", "ZiB", "YiB", NULL };
|
||||
@@ -31,7 +31,7 @@ int string_get_size(u64 size, const enum string_size_units units,
|
||||
[STRING_UNITS_10] = units_10,
|
||||
[STRING_UNITS_2] = units_2,
|
||||
};
|
||||
const int divisor[] = {
|
||||
const unsigned int divisor[] = {
|
||||
[STRING_UNITS_10] = 1000,
|
||||
[STRING_UNITS_2] = 1024,
|
||||
};
|
||||
@@ -40,23 +40,27 @@ int string_get_size(u64 size, const enum string_size_units units,
|
||||
char tmp[8];
|
||||
|
||||
tmp[0] = '\0';
|
||||
i = 0;
|
||||
if (size >= divisor[units]) {
|
||||
while (size >= divisor[units] && units_str[units][i]) {
|
||||
remainder = do_div(size, divisor[units]);
|
||||
i++;
|
||||
}
|
||||
|
||||
for (i = 0; size > divisor[units] && units_str[units][i]; i++)
|
||||
remainder = do_div(size, divisor[units]);
|
||||
sf_cap = size;
|
||||
for (j = 0; sf_cap*10 < 1000; j++)
|
||||
sf_cap *= 10;
|
||||
|
||||
sf_cap = size;
|
||||
for (j = 0; sf_cap*10 < 1000; j++)
|
||||
sf_cap *= 10;
|
||||
|
||||
if (j) {
|
||||
remainder *= 1000;
|
||||
do_div(remainder, divisor[units]);
|
||||
snprintf(tmp, sizeof(tmp), ".%03lld",
|
||||
(unsigned long long)remainder);
|
||||
tmp[j+1] = '\0';
|
||||
if (j) {
|
||||
remainder *= 1000;
|
||||
do_div(remainder, divisor[units]);
|
||||
snprintf(tmp, sizeof(tmp), ".%03lld",
|
||||
(unsigned long long)remainder);
|
||||
tmp[j+1] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
snprintf(buf, len, "%lld%s%s", (unsigned long long)size,
|
||||
snprintf(buf, len, "%lld%s %s", (unsigned long long)size,
|
||||
tmp, units_str[units][i]);
|
||||
|
||||
return 0;
|
||||
|
Yeni konuda referans
Bir kullanıcı engelle