[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv7 12/17] iscsi: simplify iscsi_co_discard
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv7 12/17] iscsi: simplify iscsi_co_discard |
Date: |
Thu, 24 Oct 2013 12:07:01 +0200 |
now that bdrv_co_discard can handle limits we do not need
the request split logic here anymore.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
---
block/iscsi.c | 67 +++++++++++++++++++++------------------------------------
1 file changed, 25 insertions(+), 42 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 16d8052..c0465aa 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -87,7 +87,6 @@ typedef struct IscsiAIOCB {
#define NOP_INTERVAL 5000
#define MAX_NOP_FAILURES 3
#define ISCSI_CMD_RETRIES 5
-#define ISCSI_MAX_UNMAP 131072
static void
iscsi_bh_cb(void *p)
@@ -912,8 +911,6 @@ coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t
sector_num,
IscsiLun *iscsilun = bs->opaque;
struct IscsiTask iTask;
struct unmap_list list;
- uint32_t nb_blocks;
- uint32_t max_unmap;
if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
return -EINVAL;
@@ -925,52 +922,38 @@ coroutine_fn iscsi_co_discard(BlockDriverState *bs,
int64_t sector_num,
}
list.lba = sector_qemu2lun(sector_num, iscsilun);
- nb_blocks = sector_qemu2lun(nb_sectors, iscsilun);
+ list.num = sector_qemu2lun(nb_sectors, iscsilun);
- max_unmap = iscsilun->bl.max_unmap;
- if (max_unmap == 0xffffffff) {
- max_unmap = ISCSI_MAX_UNMAP;
- }
-
- while (nb_blocks > 0) {
- iscsi_co_init_iscsitask(iscsilun, &iTask);
- list.num = nb_blocks;
- if (list.num > max_unmap) {
- list.num = max_unmap;
- }
+ 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) {
- return -EIO;
- }
-
- while (!iTask.complete) {
- iscsi_set_events(iscsilun);
- qemu_coroutine_yield();
- }
+ if (iscsi_unmap_task(iscsilun->iscsi, iscsilun->lun, 0, 0, &list, 1,
+ iscsi_co_generic_cb, &iTask) == NULL) {
+ return -EIO;
+ }
- if (iTask.task != NULL) {
- scsi_free_scsi_task(iTask.task);
- iTask.task = NULL;
- }
+ while (!iTask.complete) {
+ iscsi_set_events(iscsilun);
+ qemu_coroutine_yield();
+ }
- if (iTask.do_retry) {
- goto retry;
- }
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
- if (iTask.status == SCSI_STATUS_CHECK_CONDITION) {
- /* the target might fail with a check condition if it
- is not happy with the alignment of the UNMAP request
- we silently fail in this case */
- return 0;
- }
+ if (iTask.do_retry) {
+ goto retry;
+ }
- if (iTask.status != SCSI_STATUS_GOOD) {
- return -EIO;
- }
+ if (iTask.status == SCSI_STATUS_CHECK_CONDITION) {
+ /* the target might fail with a check condition if it
+ is not happy with the alignment of the UNMAP request
+ we silently fail in this case */
+ return 0;
+ }
- list.lba += list.num;
- nb_blocks -= list.num;
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ return -EIO;
}
return 0;
--
1.7.9.5
- [Qemu-devel] [PATCHv7 04/17] block: add logical block provisioning info to BlockDriverInfo, (continued)
- [Qemu-devel] [PATCHv7 04/17] block: add logical block provisioning info to BlockDriverInfo, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 03/17] block: introduce BDRV_REQ_MAY_UNMAP request flag, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 02/17] block: add flags to bdrv_*_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 06/17] block/iscsi: add .bdrv_get_info, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 05/17] block: add wrappers for logical block provisioning information, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 08/17] block/raw: copy BlockLimits on raw_open, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 07/17] block: add BlockLimits structure to BlockDriverState, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 11/17] iscsi: set limits in BlockDriverState, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 10/17] block: honour BlockLimits in bdrv_co_discard, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 09/17] block: honour BlockLimits in bdrv_co_do_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 12/17] iscsi: simplify iscsi_co_discard,
Peter Lieven <=
- [Qemu-devel] [PATCHv7 13/17] iscsi: add bdrv_co_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 14/17] block: introduce bdrv_make_zero, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 16/17] qemu-img: add support for fully allocated images, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 15/17] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv7 17/17] qemu-img: conditionally zero out target on convert, Peter Lieven, 2013/10/24
- Re: [Qemu-devel] [PATCHv7 00/17] block: logical block provisioning enhancements, Paolo Bonzini, 2013/10/24