Turn file ->open and ->unlink into flags

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 69f2f19d426053d8fc487affc991534a55c3f4f9..c16128e99ce0a539a029ef0cd9cb007fe5e346fb 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -340,7 +340,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];
 
                fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
                f = &td->files[fileno];

-               if (f->open)
+               if (f->flags & FIO_FILE_OPEN)

                        return f;
        } while (1);
 }
                        return f;
        } while (1);
 }


@@ -360,7 +360,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 (td->next_file >= td->open_files)
                        td->next_file = 0;
 

-               if (f->open)
+               if (f->flags & FIO_FILE_OPEN)

                        break;
 
                f = NULL;
                        break;
 
                f = NULL;


@@ -377,7 +377,7 @@ static struct fio_file *get_next_file(struct thread_data *td)
                return NULL;
 
        f = td->file_service_file;
                return NULL;
 
        f = td->file_service_file;

-       if (f && f->open && td->file_service_left--)
+       if (f && (f->flags & FIO_FILE_OPEN) && td->file_service_left--)

                return f;
 
        if (td->file_service_type == FIO_FSERVICE_RR)
                return f;
 
        if (td->file_service_type == FIO_FSERVICE_RR)