Makefile: Link to the system logging library on Android

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index b8d1d83899cea588a40af2ed126adf150f26fa4c..1d3094c14796509c4f26a5b928bba3975dd8dc74 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -1047,7 +1047,7 @@ int setup_files(struct thread_data *td)
                         * doesn't divide nicely with the min blocksize,
                         * make the first files bigger.
                         */
-                       f->io_size = fs - f->file_offset;
+                       f->io_size = fs;
                        if (nr_fs_extra) {
                                nr_fs_extra--;
                                f->io_size += bs;
@@ -1104,13 +1104,15 @@ int setup_files(struct thread_data *td)
                }
 
                if (f->filetype == FIO_TYPE_FILE &&
-                   (f->io_size + f->file_offset) > f->real_file_size &&
-                   !td_ioengine_flagged(td, FIO_DISKLESSIO)) {
-                       if (!o->create_on_open) {
+                   (f->io_size + f->file_offset) > f->real_file_size) {
+                       if (!td_ioengine_flagged(td, FIO_DISKLESSIO) &&
+                           !o->create_on_open) {
                                need_extend++;
                                extend_size += (f->io_size + f->file_offset);
                                fio_file_set_extend(f);
-                       } else
+                       } else if (!td_ioengine_flagged(td, FIO_DISKLESSIO) ||
+                                  (td_ioengine_flagged(td, FIO_DISKLESSIO) &&
+                                   td_ioengine_flagged(td, FIO_FAKEIO)))
                                f->real_file_size = f->io_size + f->file_offset;
                }
        }
@@ -1336,6 +1338,9 @@ bool init_random_map(struct thread_data *td)
        for_each_file(td, f, i) {
                uint64_t fsize = min(f->real_file_size, f->io_size);
 
+               if (td->o.zone_mode == ZONE_MODE_STRIDED)
+                       fsize = td->o.zone_range;
+
                blocks = fsize / (unsigned long long) td->o.rw_min_bs;
 
                if (check_rand_gen_limits(td, f, blocks))