Recent changes (master)
The following changes since commit 86d59660ca54dd2e3e2457f3683198afc2b2701c:
Fix typo in bs_is_seq_ran option help (2014-09-28 16:25:49 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 0bc27b0b7019e4c386f83258430fb6b3ac34cc06:
filesetup: fix a bug where we overwrite the set size (2014-09-29 21:23:51 -0600)
----------------------------------------------------------------
Jens Axboe (3):
t/dedupe: silence 'some_done' unused warning on some compilers Fix compile of t/btrace2fio on RHEL5/CentOS5
filesetup: fix a bug where we overwrite the set size
filesetup.c | 2 +- os/os-linux.h | 13 +++++++++++++ t/dedupe.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-)
---
Diff of recent changes:
filesetup.c +1 -1
@@ -898,7 +898,7 @@ int setup_files(struct thread_data *td) } } -if (!o->size || o->size > total_size) +if (!o->size || (total_size && o->size > total_size)) o->size = total_size;if (o->size <td_min_bs (td)) {
os/os-linux.h +13 -0
@@ -15,6 +15,7 @@#include <linux/unistd.h> #include <linux/raw.h> #include <linux/major.h> +#include <byteswap.h> #include "binject.h" #include "../file.h"
@@ -208,9 +209,21 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)#define FIO_MADV_FREE MADV_REMOVE#endif +#if defined(__builtin_bswap16) +#define fio_swap16 (x) __builtin_bswap16(x) +#else #define fio_swap16 (x) __bswap_16(x) +#endif +#if defined(__builtin_bswap32) +#define fio_swap32 (x) __builtin_bswap32(x) +#else #define fio_swap32 (x) __bswap_32(x) +#endif +#if defined(__builtin_bswap64) +#define fio_swap64 (x) __builtin_bswap64(x) +#else #define fio_swap64 (x) __bswap_64(x) +#endif #define CACHE_LINE_FILE \ "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
t/dedupe.c +1 -1
@@ -342,7 +342,7 @@ static void show_progress(struct worker_thread *threads, unsigned long total)unsigned long nitems =0 ;uint64_t tdiff;float perc; -int some_done; +int some_done =0 ;int i;for (i =0 ; i < num_threads; i++) {