Merge branch 'asmfix' of https://github.com/oohal/fio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index abbaa9a7bd46eb3478706183fad658607d3058d9..919781c4e8e11a78a62c0e4fa189fdc820a30902 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -476,34 +476,27 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        if (fio_option_is_set(&td->o, write_hint) &&
            (f->filetype == FIO_TYPE_BLOCK || f->filetype == FIO_TYPE_FILE)) {
                uint64_t hint = td->o.write_hint;
+               int cmd;
 
-               if (fcntl(f->fd, F_SET_RW_HINT, &hint) < 0) {
+               /*
+                * For direct IO, we just need/want to set the hint on
+                * the file descriptor. For buffered IO, we need to set
+                * it on the inode.
+                */
+               if (td->o.odirect)
+                       cmd = F_SET_FILE_RW_HINT;
+               else
+                       cmd = F_SET_RW_HINT;
+
+               if (fcntl(f->fd, cmd, &hint) < 0) {
                        td_verror(td, errno, "fcntl write hint");
                        goto err;
                }
        }
 #endif
 
-#ifdef FIO_OS_DIRECTIO
-       /*
-        * Some OS's have a distinct call to mark the file non-buffered,
-        * instead of using O_DIRECT (Solaris)
-        */
-       if (td->o.odirect) {
-               int ret = fio_set_odirect(f->fd);
-
-               if (ret) {
-                       td_verror(td, ret, "fio_set_odirect");
-                       if (ret == ENOTTY) { /* ENOTTY suggests RAW device or ZFS */
-                               log_err("fio: doing directIO to RAW devices or ZFS not supported\n");
-                       } else {
-                               log_err("fio: the file system does not seem to support direct IO\n");
-                       }
-
-                       goto err;
-               }
-       }
-#endif
+       if (td->o.odirect && !OS_O_DIRECT && fio_set_directio(td, f))
+               goto err;
 
 done:
        log_file(td, f, FIO_LOG_OPEN_FILE);