[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 23/25] block: Kill .bdrv_co_discard()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 23/25] block: Kill .bdrv_co_discard() |
Date: |
Wed, 20 Jul 2016 17:21:20 +0100 |
From: Eric Blake <address@hidden>
Now that all drivers have a byte-based .bdrv_co_pdiscard(), we
no longer need to worry about the sector-based version. We can
also relax our minimum alignment to 1 for drivers that support it.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/io.c | 9 ++-------
include/block/block_int.h | 2 --
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/block/io.c b/block/io.c
index 5ba0195..7323f0f 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2423,14 +2423,12 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs,
int64_t offset,
return 0;
}
- if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_co_pdiscard &&
- !bs->drv->bdrv_aio_pdiscard) {
+ if (!bs->drv->bdrv_co_pdiscard && !bs->drv->bdrv_aio_pdiscard) {
return 0;
}
/* Discard is advisory, so ignore any unaligned head or tail */
- align = MAX(BDRV_SECTOR_SIZE,
- MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment));
+ align = MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment);
assert(is_power_of_2(align));
head = MIN(count, -offset & (align - 1));
if (head) {
@@ -2458,9 +2456,6 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs,
int64_t offset,
if (bs->drv->bdrv_co_pdiscard) {
ret = bs->drv->bdrv_co_pdiscard(bs, offset, num);
- } else if (bs->drv->bdrv_co_discard) {
- ret = bs->drv->bdrv_co_discard(bs, offset >> BDRV_SECTOR_BITS,
- num >> BDRV_SECTOR_BITS);
} else {
BlockAIOCB *acb;
CoroutineIOCompletion co = {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 8f16d16..a069f97 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -165,8 +165,6 @@ struct BlockDriver {
*/
int coroutine_fn (*bdrv_co_pwrite_zeroes)(BlockDriverState *bs,
int64_t offset, int count, BdrvRequestFlags flags);
- int coroutine_fn (*bdrv_co_discard)(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors);
int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs,
int64_t offset, int count);
int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs,
--
2.7.4
- [Qemu-devel] [PULL v2 12/25] raw-posix: Switch paio_submit() to byte-based, (continued)
- [Qemu-devel] [PULL v2 12/25] raw-posix: Switch paio_submit() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 14/25] block: Convert .bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 15/25] block: Add .bdrv_co_pdiscard() driver callback, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 18/25] iscsi: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 17/25] gluster: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 19/25] nbd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 20/25] qcow2: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 22/25] sheepdog: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 21/25] raw_bsd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 23/25] block: Kill .bdrv_co_discard(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 24/25] nbd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 25/25] raw_bsd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/20
- Re: [Qemu-devel] [PULL v2 00/25] Block patches, Peter Maydell, 2016/07/20