Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

diff --combined engines/binject.c
index 58901b6f8674b5238e133879620ec00811fdf751,f7e56eb2ed0207bc7169a3259e4c2edb758fad5b..7f5d6292eed417821e71f9fbb007e7690d5d2dc5
--- 1/engines/binject.c
--- 2/engines/binject.c
+++ b/engines/binject.c
@@@ -146,7 -146,7 +146,7 @@@ static int fio_binject_getevents(struc
                for (i = 0; i < events; i++) {
                        struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
  
-                       bd->events[ev_index] = (struct io_u *) buc->usr_ptr;
+                       bd->events[ev_index] = (struct io_u *) (unsigned long) buc->usr_ptr;
                        ev_index++;
                }
        }
@@@ -233,17 -233,6 +233,17 @@@ static struct io_u *fio_binject_event(s
        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;
@@@ -254,14 -243,19 +254,14 @@@
                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);
  }
@@@ -274,9 -268,11 +274,9 @@@ static int binject_map_dev(struct threa
        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;