[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/17] block/rbd: drop qemu_rbd_aio_flush_cb()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 11/17] block/rbd: drop qemu_rbd_aio_flush_cb() |
Date: |
Wed, 17 Apr 2013 15:07:47 +0200 |
.io_flush() is no longer called so drop qemu_rbd_aio_flush_cb().
qemu_aio_count is unused now so drop it too.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/rbd.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 141b488..20bf0c7 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -100,7 +100,6 @@ typedef struct BDRVRBDState {
rados_ioctx_t io_ctx;
rbd_image_t image;
char name[RBD_MAX_IMAGE_NAME_SIZE];
- int qemu_aio_count;
char *snap;
int event_reader_pos;
RADOSCB *event_rcb;
@@ -428,19 +427,11 @@ static void qemu_rbd_aio_event_reader(void *opaque)
if (s->event_reader_pos == sizeof(s->event_rcb)) {
s->event_reader_pos = 0;
qemu_rbd_complete_aio(s->event_rcb);
- s->qemu_aio_count--;
}
}
} while (ret < 0 && errno == EINTR);
}
-static int qemu_rbd_aio_flush_cb(void *opaque)
-{
- BDRVRBDState *s = opaque;
-
- return (s->qemu_aio_count > 0);
-}
-
static int qemu_rbd_open(BlockDriverState *bs, const char *filename,
QDict *options, int flags)
{
@@ -526,7 +517,7 @@ static int qemu_rbd_open(BlockDriverState *bs, const char
*filename,
fcntl(s->fds[0], F_SETFL, O_NONBLOCK);
fcntl(s->fds[1], F_SETFL, O_NONBLOCK);
qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], qemu_rbd_aio_event_reader,
- NULL, qemu_rbd_aio_flush_cb, s);
+ NULL, NULL, s);
return 0;
@@ -710,8 +701,6 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs,
off = sector_num * BDRV_SECTOR_SIZE;
size = nb_sectors * BDRV_SECTOR_SIZE;
- s->qemu_aio_count++; /* All the RADOSCB */
-
rcb = g_malloc(sizeof(RADOSCB));
rcb->done = 0;
rcb->acb = acb;
@@ -748,7 +737,6 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs,
failed:
g_free(rcb);
- s->qemu_aio_count--;
qemu_aio_release(acb);
return NULL;
}
--
1.8.1.4
- Re: [Qemu-devel] [PATCH v2 05/17] aio: stop using .io_flush(), (continued)
- [Qemu-devel] [PATCH v2 04/17] tests: adjust test-thread-pool to new aio_poll() semantics, Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 13/17] block/ssh: drop return_true(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 03/17] tests: adjust test-aio to new aio_poll() semantics, Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 08/17] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 12/17] block/sheepdog: drop have_co_req() and aio_flush_request(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 16/17] tests: drop event_active_cb(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 11/17] block/rbd: drop qemu_rbd_aio_flush_cb(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 07/17] block/gluster: drop qemu_gluster_aio_flush_cb(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 17/17] aio: drop io_flush argument, Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 15/17] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/04/17
- [Qemu-devel] [PATCH v2 14/17] dataplane/virtio-blk: drop flush_true() and flush_io(), Stefan Hajnoczi, 2013/04/17
- Re: [Qemu-devel] [PATCH v2 00/17] aio: drop io_flush(), Paolo Bonzini, 2013/04/17