Update for proper binject ioctls

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/engines/binject.c b/engines/binject.c
index 7f5d6292eed417821e71f9fbb007e7690d5d2dc5..7109c7acbf6fb2c40f690acaea5f0791b0741b81 100644 (file)
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -260,7 +260,7 @@ static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
 
        bic.minor = bf->minor;
 
-       if (ioctl(fdb, 1, &bic) < 0)
+       if (ioctl(fdb, B_IOCTL_DEL, &bic) < 0)
                td_verror(td, errno, "binject dev unmap");
 
        close(fdb);
@@ -280,7 +280,7 @@ static int binject_map_dev(struct thread_data *td, struct binject_file *bf,
 
        bic.fd = fd;
 
-       if (ioctl(fdb, 0, &bic) < 0) {
+       if (ioctl(fdb, B_IOCTL_ADD, &bic) < 0) {
                td_verror(td, errno, "binject dev map");
                close(fdb);
                return 1;

diff --git a/os/binject.h b/os/binject.h
index 24eee0d616d4915547adbeef7966f5cf9512545c..1d862c8637c179e3bbcc7766ba516f20c365365e 100644 (file)
--- a/os/binject.h
+++ b/os/binject.h
@@ -25,6 +25,10 @@ struct b_ioctl_cmd {
        int minor;
 };
 
+#define BINJECT_IOCTL_CHR      'J'
+#define B_IOCTL_ADD            _IOWR(BINJECT_IOCTL_CHR, 1, struct b_ioctl_cmd)
+#define B_IOCTL_DEL            _IOWR(BINJECT_IOCTL_CHR, 2, struct b_ioctl_cmd)
+
 enum {
        B_TYPE_READ             = 0,
        B_TYPE_WRITE,