Recent changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following changes since commit f42195a3ff2e186bc67968088b7cceae61ccb8f3:

  Update HOWTO as well for verify_backlog (2010-10-26 08:10:58 -0600)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (1):
      Update for proper binject ioctls

 engines/binject.c |    4 ++--
 os/binject.h      |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

---

Diff of recent changes:

diff --git a/engines/binject.c b/engines/binject.c
index 7f5d629..7109c7a 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 24eee0d..1d862c8 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,
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux SCSI]     [Linux IDE]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux