[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/19] gluster: Switch .bdrv_co_discard() to byte
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v2 11/19] gluster: Switch .bdrv_co_discard() to byte-based |
Date: |
Fri, 15 Jul 2016 17:23:00 -0600 |
Another step towards killing off sector-based block APIs.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/gluster.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/block/gluster.c b/block/gluster.c
index 406c1e6..ef3b0de 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -724,14 +724,12 @@ error:
}
#ifdef CONFIG_GLUSTERFS_DISCARD
-static coroutine_fn int qemu_gluster_co_discard(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors)
+static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
+ int64_t offset, int size)
{
int ret;
GlusterAIOCB acb;
BDRVGlusterState *s = bs->opaque;
- size_t size = nb_sectors * BDRV_SECTOR_SIZE;
- off_t offset = sector_num * BDRV_SECTOR_SIZE;
acb.size = 0;
acb.ret = 0;
@@ -976,7 +974,7 @@ static BlockDriver bdrv_gluster = {
.bdrv_co_flush_to_disk = qemu_gluster_co_flush_to_disk,
.bdrv_has_zero_init = qemu_gluster_has_zero_init,
#ifdef CONFIG_GLUSTERFS_DISCARD
- .bdrv_co_discard = qemu_gluster_co_discard,
+ .bdrv_co_pdiscard = qemu_gluster_co_pdiscard,
#endif
#ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
@@ -1004,7 +1002,7 @@ static BlockDriver bdrv_gluster_tcp = {
.bdrv_co_flush_to_disk = qemu_gluster_co_flush_to_disk,
.bdrv_has_zero_init = qemu_gluster_has_zero_init,
#ifdef CONFIG_GLUSTERFS_DISCARD
- .bdrv_co_discard = qemu_gluster_co_discard,
+ .bdrv_co_pdiscard = qemu_gluster_co_pdiscard,
#endif
#ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
@@ -1032,7 +1030,7 @@ static BlockDriver bdrv_gluster_unix = {
.bdrv_co_flush_to_disk = qemu_gluster_co_flush_to_disk,
.bdrv_has_zero_init = qemu_gluster_has_zero_init,
#ifdef CONFIG_GLUSTERFS_DISCARD
- .bdrv_co_discard = qemu_gluster_co_discard,
+ .bdrv_co_pdiscard = qemu_gluster_co_pdiscard,
#endif
#ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
@@ -1060,7 +1058,7 @@ static BlockDriver bdrv_gluster_rdma = {
.bdrv_co_flush_to_disk = qemu_gluster_co_flush_to_disk,
.bdrv_has_zero_init = qemu_gluster_has_zero_init,
#ifdef CONFIG_GLUSTERFS_DISCARD
- .bdrv_co_discard = qemu_gluster_co_discard,
+ .bdrv_co_pdiscard = qemu_gluster_co_pdiscard,
#endif
#ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,
--
2.5.5
- [Qemu-devel] [PATCH for-2.7 v2 00/19] byte-based block discard, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 02/19] block: Convert bdrv_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 03/19] block: Switch BlockRequest to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 04/19] block: Convert bdrv_aio_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 07/19] rbd: Switch rbd_start_aio() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 05/19] block: Convert BB interface to byte-based discards, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 08/19] block: Convert .bdrv_aio_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 10/19] blkreplay: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 09/19] block: Add .bdrv_co_pdiscard() driver callback, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 11/19] gluster: Switch .bdrv_co_discard() to byte-based,
Eric Blake <=
- [Qemu-devel] [PATCH v2 12/19] iscsi: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 06/19] raw-posix: Switch paio_submit() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 01/19] block: Convert bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 15/19] raw_bsd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 13/19] nbd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 17/19] block: Kill .bdrv_co_discard(), Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 14/19] qcow2: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 16/19] sheepdog: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 19/19] raw_bsd: Convert to byte-based interface, Eric Blake, 2016/07/15
- [Qemu-devel] [PATCH v2 18/19] nbd: Convert to byte-based interface, Eric Blake, 2016/07/15