[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/17] nbd: Switch .bdrv_co_discard() to byte-based
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 13/17] nbd: Switch .bdrv_co_discard() to byte-based |
Date: |
Wed, 22 Jun 2016 09:51:10 -0600 |
Another step towards killing off sector-based block APIs.
While at it, call directly into nbd-client.c instead of having
a pointless trivial wrapper in nbd.c.
Signed-off-by: Eric Blake <address@hidden>
---
block/nbd-client.h | 3 +--
block/nbd-client.c | 11 ++++++-----
block/nbd.c | 12 +++---------
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/block/nbd-client.h b/block/nbd-client.h
index c618dad..62dec33 100644
--- a/block/nbd-client.h
+++ b/block/nbd-client.h
@@ -44,8 +44,7 @@ int nbd_client_init(BlockDriverState *bs,
Error **errp);
void nbd_client_close(BlockDriverState *bs);
-int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num,
- int nb_sectors);
+int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int count);
int nbd_client_co_flush(BlockDriverState *bs);
int nbd_client_co_writev(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, QEMUIOVector *qiov, int flags);
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 5841a32..070bb9d 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -295,19 +295,20 @@ int nbd_client_co_flush(BlockDriverState *bs)
return -reply.error;
}
-int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num,
- int nb_sectors)
+int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int count)
{
NbdClientSession *client = nbd_get_client_session(bs);
- struct nbd_request request = { .type = NBD_CMD_TRIM };
+ struct nbd_request request = {
+ .type = NBD_CMD_TRIM,
+ .from = offset,
+ .len = count,
+ };
struct nbd_reply reply;
ssize_t ret;
if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) {
return 0;
}
- request.from = sector_num * 512;
- request.len = nb_sectors * 512;
nbd_coroutine_start(client, &request);
ret = nbd_co_send_request(bs, &request, NULL);
diff --git a/block/nbd.c b/block/nbd.c
index 8a13078..42cae0e 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -360,12 +360,6 @@ static void nbd_refresh_limits(BlockDriverState *bs, Error
**errp)
bs->bl.max_transfer = NBD_MAX_BUFFER_SIZE;
}
-static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num,
- int nb_sectors)
-{
- return nbd_client_co_discard(bs, sector_num, nb_sectors);
-}
-
static void nbd_close(BlockDriverState *bs)
{
nbd_client_close(bs);
@@ -448,7 +442,7 @@ static BlockDriver bdrv_nbd = {
.bdrv_co_writev_flags = nbd_client_co_writev,
.bdrv_close = nbd_close,
.bdrv_co_flush_to_os = nbd_co_flush,
- .bdrv_co_discard = nbd_co_discard,
+ .bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_getlength = nbd_getlength,
.bdrv_detach_aio_context = nbd_detach_aio_context,
@@ -466,7 +460,7 @@ static BlockDriver bdrv_nbd_tcp = {
.bdrv_co_writev_flags = nbd_client_co_writev,
.bdrv_close = nbd_close,
.bdrv_co_flush_to_os = nbd_co_flush,
- .bdrv_co_discard = nbd_co_discard,
+ .bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_getlength = nbd_getlength,
.bdrv_detach_aio_context = nbd_detach_aio_context,
@@ -484,7 +478,7 @@ static BlockDriver bdrv_nbd_unix = {
.bdrv_co_writev_flags = nbd_client_co_writev,
.bdrv_close = nbd_close,
.bdrv_co_flush_to_os = nbd_co_flush,
- .bdrv_co_discard = nbd_co_discard,
+ .bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_getlength = nbd_getlength,
.bdrv_detach_aio_context = nbd_detach_aio_context,
--
2.5.5
- [Qemu-devel] [PATCH 07/17] rbd: Switch rbd_start_aio() to byte-based, (continued)
- [Qemu-devel] [PATCH 07/17] rbd: Switch rbd_start_aio() to byte-based, Eric Blake, 2016/06/22
- [Qemu-devel] [PATCH 10/17] blkreplay: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [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 <=
- [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, 2016/06/22
- [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