]> git.sesse.net Git - bcachefs-tools-debian/commitdiff
Fix 32 bit io regression
authorBrett Holman <bholman.devel@gmail.com>
Sun, 17 Oct 2021 00:28:49 +0000 (18:28 -0600)
committerBrett Holman <bholman.devel@gmail.com>
Sun, 17 Oct 2021 00:28:49 +0000 (18:28 -0600)
In commit ba1dbafc1fce I reverted 9942fc82d43b, which was a workaround
for an upstream 32bit libaio bug. Oops.

Signed-off-by: Brett Holman <bholman.devel@gmail.com>
linux/blkdev.c

index 6c940f79fcaf8bce58f959ad4e80c8eac9adfa9a..59ef2a4adc4f9426e74c2d32d0a75bd0144dc23c 100644 (file)
@@ -368,9 +368,9 @@ static void aio_op(struct bio *bio, struct iovec *iov, unsigned i, int opcode)
                        ? bio->bi_bdev->bd_sync_fd
                        : bio->bi_bdev->bd_fd,
                .aio_lio_opcode = opcode,
-               .u.v.vec        = iov,
-               .u.v.nr         = i,
-               .u.v.offset     = bio->bi_iter.bi_sector << 9,
+               .u.c.buf        = iov,
+               .u.c.nbytes     = i,
+               .u.c.offset     = bio->bi_iter.bi_sector << 9,
 
        }, *iocbp = &iocb;