X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fposixaio.c;h=29bcc5acc809f63fc7c46972564a5e696543ef78;hb=97e1fe78db572a48a44c2a8511f8393a8643fc28;hp=a943e5bbf6eaad2c953d21f5c9abd431690fdabf;hpb=836fcc0fceb233ebcc41ee63b4ea5cae20b678a4;p=fio.git

diff --git a/engines/posixaio.c b/engines/posixaio.c
index a943e5bb..29bcc5ac 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -91,15 +91,16 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td,
 #define SUSPEND_ENTRIES	8
 
 static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
-				  unsigned int max, struct timespec *t)
+				  unsigned int max, const struct timespec *t)
 {
 	struct posixaio_data *pd = td->io_ops->data;
 	os_aiocb_t *suspend_list[SUSPEND_ENTRIES];
-	struct flist_head *entry;
 	struct timespec start;
 	int have_timeout = 0;
-	int suspend_entries = 0;
+	int suspend_entries;
+	struct io_u *io_u;
 	unsigned int r;
+	int i;
 
 	if (t && !fill_timespec(&start))
 		have_timeout = 1;
@@ -107,13 +108,13 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 		memset(&start, 0, sizeof(start));
 
 	r = 0;
-	memset(suspend_list, 0, sizeof(*suspend_list));
 restart:
-	flist_for_each(entry, &td->io_u_busylist) {
-		struct io_u *io_u = flist_entry(entry, struct io_u, list);
+	memset(suspend_list, 0, sizeof(*suspend_list));
+	suspend_entries = 0;
+	io_u_qiter(&td->io_u_all, io_u, i) {
 		int err;
 
-		if (io_u->seen)
+		if (io_u->seen || !(io_u->flags & IO_U_F_FLIGHT))
 			continue;
 
 		err = aio_error(&io_u->aiocb);
@@ -195,18 +196,20 @@ static int fio_posixaio_queue(struct thread_data *td,
 		return FIO_Q_COMPLETED;
 #endif
 	}
-		
+
 	if (ret) {
+		int aio_err = errno;
+
 		/*
 		 * At least OSX has a very low limit on the number of pending
 		 * IOs, so if it returns EAGAIN, we are out of resources
 		 * to queue more. Just return FIO_Q_BUSY to naturally
 		 * drop off at this depth.
 		 */
-		if (errno == EAGAIN)
+		if (aio_err == EAGAIN)
 			return FIO_Q_BUSY;
 
-		io_u->error = errno;
+		io_u->error = aio_err;
 		td_verror(td, io_u->error, "xfer");
 		return FIO_Q_COMPLETED;
 	}