[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/17] block/gluster: drop qemu_gluster_aio_flush
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 07/17] block/gluster: drop qemu_gluster_aio_flush_cb() |
Date: |
Mon, 10 Jun 2013 14:26:03 +0200 |
Since .io_flush() is no longer called we do not need
qemu_gluster_aio_flush_cb() anymore. It turns out that qemu_aio_count
is unused now and can be dropped.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/gluster.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/block/gluster.c b/block/gluster.c
index 91acde2..7a69a12 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -32,7 +32,6 @@ typedef struct BDRVGlusterState {
struct glfs *glfs;
int fds[2];
struct glfs_fd *fd;
- int qemu_aio_count;
int event_reader_pos;
GlusterAIOCB *event_acb;
} BDRVGlusterState;
@@ -247,7 +246,6 @@ static void qemu_gluster_complete_aio(GlusterAIOCB *acb,
BDRVGlusterState *s)
ret = -EIO; /* Partial read/write - fail it */
}
- s->qemu_aio_count--;
qemu_aio_release(acb);
cb(opaque, ret);
if (finished) {
@@ -275,13 +273,6 @@ static void qemu_gluster_aio_event_reader(void *opaque)
} while (ret < 0 && errno == EINTR);
}
-static int qemu_gluster_aio_flush_cb(void *opaque)
-{
- BDRVGlusterState *s = opaque;
-
- return (s->qemu_aio_count > 0);
-}
-
/* TODO Convert to fine grained options */
static QemuOptsList runtime_opts = {
.name = "gluster",
@@ -348,7 +339,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict
*options,
}
fcntl(s->fds[GLUSTER_FD_READ], F_SETFL, O_NONBLOCK);
qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ],
- qemu_gluster_aio_event_reader, NULL, qemu_gluster_aio_flush_cb, s);
+ qemu_gluster_aio_event_reader, NULL, NULL, s);
out:
qemu_opts_del(opts);
@@ -445,7 +436,6 @@ static void gluster_finish_aiocb(struct glfs_fd *fd,
ssize_t ret, void *arg)
qemu_mutex_lock_iothread(); /* We are in gluster thread context */
acb->common.cb(acb->common.opaque, -EIO);
qemu_aio_release(acb);
- s->qemu_aio_count--;
close(s->fds[GLUSTER_FD_READ]);
close(s->fds[GLUSTER_FD_WRITE]);
qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL,
@@ -467,7 +457,6 @@ static BlockDriverAIOCB
*qemu_gluster_aio_rw(BlockDriverState *bs,
offset = sector_num * BDRV_SECTOR_SIZE;
size = nb_sectors * BDRV_SECTOR_SIZE;
- s->qemu_aio_count++;
acb = qemu_aio_get(&gluster_aiocb_info, bs, cb, opaque);
acb->size = size;
@@ -488,7 +477,6 @@ static BlockDriverAIOCB
*qemu_gluster_aio_rw(BlockDriverState *bs,
return &acb->common;
out:
- s->qemu_aio_count--;
qemu_aio_release(acb);
return NULL;
}
@@ -518,7 +506,6 @@ static BlockDriverAIOCB
*qemu_gluster_aio_flush(BlockDriverState *bs,
acb->size = 0;
acb->ret = 0;
acb->finished = NULL;
- s->qemu_aio_count++;
ret = glfs_fsync_async(s->fd, &gluster_finish_aiocb, acb);
if (ret < 0) {
@@ -527,7 +514,6 @@ static BlockDriverAIOCB
*qemu_gluster_aio_flush(BlockDriverState *bs,
return &acb->common;
out:
- s->qemu_aio_count--;
qemu_aio_release(acb);
return NULL;
}
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/17] aio: drop io_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 01/17] block: stop relying on io_flush() in bdrv_drain_all(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 03/17] tests: adjust test-aio to new aio_poll() semantics, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 02/17] dataplane/virtio-blk: check exit conditions before aio_poll(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 05/17] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 06/17] block/curl: drop curl_aio_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 07/17] block/gluster: drop qemu_gluster_aio_flush_cb(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 08/17] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 09/17] block/linux-aio: drop qemu_laio_completion_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 10/17] block/nbd: drop nbd_have_request(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 12/17] block/sheepdog: drop have_co_req() and aio_flush_request(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 11/17] block/rbd: drop qemu_rbd_aio_flush_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 15/17] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 04/17] tests: adjust test-thread-pool to new aio_poll() semantics, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 16/17] tests: drop event_active_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 17/17] aio: drop io_flush argument, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 13/17] block/ssh: drop return_true(), Stefan Hajnoczi, 2013/06/10