| From 2094ed57c6e6e765d7e28a0c92f05d2b3cb43fd4 Mon Sep 17 00:00:00 2001 |
| Message-Id: <2094ed57c6e6e765d7e28a0c92f05d2b3cb43fd4.1389014116.git.minovotn@redhat.com> |
| In-Reply-To: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com> |
| References: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com> |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| Date: Mon, 9 Dec 2013 14:09:05 +0100 |
| Subject: [PATCH 17/50] iscsi: simplify iscsi_co_discard |
| |
| RH-Author: Paolo Bonzini <pbonzini@redhat.com> |
| Message-id: <1386598178-11845-20-git-send-email-pbonzini@redhat.com> |
| Patchwork-id: 56056 |
| O-Subject: [RHEL 7.0 qemu-kvm PATCH 19/52] iscsi: simplify iscsi_co_discard |
| Bugzilla: 1007815 |
| RH-Acked-by: Jeffrey Cody <jcody@redhat.com> |
| RH-Acked-by: Fam Zheng <famz@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| |
| From: Peter Lieven <pl@kamp.de> |
| |
| now that bdrv_co_discard can handle limits we do not need |
| the request split logic here anymore. |
| |
| Reviewed-by: Eric Blake <eblake@redhat.com> |
| Signed-off-by: Peter Lieven <pl@kamp.de> |
| Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| (cherry picked from commit 01a6a238a30b0381846e3e68ba06e232567a7026) |
| |
| block/iscsi.c | 67 ++++++++++++++++++++++------------------------------------- |
| 1 file changed, 25 insertions(+), 42 deletions(-) |
| |
| Signed-off-by: Michal Novotny <minovotn@redhat.com> |
| |
| block/iscsi.c | 67 ++++++++++++++++++++++------------------------------------- |
| 1 file changed, 25 insertions(+), 42 deletions(-) |
| |
| diff --git a/block/iscsi.c b/block/iscsi.c |
| index e5f4670..567a63a 100644 |
| |
| |
| @@ -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) |
| @@ -914,8 +913,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; |
| @@ -927,52 +924,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.11.7 |
| |