mutex error handling

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 9f3bb22d1d96be1c5c1d69492774012fc54caa65..e283e7276a84ca75b6a11de4d3c40d9dcd93e716 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -107,7 +107,7 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 
        if (td_random(td)) {
                unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
-               int loops = 2;
+               int loops = 5;
 
                do {
                        r = os_random_long(&td->random_state);
@@ -337,7 +337,7 @@ static struct fio_file *get_next_file_rand(struct thread_data *td)
 
                fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
                f = &td->files[fileno];
-               if (f->fd != -1)
+               if (f->open)
                        return f;
        } while (1);
 }
@@ -357,7 +357,7 @@ static struct fio_file *get_next_file_rr(struct thread_data *td)
                if (td->next_file >= td->open_files)
                        td->next_file = 0;
 
-               if (f->fd != -1)
+               if (f->open)
                        break;
 
                f = NULL;
@@ -448,8 +448,14 @@ struct io_u *get_io_u(struct thread_data *td)
                 * if we need to open a new file
                 */
                if (td->nr_open_files < td->nr_files &&
-                   td->open_files != td->nr_files)
-                       reopen_file(td, f);
+                   td->open_files != td->nr_files) {
+                       int ret = td_io_open_file(td, f);
+
+                       if (ret) {
+                               put_io_u(td, io_u);
+                               return NULL;
+                       }
+               }
        } while (1);
 
        if (td->zone_bytes >= td->zone_size) {