Re: [Qemu-devel] [PATCH v6 11/22] blkdebug: Drop blkdebug_aiocb_info.cancel

[Stefan Hajnoczi <stefanha@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]

On Thu, Sep 11, 2014 at 01:41:17PM +0800, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/blkdebug.c | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/block/blkdebug.c b/block/blkdebug.c
> index 69b330e..08131b3 100644
> --- a/block/blkdebug.c
> +++ b/block/blkdebug.c
> @@ -52,11 +52,8 @@ typedef struct BlkdebugSuspendedReq {
>      QLIST_ENTRY(BlkdebugSuspendedReq) next;
>  } BlkdebugSuspendedReq;
>  
> -static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb);
> -
>  static const AIOCBInfo blkdebug_aiocb_info = {
> -    .aiocb_size = sizeof(BlkdebugAIOCB),
> -    .cancel     = blkdebug_aio_cancel,
> +    .aiocb_size    = sizeof(BlkdebugAIOCB),
>  };
>  
>  enum {
> @@ -450,16 +447,6 @@ static void error_callback_bh(void *opaque)
>      qemu_aio_release(acb);
>  }
>  
> -static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb)
> -{
> -    BlkdebugAIOCB *acb = container_of(blockacb, BlkdebugAIOCB, common);
> -    if (acb->bh) {
> -        qemu_bh_delete(acb->bh);
> -        acb->bh = NULL;
> -    }
> -    qemu_aio_release(acb);
> -}
> -

This changes cancel behavior a bit.  Instead of deleting the BH and
ending the request early we now always wait for it to complete.

It would have been nice to include rationale in the commit description
but I remember looking at the blkdebug.c code and not being sure whether
blkdebug_aio_cancel() is ever really needed anyway.  So I guess this is
fine...

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]