[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 14/20] sheepdog: Switch to .bdrv_co_block_status(
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v3 14/20] sheepdog: Switch to .bdrv_co_block_status() |
Date: |
Thu, 14 Sep 2017 09:40:26 -0500 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the sheepdog driver accordingly.
Signed-off-by: Eric Blake <address@hidden>
---
v2: rebase to mapping flag
---
block/sheepdog.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 696a71442a..09c431decc 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2989,18 +2989,17 @@ static coroutine_fn int sd_co_pdiscard(BlockDriverState
*bs, int64_t offset,
}
static coroutine_fn int64_t
-sd_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int
nb_sectors,
- int *pnum, BlockDriverState **file)
+sd_co_block_status(BlockDriverState *bs, bool mapping, int64_t offset,
+ int64_t bytes, int64_t *pnum, BlockDriverState **file)
{
BDRVSheepdogState *s = bs->opaque;
SheepdogInode *inode = &s->inode;
uint32_t object_size = (UINT32_C(1) << inode->block_size_shift);
- uint64_t offset = sector_num * BDRV_SECTOR_SIZE;
unsigned long start = offset / object_size,
- end = DIV_ROUND_UP((sector_num + nb_sectors) *
- BDRV_SECTOR_SIZE, object_size);
+ end = DIV_ROUND_UP(offset + bytes, object_size);
unsigned long idx;
- int64_t ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset;
+ int64_t ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |
+ (offset & BDRV_BLOCK_OFFSET_MASK);
for (idx = start; idx < end; idx++) {
if (inode->data_vdi_id[idx] == 0) {
@@ -3017,9 +3016,9 @@ sd_co_get_block_status(BlockDriverState *bs, int64_t
sector_num, int nb_sectors,
}
}
- *pnum = (idx - start) * object_size / BDRV_SECTOR_SIZE;
- if (*pnum > nb_sectors) {
- *pnum = nb_sectors;
+ *pnum = (idx - start) * object_size;
+ if (*pnum > bytes) {
+ *pnum = bytes;
}
if (ret > 0 && ret & BDRV_BLOCK_OFFSET_VALID) {
*file = bs;
@@ -3097,7 +3096,7 @@ static BlockDriver bdrv_sheepdog = {
.bdrv_co_writev = sd_co_writev,
.bdrv_co_flush_to_disk = sd_co_flush_to_disk,
.bdrv_co_pdiscard = sd_co_pdiscard,
- .bdrv_co_get_block_status = sd_co_get_block_status,
+ .bdrv_co_block_status = sd_co_block_status,
.bdrv_snapshot_create = sd_snapshot_create,
.bdrv_snapshot_goto = sd_snapshot_goto,
@@ -3133,7 +3132,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
.bdrv_co_writev = sd_co_writev,
.bdrv_co_flush_to_disk = sd_co_flush_to_disk,
.bdrv_co_pdiscard = sd_co_pdiscard,
- .bdrv_co_get_block_status = sd_co_get_block_status,
+ .bdrv_co_block_status = sd_co_block_status,
.bdrv_snapshot_create = sd_snapshot_create,
.bdrv_snapshot_goto = sd_snapshot_goto,
@@ -3169,7 +3168,7 @@ static BlockDriver bdrv_sheepdog_unix = {
.bdrv_co_writev = sd_co_writev,
.bdrv_co_flush_to_disk = sd_co_flush_to_disk,
.bdrv_co_pdiscard = sd_co_pdiscard,
- .bdrv_co_get_block_status = sd_co_get_block_status,
+ .bdrv_co_block_status = sd_co_block_status,
.bdrv_snapshot_create = sd_snapshot_create,
.bdrv_snapshot_goto = sd_snapshot_goto,
--
2.13.5
- [Qemu-block] [PATCH v3 04/20] gluster: Switch to .bdrv_co_block_status(), (continued)
- [Qemu-block] [PATCH v3 04/20] gluster: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 05/20] iscsi: Switch cluster_sectors to byte-based, Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 06/20] iscsi: Switch iscsi_allocmap_update() to byte-based, Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 08/20] null: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 09/20] parallels: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 07/20] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 10/20] qcow: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 12/20] qed: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 11/20] qcow2: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 13/20] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 14/20] sheepdog: Switch to .bdrv_co_block_status(),
Eric Blake <=
- [Qemu-block] [PATCH v3 15/20] vdi: Avoid bitrot of debugging code, Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 16/20] vdi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 18/20] vpc: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 19/20] vvfat: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 17/20] vmdk: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-block] [PATCH v3 20/20] block: Drop unused .bdrv_co_get_block_status(), Eric Blake, 2017/09/14