ci: stop hard coding number of jobs for make

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index fd8c9d1a65742543a2ea054eebc0007fd5099343..87cc2286e0e8f577c1176db4c1d984110e6af62a 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -238,8 +238,7 @@ void free_ioengine(struct thread_data *td)
        if (td->eo && td->io_ops->options) {
                options_free(td->io_ops->options, td->eo);
                free(td->eo);
-               if (td->o.use_thread)
-                       td->eo = NULL;
+               td->eo = NULL;
        }
 
        if (td->io_ops->dlhandle) {
@@ -591,19 +590,21 @@ 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;
+               int res;
 
                /*
-                * 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.
+                * For direct IO, set the hint on the file descriptor if that is
+                * supported. Otherwise set it on the inode. 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) {
+               if (td->o.odirect) {
+                       res = fcntl(f->fd, F_SET_FILE_RW_HINT, &hint);
+                       if (res < 0)
+                               res = fcntl(f->fd, F_SET_RW_HINT, &hint);
+               } else {
+                       res = fcntl(f->fd, F_SET_RW_HINT, &hint);
+               }
+               if (res < 0) {
                        td_verror(td, errno, "fcntl write hint");
                        goto err;
                }