Call path below SIGALRM isn't safe

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index f976efbf693ec1b502041933442e70ab0b6d2852..e0b0f22e96d994b74f00153dd64509dd7b2a930d 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;
 
@@ -488,7 +489,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;;