From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2qtS-0001HZ-9p for qemu-devel@nongnu.org; Sat, 18 Aug 2012 17:49:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T2qtR-0006nK-AE for qemu-devel@nongnu.org; Sat, 18 Aug 2012 17:49:18 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:35336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2qtR-0006n8-3t for qemu-devel@nongnu.org; Sat, 18 Aug 2012 17:49:17 -0400 Received: by wibhm2 with SMTP id hm2so2070598wib.10 for ; Sat, 18 Aug 2012 14:49:16 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 18 Aug 2012 23:49:02 +0200 Message-Id: <1345326543-10677-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1345326543-10677-1-git-send-email-pbonzini@redhat.com> References: <1345326543-10677-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] iscsi: simplify iscsi_schedule_bh List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, s.priebe@profihost.ag Cc: ronniesahlberg@gmail.com It is always used with the same callback, remove the argument. And its return value is never used, assume allocation succeeds. Signed-off-by: Paolo Bonzini --- block/iscsi.c | 24 +++++++++--------------- 1 file modificato, 9 inserzioni(+), 15 rimozioni(-) diff --git a/block/iscsi.c b/block/iscsi.c index 7cfd752..fd5ac3b 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -73,7 +73,7 @@ struct IscsiTask { }; static void -iscsi_readv_writev_bh_cb(void *p) +iscsi_bh_cb(void *p) { IscsiAIOCB *acb = p; @@ -86,17 +86,11 @@ iscsi_readv_writev_bh_cb(void *p) qemu_aio_release(acb); } -static int -iscsi_schedule_bh(QEMUBHFunc *cb, IscsiAIOCB *acb) +static void +iscsi_schedule_bh(IscsiAIOCB *acb) { - acb->bh = qemu_bh_new(cb, acb); - if (!acb->bh) { - error_report("oom: could not create iscsi bh"); - return -EIO; - } - + acb->bh = qemu_bh_new(iscsi_bh_cb, acb); qemu_bh_schedule(acb->bh); - return 0; } @@ -211,7 +205,7 @@ iscsi_aio_write16_cb(struct iscsi_context *iscsi, int status, acb->status = -EIO; } - iscsi_schedule_bh(iscsi_readv_writev_bh_cb, acb); + iscsi_schedule_bh(acb); scsi_free_scsi_task(acb->task); acb->task = NULL; } @@ -312,7 +306,7 @@ iscsi_aio_read16_cb(struct iscsi_context *iscsi, int status, acb->status = -EIO; } - iscsi_schedule_bh(iscsi_readv_writev_bh_cb, acb); + iscsi_schedule_bh(acb); scsi_free_scsi_task(acb->task); acb->task = NULL; } @@ -428,7 +422,7 @@ iscsi_synccache10_cb(struct iscsi_context *iscsi, int status, acb->status = -EIO; } - iscsi_schedule_bh(iscsi_readv_writev_bh_cb, acb); + iscsi_schedule_bh(acb); scsi_free_scsi_task(acb->task); acb->task = NULL; } @@ -482,7 +476,7 @@ iscsi_unmap_cb(struct iscsi_context *iscsi, int status, acb->status = -EIO; } - iscsi_schedule_bh(iscsi_readv_writev_bh_cb, acb); + iscsi_schedule_bh(acb); scsi_free_scsi_task(acb->task); acb->task = NULL; } @@ -559,7 +553,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, memcpy(acb->ioh->sbp, &acb->task->datain.data[2], ss); } - iscsi_schedule_bh(iscsi_readv_writev_bh_cb, acb); + iscsi_schedule_bh(acb); scsi_free_scsi_task(acb->task); acb->task = NULL; } -- 1.7.11.2