From 5e00c2c4b7e2d5c1e535dbe10ee4b687f9f4b72b Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 18 Jan 2008 10:26:58 +0100 Subject: [PATCH] libio: fix bug in commit hook Also simplifies it. Signed-off-by: Jens Axboe --- engines/libaio.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/engines/libaio.c b/engines/libaio.c index 29eac20f..eea8f553 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -133,36 +133,26 @@ static int fio_libaio_commit(struct thread_data *td) struct libaio_data *ld = td->io_ops->data; struct iocb **iocbs; struct io_u **io_us; - int ret, iocbs_nr; + int ret; if (!ld->iocbs_nr) return 0; - iocbs_nr = ld->iocbs_nr; io_us = ld->io_us; iocbs = ld->iocbs; do { - ret = io_submit(ld->aio_ctx, iocbs_nr, iocbs); - if (ret == iocbs_nr) { - fio_libaio_queued(td, io_us, ret); - ret = 0; - break; - } else if (ret > 0) { + ret = io_submit(ld->aio_ctx, ld->iocbs_nr, iocbs); + if (ret > 0) { fio_libaio_queued(td, io_us, ret); + ld->iocbs_nr -= ret; io_us += ret; iocbs += ret; - iocbs_nr -= ret; - continue; - } else if (ret == -EAGAIN || !ret) - usleep(100); - else if (ret == -EINTR) + ret = 0; + } else if (!ret || ret == -EAGAIN || ret == -EINTR) continue; else break; - } while (1); - - if (!ret) - ld->iocbs_nr = 0; + } while (ld->iocbs_nr); return ret; } -- 2.25.1