[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/19] rbd: Switch rbd_start_aio() to byte-based
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v2 07/19] rbd: Switch rbd_start_aio() to byte-based |
Date: |
Fri, 15 Jul 2016 17:22:56 -0600 |
The internal function converts to byte-based before calling into
RBD code; hoist the conversion to the callers so that callers
can then be switched to byte-based themselves.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/rbd.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 0a5840d..01cbb63 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -649,9 +649,9 @@ static int rbd_aio_flush_wrapper(rbd_image_t image,
}
static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
- int64_t sector_num,
+ int64_t off,
QEMUIOVector *qiov,
- int nb_sectors,
+ int64_t size,
BlockCompletionFunc *cb,
void *opaque,
RBDAIOCmd cmd)
@@ -659,7 +659,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
RBDAIOCB *acb;
RADOSCB *rcb = NULL;
rbd_completion_t c;
- int64_t off, size;
char *buf;
int r;
@@ -668,6 +667,7 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
acb = qemu_aio_get(&rbd_aiocb_info, bs, cb, opaque);
acb->cmd = cmd;
acb->qiov = qiov;
+ assert(!qiov || qiov->size == size);
if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
acb->bounce = NULL;
} else {
@@ -687,9 +687,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
buf = acb->bounce;
- off = sector_num * BDRV_SECTOR_SIZE;
- size = nb_sectors * BDRV_SECTOR_SIZE;
-
rcb = g_new(RADOSCB, 1);
rcb->acb = acb;
rcb->buf = buf;
@@ -739,7 +736,8 @@ static BlockAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs,
BlockCompletionFunc *cb,
void *opaque)
{
- return rbd_start_aio(bs, sector_num, qiov, nb_sectors, cb, opaque,
+ return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, qiov,
+ nb_sectors << BDRV_SECTOR_BITS, cb, opaque,
RBD_AIO_READ);
}
@@ -750,7 +748,8 @@ static BlockAIOCB *qemu_rbd_aio_writev(BlockDriverState *bs,
BlockCompletionFunc *cb,
void *opaque)
{
- return rbd_start_aio(bs, sector_num, qiov, nb_sectors, cb, opaque,
+ return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, qiov,
+ nb_sectors << BDRV_SECTOR_BITS, cb, opaque,
RBD_AIO_WRITE);
}
@@ -937,7 +936,8 @@ static BlockAIOCB* qemu_rbd_aio_discard(BlockDriverState
*bs,
BlockCompletionFunc *cb,
void *opaque)
{
- return rbd_start_aio(bs, sector_num, NULL, nb_sectors, cb, opaque,
+ return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, NULL,
+ nb_sectors << BDRV_SECTOR_BITS, cb, opaque,
RBD_AIO_DISCARD);
}
#endif
--
2.5.5
- [Qemu-block] [PATCH for-2.7 v2 00/19] byte-based block discard, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 05/19] block: Convert BB interface to byte-based discards, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 04/19] block: Convert bdrv_aio_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 01/19] block: Convert bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 08/19] block: Convert .bdrv_aio_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 07/19] rbd: Switch rbd_start_aio() to byte-based,
Eric Blake <=
- [Qemu-block] [PATCH v2 02/19] block: Convert bdrv_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 03/19] block: Switch BlockRequest to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 11/19] gluster: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 09/19] block: Add .bdrv_co_pdiscard() driver callback, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 06/19] raw-posix: Switch paio_submit() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 10/19] blkreplay: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 14/19] qcow2: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 12/19] iscsi: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 15/19] raw_bsd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 13/19] nbd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15