Include fio version in normal output

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index f976efbf693ec1b502041933442e70ab0b6d2852..35471ad14d953702fca7a3d91de1c82a107421b7 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -269,7 +269,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                if (ddir_rw(io_u->ddir)) {
                        io_u_mark_depth(td, 1);
                        td->ts.total_io_u[io_u->ddir]++;
-               }
+               } else if (io_u->ddir == DDIR_TRIM)
+                       td->ts.total_io_u[2]++;
        } else if (ret == FIO_Q_QUEUED) {
                int r;
 
@@ -401,6 +402,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 
                if (ret) {
                        td_verror(td, ret, "fio_set_odirect");
+                       log_err("fio: the file system does not seem to support direct IO\n");
                        goto err;
                }
        }
@@ -488,7 +490,7 @@ int do_io_u_trim(struct thread_data *td, struct io_u *io_u)
        struct fio_file *f = io_u->file;
        int ret;
 
-       ret = os_trim(f->fd, io_u->offset + f->file_offset, io_u->xfer_buflen);
+       ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen);
        if (!ret)
                return io_u->xfer_buflen;;