[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/17] block: Kill .bdrv_co_discard()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 17/17] block: Kill .bdrv_co_discard() |
Date: |
Wed, 22 Jun 2016 09:51:14 -0600 |
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>
---
include/block/block_int.h | 2 --
block/io.c | 9 ++-------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 61e5b5a..651262d 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,
diff --git a/block/io.c b/block/io.c
index 9d1f36d..0b03944 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2394,14 +2394,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) {
@@ -2429,9 +2427,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 = {
--
2.5.5
- [Qemu-devel] [PATCH 04/17] block: Convert bdrv_aio_discard() to byte-based, (continued)
- [Qemu-devel] [PATCH 04/17] block: Convert bdrv_aio_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 08/17] block: Convert .bdrv_aio_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 12/17] iscsi: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 02/17] block: Convert bdrv_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 05/17] block: Convert BB interface to byte-based discards, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 03/17] block: Switch BlockRequest to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 01/17] block: Convert bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 06/17] raw-posix: Switch paio_submit() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 13/17] nbd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 15/17] raw_bsd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 17/17] block: Kill .bdrv_co_discard(),
Eric Blake <=
- [Qemu-devel] [PATCH 14/17] qcow2: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 16/17] sheepdog: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 11/17] gluster: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22