binject: fixup ->file_data breakage
authorJens Axboe <axboe@kernel.dk>
Wed, 12 Dec 2012 08:07:00 +0000 (09:07 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 12 Dec 2012 08:07:00 +0000 (09:07 +0100)
Not sure how that was done, but I missed binject in doing
the ->file_data/->file_pos unification.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
engines/binject.c

index 47d40fe..f78d855 100644 (file)
@@ -69,7 +69,7 @@ static unsigned int binject_read_commands(struct thread_data *td, void *p,
 one_more:
        events = 0;
        for_each_file(td, f, i) {
-               bf = f->file_data;
+               bf = (void *) f->engine_data;
                ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
                if (ret < 0) {
                        if (errno == EAGAIN)
@@ -104,7 +104,7 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
         * Fill in the file descriptors
         */
        for_each_file(td, f, i) {
-               bf = f->file_data;
+               bf = (void *) f->engine_data;
 
                /*
                 * don't block for min events == 0
@@ -153,7 +153,7 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
 
        if (!min) {
                for_each_file(td, f, i) {
-                       bf = f->file_data;
+                       bf = (void *) f->engine_data;
                        fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
                }
        }
@@ -167,7 +167,7 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
 static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
 {
        struct b_user_cmd *buc = &io_u->buc;
-       struct binject_file *bf = io_u->file->file_data;
+       struct binject_file *bf = (void *) io_u->file->engine_data;
        int ret;
 
        ret = write(bf->fd, buc, sizeof(*buc));
@@ -181,7 +181,7 @@ static int fio_binject_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct binject_data *bd = td->io_ops->data;
        struct b_user_cmd *buc = &io_u->buc;
-       struct binject_file *bf = io_u->file->file_data;
+       struct binject_file *bf = (void *) io_u->file->engine_data;
 
        if (io_u->xfer_buflen & (bf->bs - 1)) {
                log_err("read/write not sector aligned\n");
@@ -323,12 +323,12 @@ err_unmap:
 
 static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
 {
-       struct binject_file *bf = f->file_data;
+       struct binject_file *bf = (void *) f->engine_data;
 
        if (bf) {
                binject_unmap_dev(td, bf);
                free(bf);
-               f->file_data = NULL;
+               f->engine_data = 0;
                return generic_close_file(td, f);
        }
 
@@ -357,7 +357,7 @@ static int fio_binject_open_file(struct thread_data *td, struct fio_file *f)
        bf = malloc(sizeof(*bf));
        bf->bs = bs;
        bf->minor = bf->fd = -1;
-       f->file_data = bf;
+       f->engine_data = (uint64_t) bf;
 
        if (binject_map_dev(td, bf, f->fd)) {
 err_close: