mmap engine: allow large files on 32-bit archs

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 9fd04daae2f6ca2b58a61e68b0d4f816801c61a7..a3f96a15ef0e2a965406c3c050d57cfa47bbce38 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -154,7 +154,6 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                        left -= bs;
                        continue;
                } else {
-                       printf("r=%d\n", r);
                        td_verror(td, EIO, "pre_read");
                        break;
                }
@@ -256,8 +255,11 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 {
        int ret = 0;
 
-       if (len == -1ULL)
+       if (len == -1ULL) {
                len = f->io_size;
+               if (len == -1ULL && td->o.fill_device)
+                       return 0;
+       }
        if (off == -1ULL)
                off = f->file_offset;
 
@@ -267,8 +269,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        /*
         * FIXME: add blockdev flushing too
         */
-       if (f->mmap)
-               ret = madvise(f->mmap, len, MADV_DONTNEED);
+       if (f->mmap_ptr)
+               ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
        else if (f->filetype == FIO_TYPE_FILE) {
                ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
        } else if (f->filetype == FIO_TYPE_BD) {