From f0f346d8604d594506c0dc1a3310a27de127c2ed Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 27 Oct 2010 09:24:54 -0600 Subject: [PATCH] Update for proper binject ioctls Signed-off-by: Jens Axboe --- engines/binject.c | 4 ++-- os/binject.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/engines/binject.c b/engines/binject.c index 7f5d6292..7109c7ac 100644 --- 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 24eee0d6..1d862c86 100644 --- 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, -- 2.25.1