| Message ID | 1476971169-31604-4-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/20/2016 08:46 AM, Kevin Wolf wrote: > It is unused now. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > block/io.c | 29 ----------------------------- > block/trace-events | 1 - > include/block/block.h | 3 --- > 3 files changed, 33 deletions(-) Might be nice to research which commit id removed the last use, and mention it in the commit message as an idea for how long we've had dead code, but that's not a necessity. Reviewed-by: Eric Blake <eblake@redhat.com>
Am 20.10.2016 um 19:32 hat Eric Blake geschrieben: > On 10/20/2016 08:46 AM, Kevin Wolf wrote: > > It is unused now. > > > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > > --- > > block/io.c | 29 ----------------------------- > > block/trace-events | 1 - > > include/block/block.h | 3 --- > > 3 files changed, 33 deletions(-) > > Might be nice to research which commit id removed the last use, and > mention it in the commit message as an idea for how long we've had dead > code, but that's not a necessity. Patch 2 removed the last user. Kevin
On 10/21/2016 05:59 AM, Kevin Wolf wrote: > Am 20.10.2016 um 19:32 hat Eric Blake geschrieben: >> On 10/20/2016 08:46 AM, Kevin Wolf wrote: >>> It is unused now. >>> >>> Signed-off-by: Kevin Wolf <kwolf@redhat.com> >>> --- >>> block/io.c | 29 ----------------------------- >>> block/trace-events | 1 - >>> include/block/block.h | 3 --- >>> 3 files changed, 33 deletions(-) >> >> Might be nice to research which commit id removed the last use, and >> mention it in the commit message as an idea for how long we've had dead >> code, but that's not a necessity. > > Patch 2 removed the last user. Aha. So maybe "removed in the previous patch" is all the more mention it needs, if at all.
diff --git a/block/io.c b/block/io.c index b136c89..ff93ba1 100644 --- a/block/io.c +++ b/block/io.c @@ -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) { diff --git a/block/trace-events b/block/trace-events index 05fa13c..aff8a96 100644 --- a/block/trace-events +++ b/block/trace-events @@ -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" diff --git a/include/block/block.h b/include/block/block.h index 107c603..99a15a6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -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);
It is unused now. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/io.c | 29 ----------------------------- block/trace-events | 1 - include/block/block.h | 3 --- 3 files changed, 33 deletions(-)