filesetup: ensure that we align file starting offset

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 75136ff32fcc7e4409746a981d09f12b79313aef..9c37ae57e24af13cc411a8f3f8398e06f5963626 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -264,7 +264,7 @@ error:
        return ret;
 }
 
-static unsigned long long get_rand_file_size(struct thread_data *td)
+unsigned long long get_rand_file_size(struct thread_data *td)
 {
        unsigned long long ret, sized;
        uint64_t frand_max;
@@ -414,7 +414,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
                        errval = ret;
        } else if (f->filetype == FIO_TYPE_FILE) {
                ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
-               if (ret < 0)
+               if (ret)
                        errval = ret;
        } else if (f->filetype == FIO_TYPE_BD) {
                int retry_count = 0;
@@ -761,12 +761,16 @@ static unsigned long long get_fs_free_counts(struct thread_data *td)
 uint64_t get_start_offset(struct thread_data *td, struct fio_file *f)
 {
        struct thread_options *o = &td->o;
+       uint64_t offset;
 
        if (o->file_append && f->filetype == FIO_TYPE_FILE)
                return f->real_file_size;
 
-       return td->o.start_offset +
-               td->subjob_number * td->o.offset_increment;
+       offset = td->o.start_offset + td->subjob_number * td->o.offset_increment;
+       if (offset % td_max_bs(td))
+               offset -= (offset % td_max_bs(td));
+
+       return offset;
 }
 
 /*
@@ -809,6 +813,7 @@ int setup_files(struct thread_data *td)
         */
        total_size = 0;
        for_each_file(td, f, i) {
+               f->fileno = i;
                if (f->real_file_size == -1ULL)
                        total_size = -1ULL;
                else