Recent changes

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

The following changes since commit 2f68124f26e54233db41b462a257dabc48e5c32b:

  A few fixes for 32-bit compiles (2010-10-21 08:15:59 +0200)

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

Jens Axboe (4):
      binject: ctl cleanups
      Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
      Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
      Fio 1.44.1

 engines/binject.c |   28 ++++++++++++++++------------
 init.c            |    2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

---

Diff of recent changes:

diff --git a/engines/binject.c b/engines/binject.c
index f7e56eb..7f5d629 100644
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -233,6 +233,17 @@ static struct io_u *fio_binject_event(struct thread_data *td, int event)
 	return bd->events[event];
 }
 
+static int binject_open_ctl(struct thread_data *td)
+{
+	int fd;
+
+	fd = open("/dev/binject-ctl", O_RDWR);
+	if (fd < 0)
+		td_verror(td, errno, "open binject-ctl");
+
+	return fd;
+}
+
 static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
 {
 	struct b_ioctl_cmd bic;
@@ -243,19 +254,14 @@ static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
 		bf->fd = -1;
 	}
 
-	fdb = open("/dev/binject-ctl", O_RDWR);
-	if (fdb < 0) {
-		td_verror(td, errno, "open binject-ctl");
+	fdb = binject_open_ctl(td);
+	if (fdb < 0)
 		return;
-	}
 
 	bic.minor = bf->minor;
 
-	if (ioctl(fdb, 1, &bic) < 0) {
+	if (ioctl(fdb, 1, &bic) < 0)
 		td_verror(td, errno, "binject dev unmap");
-		close(fdb);
-		return;
-	}
 
 	close(fdb);
 }
@@ -268,11 +274,9 @@ static int binject_map_dev(struct thread_data *td, struct binject_file *bf,
 	struct stat sb;
 	int fdb, dev_there, loops;
 
-	fdb = open("/dev/binject-ctl", O_RDWR);
-	if (fdb < 0) {
-		td_verror(td, errno, "binject ctl open");
+	fdb = binject_open_ctl(td);
+	if (fdb < 0)
 		return 1;
-	}
 
 	bic.fd = fd;
 
diff --git a/init.c b/init.c
index e22ae12..3f29b91 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.44";
+static char fio_version_string[] = "fio 1.44.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
--
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