Commit 7381e95c authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Remove bdrv_aio_pdiscard() 



It is unused now.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 8c2e3dd5

block/io.c

+0 −29
Original line number Diff line number Diff line
@@ -2196,35 +2196,6 @@ BlockAIOCB *bdrv_aio_flush(BlockDriverState *bs, 
    return &acb->common;

}



static void coroutine_fn bdrv_aio_pdiscard_co_entry(void *opaque)

{

    BlockAIOCBCoroutine *acb = opaque;

    BlockDriverState *bs = acb->common.bs;



    acb->req.error = bdrv_co_pdiscard(bs, acb->req.offset, acb->req.bytes);

    bdrv_co_complete(acb);

}



BlockAIOCB *bdrv_aio_pdiscard(BlockDriverState *bs, int64_t offset, int count,

                              BlockCompletionFunc *cb, void *opaque)

{

    Coroutine *co;

    BlockAIOCBCoroutine *acb;



    trace_bdrv_aio_pdiscard(bs, offset, count, opaque);



    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);

    acb->need_bh = true;

    acb->req.error = -EINPROGRESS;

    acb->req.offset = offset;

    acb->req.bytes = count;

    co = qemu_coroutine_create(bdrv_aio_pdiscard_co_entry, acb);

    qemu_coroutine_enter(co);



    bdrv_co_maybe_schedule_bh(acb);

    return &acb->common;

}



void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,

                   BlockCompletionFunc *cb, void *opaque)

{

block/trace-events

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ blk_co_preadv(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags 
blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags) "blk %p bs %p offset %"PRId64" bytes %u flags %x"



# block/io.c

bdrv_aio_pdiscard(void *bs, int64_t offset, int count, void *opaque) "bs %p offset %"PRId64" count %d opaque %p"

bdrv_aio_flush(void *bs, void *opaque) "bs %p opaque %p"

bdrv_aio_readv(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"

bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"

include/block/block.h

+0 −3
Original line number Diff line number Diff line
@@ -314,9 +314,6 @@ BlockAIOCB *bdrv_aio_writev(BdrvChild *child, int64_t sector_num, 
                            BlockCompletionFunc *cb, void *opaque);

BlockAIOCB *bdrv_aio_flush(BlockDriverState *bs,

                           BlockCompletionFunc *cb, void *opaque);

BlockAIOCB *bdrv_aio_pdiscard(BlockDriverState *bs,

                              int64_t offset, int count,

                              BlockCompletionFunc *cb, void *opaque);

void bdrv_aio_cancel(BlockAIOCB *acb);

void bdrv_aio_cancel_async(BlockAIOCB *acb);