summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2017-08-17 15:50:50 -0600
committerKent Overstreet <kent.overstreet@gmail.com>2017-08-23 16:29:28 -0600
commit4b9e40b23ad171cb1120a2befc3c2eb4a144ed63 (patch)
tree0dbdcc939d409d6b2013232d7f7cacd4e673788d
parent38f22164a9a3f2f8e33af8e0cc3ce4f17ef99cde (diff)
fix incorrect errno usage
-rw-r--r--linux/blkdev.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/blkdev.c b/linux/blkdev.c
index 70995c8b..2e03889d 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;