[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.7 18/25] iscsi: Switch .bdrv_co_discard() to by
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.7 18/25] iscsi: Switch .bdrv_co_discard() to byte-based |
Date: |
Tue, 19 Jul 2016 19:48:08 +0100 |
From: Eric Blake <address@hidden>
Another step towards killing off sector-based block APIs.
Unlike write_zeroes, where we can be handed unaligned requests
and must fail gracefully with -ENOTSUP for a fallback, we are
guaranteed that discard requests are always aligned because the
block layer already ignored unaligned head/tail.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/iscsi.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index bdc7ade..da509df 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -923,29 +923,26 @@ iscsi_getlength(BlockDriverState *bs)
}
static int
-coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,
- int nb_sectors)
+coroutine_fn iscsi_co_pdiscard(BlockDriverState *bs, int64_t offset, int count)
{
IscsiLun *iscsilun = bs->opaque;
struct IscsiTask iTask;
struct unmap_list list;
- if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
- return -EINVAL;
- }
+ assert(is_byte_request_lun_aligned(offset, count, iscsilun));
if (!iscsilun->lbp.lbpu) {
/* UNMAP is not supported by the target */
return 0;
}
- list.lba = sector_qemu2lun(sector_num, iscsilun);
- list.num = sector_qemu2lun(nb_sectors, iscsilun);
+ list.lba = offset / iscsilun->block_size;
+ list.num = count / iscsilun->block_size;
iscsi_co_init_iscsitask(iscsilun, &iTask);
retry:
if (iscsi_unmap_task(iscsilun->iscsi, iscsilun->lun, 0, 0, &list, 1,
- iscsi_co_generic_cb, &iTask) == NULL) {
+ iscsi_co_generic_cb, &iTask) == NULL) {
return -ENOMEM;
}
@@ -975,7 +972,8 @@ retry:
return iTask.err_code;
}
- iscsi_allocationmap_clear(iscsilun, sector_num, nb_sectors);
+ iscsi_allocationmap_clear(iscsilun, offset >> BDRV_SECTOR_BITS,
+ count >> BDRV_SECTOR_BITS);
return 0;
}
@@ -1862,7 +1860,7 @@ static BlockDriver bdrv_iscsi = {
.bdrv_refresh_limits = iscsi_refresh_limits,
.bdrv_co_get_block_status = iscsi_co_get_block_status,
- .bdrv_co_discard = iscsi_co_discard,
+ .bdrv_co_pdiscard = iscsi_co_pdiscard,
.bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,
.bdrv_co_readv = iscsi_co_readv,
.bdrv_co_writev_flags = iscsi_co_writev_flags,
--
2.7.4
- [Qemu-devel] [PULL for-2.7 07/25] block: Convert bdrv_co_discard() to byte-based, (continued)
- [Qemu-devel] [PULL for-2.7 07/25] block: Convert bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 08/25] block: Convert bdrv_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 09/25] block: Switch BlockRequest to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 10/25] block: Convert bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 11/25] block: Convert BB interface to byte-based discards, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 12/25] raw-posix: Switch paio_submit() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 13/25] rbd: Switch rbd_start_aio() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 14/25] block: Convert .bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 15/25] block: Add .bdrv_co_pdiscard() driver callback, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 18/25] iscsi: Switch .bdrv_co_discard() to byte-based,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.7 17/25] gluster: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 19/25] nbd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 20/25] qcow2: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 21/25] raw_bsd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 22/25] sheepdog: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 23/25] block: Kill .bdrv_co_discard(), Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 24/25] nbd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 25/25] raw_bsd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- Re: [Qemu-devel] [PULL for-2.7 00/25] Block patches, Peter Maydell, 2016/07/20