for_each_file(td, f, i) {
int file_there = !file_ok(td, f);
- if (file_there && td->ddir == DDIR_WRITE &&
- !td->overwrite) {
+ if (file_there && td_write(td) && !td->overwrite) {
unlink(f->file_name);
file_there = 0;
}
*/
if (td->io_ops->flags & FIO_MMAPIO)
ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
- else if (td->filetype == FIO_TYPE_FILE)
- ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
- else if (td->filetype == FIO_TYPE_BD)
- ret = blockdev_invalidate_cache(f->fd);
- else if (td->filetype == FIO_TYPE_CHAR)
+ else if (td->filetype == FIO_TYPE_FILE) {
+ if (!td->odirect)
+ ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+ } else if (td->filetype == FIO_TYPE_BD) {
+ if (!td->odirect)
+ ret = blockdev_invalidate_cache(f->fd);
+ } else if (td->filetype == FIO_TYPE_CHAR)
ret = 0;
if (ret < 0) {
return 1;
}
- return 0;
+ return ret;
}
static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
if (td->invalidate_cache && file_invalidate_cache(td, f))
return 1;
- if (td->sequential) {
+ if (!td_random(td)) {
if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
td_verror(td, errno, "madvise");
return 1;
if (td->invalidate_cache && file_invalidate_cache(td, f))
return 1;
- if (td->sequential) {
+ if (!td_random(td)) {
if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
td_verror(td, errno, "fadvise");
return 1;
td_verror(td, __e, "open");
if (__e == EINVAL && td->odirect)
- log_err("fio: destinations does not support O_DIRECT\n");
+ log_err("fio: destination does not support O_DIRECT\n");
return 1;
}