change os_trim() prototype not to use int fd

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 375413f4b6d230e38432484179327736ae2de060..db043e4acce6a5c6b81a216caed5eba6ca2d587a 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -552,9 +552,9 @@ static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
        if (!io_u_fits(td, io_u, minbs))
                return 0;
 
-       frand_max = rand_max(&td->bsrange_state);
+       frand_max = rand_max(&td->bsrange_state[ddir]);
        do {
-               r = __rand(&td->bsrange_state);
+               r = __rand(&td->bsrange_state[ddir]);
 
                if (!td->o.bssplit_nr[ddir]) {
                        buflen = 1 + (unsigned int) ((double) maxbs *
@@ -1602,7 +1602,7 @@ static void small_content_scramble(struct io_u *io_u)
        unsigned int i, nr_blocks = io_u->buflen / 512;
        uint64_t boffset;
        unsigned int offset;
-       void *p, *end;
+       char *p, *end;
 
        if (!nr_blocks)
                return;
@@ -2188,7 +2188,7 @@ int do_io_u_trim(const 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, io_u->xfer_buflen);
+       ret = os_trim(f, io_u->offset, io_u->xfer_buflen);
        if (!ret)
                return io_u->xfer_buflen;