diff mbox

block/iscsi: drop obsolete pointers from iscsi_co_writev

Message ID 1403109622-12338-1-git-send-email-pl@kamp.de
State New
Headers show

Commit Message

Peter Lieven June 18, 2014, 4:40 p.m. UTC 
Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block/iscsi.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Stefan Hajnoczi June 23, 2014, 8:06 a.m. UTC | #1 
On Wed, Jun 18, 2014 at 06:40:22PM +0200, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan
Stefan Hajnoczi June 23, 2014, 8:13 a.m. UTC | #2 
On Wed, Jun 18, 2014 at 06:40:22PM +0200, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Nevermind, Paolo already applied this via the SCSI tree.
diff mbox

Patch

diff --git a/block/iscsi.c b/block/iscsi.c
index 327353c..84aa22a 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -359,8 +359,6 @@  static int coroutine_fn iscsi_co_writev(BlockDriverState *bs,
     struct IscsiTask iTask;
     uint64_t lba;
     uint32_t num_sectors;
-    uint8_t *data = NULL;
-    uint8_t *buf = NULL;
 
     if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
         return -EINVAL;
@@ -372,17 +370,16 @@  static int coroutine_fn iscsi_co_writev(BlockDriverState *bs,
 retry:
     if (iscsilun->use_16_for_rw) {
         iTask.task = iscsi_write16_task(iscsilun->iscsi, iscsilun->lun, lba,
-                                        data, num_sectors * iscsilun->block_size,
+                                        NULL, num_sectors * iscsilun->block_size,
                                         iscsilun->block_size, 0, 0, 0, 0, 0,
                                         iscsi_co_generic_cb, &iTask);
     } else {
         iTask.task = iscsi_write10_task(iscsilun->iscsi, iscsilun->lun, lba,
-                                        data, num_sectors * iscsilun->block_size,
+                                        NULL, num_sectors * iscsilun->block_size,
                                         iscsilun->block_size, 0, 0, 0, 0, 0,
                                         iscsi_co_generic_cb, &iTask);
     }
     if (iTask.task == NULL) {
-        g_free(buf);
         return -ENOMEM;
     }
     scsi_task_set_iov_out(iTask.task, (struct scsi_iovec *) iov->iov,
@@ -402,8 +399,6 @@  retry:
         goto retry;
     }
 
-    g_free(buf);
-
     if (iTask.status != SCSI_STATUS_GOOD) {
         return -EIO;
     }