marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: utils: negative numbers are more plausible than sizes over 8 EiB 

I got tired of seeing "16.00EiB" whenever btrfs-progs encounters a
negative size value, e.g. during resize:

Unallocated:
   /dev/mapper/datamd18   16.00EiB

This version is much more useful:

Unallocated:
   /dev/mapper/datamd18  -26.29GiB

Signed-off-by: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Zygo Blaxell 2016-12-03 15:39:54 -05:00 committed by David Sterba
parent e325c74bb8
commit 2f682fb89b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils.c
View File

@ -2579,7 +2579,7 @@ out:
* Note: this function uses a static per-thread buffer. Do not call this * Note: this function uses a static per-thread buffer. Do not call this
* function more than 10 times within one argument list! * function more than 10 times within one argument list!
*/ */
const char *pretty_size_mode(u64 size, unsigned mode) const char *pretty_size_mode(s64 size, unsigned mode)
{ {
static __thread int ps_index = 0; static __thread int ps_index = 0;
static __thread char ps_array[10][32]; static __thread char ps_array[10][32];
@ -2598,20 +2598,20 @@ static const char* unit_suffix_binary[] =
static const char* unit_suffix_decimal[] = static const char* unit_suffix_decimal[] =
{ "B", "kB", "MB", "GB", "TB", "PB", "EB"}; { "B", "kB", "MB", "GB", "TB", "PB", "EB"};
int pretty_size_snprintf(u64 size, char *str, size_t str_size, unsigned unit_mode) int pretty_size_snprintf(s64 size, char *str, size_t str_size, unsigned unit_mode)
{ {
int num_divs; int num_divs;
float fraction; float fraction;
u64 base = 0; s64 base = 0;
int mult = 0; int mult = 0;
const char** suffix = NULL; const char** suffix = NULL;
u64 last_size; s64 last_size;
if (str_size == 0) if (str_size == 0)
return 0; return 0;
if ((unit_mode & ~UNITS_MODE_MASK) == UNITS_RAW) { if ((unit_mode & ~UNITS_MODE_MASK) == UNITS_RAW) {
snprintf(str, str_size, "%llu", size); snprintf(str, str_size, "%lld", size);
return 0; return 0;
} }
@ -2646,7 +2646,7 @@ int pretty_size_snprintf(u64 size, char *str, size_t str_size, unsigned unit_mod
num_divs = 0; num_divs = 0;
break; break;
default: default:
while (size >= mult) { while ((size < 0 ? -size : size) >= mult) {
last_size = size; last_size = size;
size /= mult; size /= mult;
num_divs++; num_divs++;

4
utils.h
View File

@ -174,9 +174,9 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
int btrfs_device_already_in_root(struct btrfs_root *root, int fd, int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
int super_offset); int super_offset);
int pretty_size_snprintf(u64 size, char *str, size_t str_bytes, unsigned unit_mode); int pretty_size_snprintf(s64 size, char *str, size_t str_bytes, unsigned unit_mode);
#define pretty_size(size) pretty_size_mode(size, UNITS_DEFAULT) #define pretty_size(size) pretty_size_mode(size, UNITS_DEFAULT)
const char *pretty_size_mode(u64 size, unsigned mode); const char *pretty_size_mode(s64 size, unsigned mode);
u64 parse_size(char *s); u64 parse_size(char *s);
u64 parse_qgroupid(const char *p); u64 parse_qgroupid(const char *p);