Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 284226f333be2fb7d859287fd3ab3c51b3636a92:

  Merge branch 'fio-histo-fix' of https://github.com/parallel-fs-utils/fio (2018-07-30 08:24:20 -0600)

are available in the git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 17924179519397e49a7a82fd99d860f9ef077645:

  Merge branch 'szaydel/solaris-Wincompatible-pointer-types' of https://github.com/szaydel/fio (2018-08-02 16:20:24 -0600)

----------------------------------------------------------------
Jens Axboe (1):
      Merge branch 'szaydel/solaris-Wincompatible-pointer-types' of https://github.com/szaydel/fio

Sam Zaydel (1):
      Fix incompatible pointer types warning on Solaris with gcc 6.4

 engines/solarisaio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/engines/solarisaio.c b/engines/solarisaio.c
index 151f31d..21e9593 100644
--- a/engines/solarisaio.c
+++ b/engines/solarisaio.c
@@ -105,7 +105,7 @@ static struct io_u *fio_solarisaio_event(struct thread_data *td, int event)
 	return sd->aio_events[event];
 }
 
-static int fio_solarisaio_queue(struct thread_data fio_unused *td,
+static enum fio_q_status fio_solarisaio_queue(struct thread_data fio_unused *td,
 			      struct io_u *io_u)
 {
 	struct solarisaio_data *sd = td->io_ops_data;