Merge branch 'shifted_logging' of https://github.com/sitsofe/fio

[fio.git] / engines / binject.c

diff --git a/engines/binject.c b/engines/binject.c
index 7d20a3fd7b9ce15d52d86f4b28dc494ba7b24e93..792dbbdd2ee89da71dfb42b3382a3e4adddbc877 100644 (file)
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -59,11 +59,12 @@ static int pollin_events(struct pollfd *pfds, int fds)
        return 0;
 }
 
-static unsigned int binject_read_commands(struct thread_data *td, void *p,
+static unsigned int binject_read_commands(struct thread_data *td, void *buf,
                                          int left, int *err)
 {
        struct fio_file *f;
        int i, ret, events;
+       char *p = buf;
 
 one_more:
        events = 0;
@@ -351,7 +352,7 @@ static int fio_binject_open_file(struct thread_data *td, struct fio_file *f)
        if (ret)
                return 1;
 
-       if (f->filetype != FIO_TYPE_BD) {
+       if (f->filetype != FIO_TYPE_BLOCK) {
                log_err("fio: binject only works with block devices\n");
                goto err_close;
        }