Makefile: 2nd go at making CC assignment/check actually work

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 688249bd8a727e7910d72388a829f7249b5ee059..119dd651a23ef7cbcdf121b2884eca98f3fcb57e 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -238,7 +238,7 @@ static int __get_next_rand_offset_zipf(struct thread_data *td,
                                       struct fio_file *f, enum fio_ddir ddir,
                                       unsigned long long *b)
 {
-       *b = zipf_next(&td->zipf);
+       *b = zipf_next(&f->zipf);
        return 0;
 }
 
@@ -246,7 +246,7 @@ static int __get_next_rand_offset_pareto(struct thread_data *td,
                                         struct fio_file *f, enum fio_ddir ddir,
                                         unsigned long long *b)
 {
-       *b = pareto_next(&td->zipf);
+       *b = pareto_next(&f->zipf);
        return 0;
 }
 
@@ -1359,8 +1359,8 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,
                if (td->o.max_latency && tusec > td->o.max_latency) {
                        if (!td->error)
                                log_err("fio: latency of %lu usec exceeds specified max (%u usec)\n", tusec, td->o.max_latency);
-                       td_verror(td, ETIME, "max latency exceeded");
-                       icd->error = ETIME;
+                       td_verror(td, ETIMEDOUT, "max latency exceeded");
+                       icd->error = ETIMEDOUT;
                }
        }