From 4b9e40b23ad171cb1120a2befc3c2eb4a144ed63 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 17 Aug 2017 15:50:50 -0600 Subject: [PATCH] fix incorrect errno usage --- linux/blkdev.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/linux/blkdev.c b/linux/blkdev.c index 70995c8..2e03889 100644 --- a/linux/blkdev.c +++ b/linux/blkdev.c @@ -65,8 +65,9 @@ void generic_make_request(struct bio *bio) iocb.u.v.nr = i; iocb.u.v.offset = bio->bi_iter.bi_sector << 9; - if (io_submit(aio_ctx, 1, &iocbp) != 1) - die("io_submit err: %m"); + ret = io_submit(aio_ctx, 1, &iocbp); + if (ret != 1) + die("io_submit err: %s", strerror(-ret)); break; case REQ_OP_WRITE: iocb.aio_lio_opcode = IO_CMD_PWRITEV; @@ -74,8 +75,9 @@ void generic_make_request(struct bio *bio) iocb.u.v.nr = i; iocb.u.v.offset = bio->bi_iter.bi_sector << 9; - if (io_submit(aio_ctx, 1, &iocbp) != 1) - die("io_submit err: %m"); + ret = io_submit(aio_ctx, 1, &iocbp); + if (ret != 1) + die("io_submit err: %s", strerror(-ret)); break; default: BUG(); @@ -219,10 +221,10 @@ static int aio_completion_thread(void *arg) ret = io_getevents(aio_ctx, 1, ARRAY_SIZE(events), events, NULL); - if (ret < 0 && errno == EINTR) + if (ret < 0 && ret == -EINTR) continue; if (ret < 0) - die("io_getevents() error: %m"); + die("io_getevents() error: %s", strerror(-ret)); for (ev = events; ev < events + ret; ev++) { struct bio *bio = (struct bio *) ev->data; -- 2.39.2