From: Brett Holman <bholman.devel@gmail.com>
Date: Thu, 16 Sep 2021 23:44:21 +0000 (-0600)
Subject: Make aio code use struct io_iocb_common to support 32 bit architectures
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9942fc82d43baf261342d2550cd22609bf4f81b1;p=bcachefs-tools-debian

Make aio code use struct io_iocb_common to support 32 bit architectures

Signed-off-by: Brett Holman <bholman.devel@gmail.com>
---

diff --git a/linux/blkdev.c b/linux/blkdev.c
index 270d3c8..97c9ff4 100644
--- a/linux/blkdev.c
+++ b/linux/blkdev.c
@@ -76,9 +76,9 @@ void generic_make_request(struct bio *bio)
 	switch (bio_op(bio)) {
 	case REQ_OP_READ:
 		iocb.aio_lio_opcode	= IO_CMD_PREADV;
-		iocb.u.v.vec		= iov;
-		iocb.u.v.nr		= i;
-		iocb.u.v.offset		= bio->bi_iter.bi_sector << 9;
+		iocb.u.c.buf		= iov;
+		iocb.u.c.nbytes		= i;
+		iocb.u.c.offset		= bio->bi_iter.bi_sector << 9;
 
 		atomic_inc(&running_requests);
 		ret = io_submit(aio_ctx, 1, &iocbp);
@@ -87,9 +87,9 @@ void generic_make_request(struct bio *bio)
 		break;
 	case REQ_OP_WRITE:
 		iocb.aio_lio_opcode	= IO_CMD_PWRITEV;
-		iocb.u.v.vec		= iov;
-		iocb.u.v.nr		= i;
-		iocb.u.v.offset		= bio->bi_iter.bi_sector << 9;
+		iocb.u.c.buf		= iov;
+		iocb.u.c.nbytes		= i;
+		iocb.u.c.offset		= bio->bi_iter.bi_sector << 9;
 
 		atomic_inc(&running_requests);
 		ret = io_submit(aio_ctx, 1, &iocbp);