[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 17/19] block: Kill .bdrv_co_discard()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v2 17/19] block: Kill .bdrv_co_discard() |
Date: |
Fri, 15 Jul 2016 17:23:06 -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>
Reviewed-by: Stefan Hajnoczi <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 b4d4cd2..42bbed4 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 ee87fbf..b81d1fc 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2403,14 +2403,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) {
@@ -2438,9 +2436,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-block] [PATCH v2 03/19] block: Switch BlockRequest to byte-based, (continued)
- [Qemu-block] [PATCH v2 03/19] block: Switch BlockRequest to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 11/19] gluster: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 09/19] block: Add .bdrv_co_pdiscard() driver callback, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 06/19] raw-posix: Switch paio_submit() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 10/19] blkreplay: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 14/19] qcow2: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 12/19] iscsi: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 15/19] raw_bsd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 13/19] nbd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 16/19] sheepdog: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 17/19] block: Kill .bdrv_co_discard(),
Eric Blake <=
- [Qemu-block] [PATCH v2 19/19] raw_bsd: Convert to byte-based interface, Eric Blake, 2016/07/15
- [Qemu-block] [PATCH v2 18/19] nbd: Convert to byte-based interface, Eric Blake, 2016/07/15
- Re: [Qemu-block] [PATCH for-2.7 v2 00/19] byte-based block discard, Stefan Hajnoczi, 2016/07/19