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

Btrfs-progs: make pretty_sizes take u64 instead of a double 

This got changed to a double but all the callers still use a u64, which causes
us to segfault sometimes because of some weird C voodoo that I had to have
explained to me.  Apparently because we're using a double the compiler will use
the floating point registers to hold our argument which ends up not being
aligned properly if you don't actually give it a double so it will cause
problems for other things, in our case it was screwing up str_bytes so it was
larger than the actual size of the str.  This patch fixes the segfault.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
master
Josef Bacik 2013-10-22 10:10:21 -04:00 committed by Chris Mason
parent d33b2a4842
commit cee267d8c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils.c
View File

@ -1213,7 +1213,7 @@ out:
}
static char *size_strs[] = { "", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"};
int pretty_size_snprintf(double size, char *str, size_t str_bytes)
int pretty_size_snprintf(u64 size, char *str, size_t str_bytes)
{
int num_divs = 0;
float fraction;

2
utils.h
View File

@ -57,7 +57,7 @@ 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 super_offset);
int pretty_size_snprintf(double size, char *str, size_t str_bytes);
int pretty_size_snprintf(u64 size, char *str, size_t str_bytes);
#define pretty_size(size) \
({ \
static __thread char _str[24]; \