Merge branch 'master' into gfio

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 5aadf126311b9322668c3e835b673126949fa4d5..4e828542e97535b6606d966cd9c08711f88f4639 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -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);
 
                        r = fallocate(f->fd, FALLOC_FL_KEEP_SIZE, 0,
                                        f->real_file_size);

-                       if (r != 0) {
+                       if (r != 0)

                                td_verror(td, errno, "fallocate");
                                td_verror(td, errno, "fallocate");

-                       }
+

                        break;
 #endif /* CONFIG_LINUX_FALLOCATE */
                default:
                        break;
 #endif /* CONFIG_LINUX_FALLOCATE */
                default:


@@ -919,9 +919,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)
                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
        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;
 }
 
        return 1;
 }


@@ -958,8 +958,8 @@ int init_random_map(struct thread_data *td)
        for_each_file(td, f, i) {
                uint64_t file_size = min(f->real_file_size, f->io_size);
 
        for_each_file(td, f, i) {
                uint64_t file_size = min(f->real_file_size, f->io_size);
 

-               blocks = (file_size + td->o.rw_min_bs - 1) /
-                               (unsigned long long) td->o.rw_min_bs;
+               blocks = file_size / (unsigned long long) td->o.rw_min_bs;
+

                if (td->o.random_generator == FIO_RAND_GEN_LFSR) {
                        unsigned long seed;
 
                if (td->o.random_generator == FIO_RAND_GEN_LFSR) {
                        unsigned long seed;