Merge branch 'master' into gfio

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index b70bd45439e2fc59787230fcc0b263dc97bba48a..ee58a7b63333728a8a3e392b21e7f202ddecb6f5 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -13,7 +13,7 @@
 #include "filehash.h"
 #include "os/os.h"
 #include "hash.h"
-#include "lib/bitmap.h"
+#include "lib/axmap.h"
 
 #ifdef FIO_HAVE_LINUX_FALLOCATE
 #include <linux/falloc.h>
@@ -96,9 +96,9 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 
                        r = fallocate(f->fd, FALLOC_FL_KEEP_SIZE, 0,
                                        f->real_file_size);
-                       if (r != 0) {
+                       if (r != 0)
                                td_verror(td, errno, "fallocate");
-                       }
+
                        break;
 #endif /* FIO_HAVE_LINUX_FALLOCATE */
                default:
@@ -878,9 +878,9 @@ static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)
                seed = td->rand_seeds[4];
 
        if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
-               zipf_init(&f->zipf, nranges, td->o.zipf_theta, seed);
+               zipf_init(&f->zipf, nranges, td->o.zipf_theta.u.f, seed);
        else
-               pareto_init(&f->zipf, nranges, td->o.pareto_h, seed);
+               pareto_init(&f->zipf, nranges, td->o.pareto_h.u.f, seed);
 
        return 1;
 }
@@ -921,10 +921,11 @@ int init_random_map(struct thread_data *td)
                        if (!lfsr_init(&f->lfsr, blocks))
                                continue;
                } else if (!td->o.norandommap) {
-                       f->io_bitmap = bitmap_new(blocks);
-                       if (f->io_bitmap)
+                       f->io_axmap = axmap_new(blocks);
+                       if (f->io_axmap)
                                continue;
-               }
+               } else if (td->o.norandommap)
+                       continue;
 
                if (!td->o.softrandommap) {
                        log_err("fio: failed allocating random map. If running"
@@ -972,8 +973,8 @@ void close_and_free_files(struct thread_data *td)
 
                sfree(f->file_name);
                f->file_name = NULL;
-               bitmap_free(f->io_bitmap);
-               f->io_bitmap = NULL;
+               axmap_free(f->io_axmap);
+               f->io_axmap = NULL;
                sfree(f);
        }