From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:57693)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1TaSXQ-0003n3-8d
	for qemu-devel@nongnu.org; Mon, 19 Nov 2012 09:41:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1TaSXK-00068b-FJ
	for qemu-devel@nongnu.org; Mon, 19 Nov 2012 09:41:28 -0500
Received: from mx1.redhat.com ([209.132.183.28]:49263)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1TaSXK-00068U-5S
	for qemu-devel@nongnu.org; Mon, 19 Nov 2012 09:41:22 -0500
Message-ID: <50AA4507.4080401@redhat.com>
Date: Mon, 19 Nov 2012 15:41:11 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <589082222.7272963.1352241778123.JavaMail.root@redhat.com>
	<50A95A6A.4010109@profihost.ag> <50A9E991.2070609@redhat.com>
	<50A9FD86.3050400@profihost.ag> <50AA01C0.8030709@redhat.com>
	<50AA0314.6090208@profihost.ag> <50AA04A7.4080200@redhat.com>
	<50AA065F.5010602@profihost.ag> <50AA089B.7010400@redhat.com>
	<50AA0A2E.2090506@profihost.ag> <50AA0B90.6060702@redhat.com>
	<50AA1085.6000106@profihost.ag> <50AA151A.7030008@redhat.com>
	<50AA1CE7.7090100@profihost.ag> <50AA24E7.7010009@redhat.com>
	<50AA2DB0.6010107@profihost.ag> <50AA2EDF.6070409@redhat.com>
	<50AA420D.6070806@profihost.ag>
In-Reply-To: <50AA420D.6070806@profihost.ag>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] scsi-hd with discard_granularity and unmap results
 in Aborted Commands
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
Cc: josh.durgin@inktank.com, qemu-devel@nongnu.org, sage@newdream.net

Il 19/11/2012 15:28, Stefan Priebe - Profihost AG ha scritto:
>  typedef struct RADOSCB {
> @@ -376,6 +377,10 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
>      RBDAIOCB *acb = rcb->acb;
>      int64_t r;
>  
> +    if (acb->bh) {
> +        return;
> +    }
> +
>      r = rcb->ret;
>  
>      if (acb->cmd == RBD_AIO_WRITE ||
> @@ -560,6 +565,20 @@ static void qemu_rbd_close(BlockDriverState *bs)
>      rados_shutdown(s->cluster);
>  }
>  
> +static void qemu_rbd_aio_abort(void *private_data)
> +{
> +    RBDAIOCB *acb = (RBDAIOCB *) private_data;
> +
> +    acb->status = -ECANCELED;
> +
> +    if (acb->bh) {
> +        return;
> +    }
> +
> +    acb->bh = qemu_bh_new(rbd_aio_bh_cb, acb);
> +    qemu_bh_schedule(acb->bh);
> +}

I think this is all unneeded.  Just store rcb->ret into
rcb->acb->status, and your version of qemu_rbd_aio_cancel should just work.

Also, I think the acb->cancelled field is not necessary anymore after
these changes.

Paolo