fusion-aw: fixes

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/configure b/configure
index 27cfb4d119390d69248d3b000f6dc426c1499792..c9932b570629850c4f08f5d1ab5d025e7f49dac8 100755 (executable)
--- a/configure
+++ b/configure
@@ -650,7 +650,7 @@ int main(int argc, char **argv)
   return vsl_vectored_write(0, &iov, 0, O_ATOMIC);
 }
 EOF
-if compile_prog "" "" "fusion-aw"; then
+if compile_prog "" "-lvsldpexp" "fusion-aw"; then
   fusion_aw="yes"
 fi
 echo "Fusion-io atomic engine       $fusion_aw"

diff --git a/engines/fusion-aw.c b/engines/fusion-aw.c
index 4213592460586d890253a00971a953bd349bbd86..20d13e0546f4b6c66c130915732c7ca0976224a9 100644 (file)
--- a/engines/fusion-aw.c
+++ b/engines/fusion-aw.c
@@ -29,7 +29,7 @@
 #define SECTOR_SHIFT    9
 #define SECTOR_SIZE    (1U<<SECTOR_SHIFT)
 
-struct acs_file_data {
+struct acs_engine_data {
        struct vsl_iovec iov[IO_VECTOR_LIMIT];
 };
 
@@ -40,7 +40,8 @@ static int queue(struct thread_data *td, struct io_u *io_u)
        off_t offset;
        char *xfer_buf;
        size_t xfer_buflen;
-       struct acs_file_data *d = io_u->file->file_data;
+       struct acs_engine_data *d =
+               (struct acs_engine_data *) io_u->file->engine_data;
 
        if (io_u->ddir != DDIR_WRITE) {
                td_vmsg(td, -EIO, "only writes supported", "io_u->ddir");
@@ -99,7 +100,7 @@ out:
 static int open_file(struct thread_data *td, struct fio_file *f)
 {
        int rc;
-       struct acs_file_data *d = NULL;
+       struct acs_engine_data *d = NULL;
 
        d = malloc(sizeof(*d));
        if (!d) {
@@ -107,7 +108,7 @@ static int open_file(struct thread_data *td, struct fio_file *f)
                rc = -ENOMEM;
                goto error;
        }
-       f->file_data = d;
+       f->engine_data = (uintptr_t) d;
 
        rc = generic_open_file(td, f);
 
@@ -116,7 +117,7 @@ out:
 
 error:
        f->fd = -1;
-       f->file_data = NULL;
+       f->engine_data = 0;
        if (d)
                free(d);
 
@@ -125,9 +126,9 @@ error:
 
 static int close_file(struct thread_data *td, struct fio_file *f)
 {
-       if (f->file_data) {
-               free(f->file_data);
-               f->file_data = NULL;
+       if (f->engine_data) {
+               free((void *) f->engine_data);
+               f->engine_data = 0;
        }
 
        return generic_close_file(td, f);