[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/15] sheepdog: clean up sd_aio_setup()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 11/15] sheepdog: clean up sd_aio_setup() |
Date: |
Tue, 15 Jan 2013 17:48:27 +0100 |
From: Liu Yuan <address@hidden>
The last two parameters of sd_aio_setup() are never used, so remove them.
Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/sheepdog.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 04661da..3e49bb8 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -427,12 +427,11 @@ static const AIOCBInfo sd_aiocb_info = {
};
static SheepdogAIOCB *sd_aio_setup(BlockDriverState *bs, QEMUIOVector *qiov,
- int64_t sector_num, int nb_sectors,
- BlockDriverCompletionFunc *cb, void *opaque)
+ int64_t sector_num, int nb_sectors)
{
SheepdogAIOCB *acb;
- acb = qemu_aio_get(&sd_aiocb_info, bs, cb, opaque);
+ acb = qemu_aio_get(&sd_aiocb_info, bs, NULL, NULL);
acb->qiov = qiov;
@@ -1672,7 +1671,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState
*bs, int64_t sector_num,
bs->total_sectors = sector_num + nb_sectors;
}
- acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors, NULL, NULL);
+ acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors);
acb->aio_done_func = sd_write_done;
acb->aiocb_type = AIOCB_WRITE_UDATA;
@@ -1693,7 +1692,7 @@ static coroutine_fn int sd_co_readv(BlockDriverState *bs,
int64_t sector_num,
SheepdogAIOCB *acb;
int ret;
- acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors, NULL, NULL);
+ acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors);
acb->aiocb_type = AIOCB_READ_UDATA;
acb->aio_done_func = sd_finish_aiocb;
@@ -1719,7 +1718,7 @@ static int coroutine_fn
sd_co_flush_to_disk(BlockDriverState *bs)
return 0;
}
- acb = sd_aio_setup(bs, NULL, 0, 0, NULL, NULL);
+ acb = sd_aio_setup(bs, NULL, 0, 0);
acb->aiocb_type = AIOCB_FLUSH_CACHE;
acb->aio_done_func = sd_finish_aiocb;
--
1.8.0.2
- [Qemu-devel] [PATCH 01/15] qcow2: Fix segfault on zero-length write, (continued)
- [Qemu-devel] [PATCH 01/15] qcow2: Fix segfault on zero-length write, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 05/15] raw: support discard on block devices, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 02/15] block: fix initialization in bdrv_io_limits_enable(), Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 04/15] raw-posix: remember whether discard failed, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 03/15] raw-posix: support discard on more filesystems, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 06/15] block: make discard asynchronous, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 07/15] ide: fix TRIM with empty range entry, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 08/15] ide: issue discard asynchronously but serialize the pieces, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 09/15] block: clear dirty bitmap when discarding, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 12/15] w32: Make qemu_vfree() accept NULL like the POSIX implementation, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 11/15] sheepdog: clean up sd_aio_setup(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 13/15] scsi-disk: qemu_vfree(NULL) is fine, simplify, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 14/15] win32-aio: Fix how win32_aio_process_completion() frees buffer, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 15/15] block: Fix how mirror_run() frees its buffer, Stefan Hajnoczi, 2013/01/15
- [Qemu-devel] [PATCH 10/15] sheepdog: multiplex the rw FD to flush cache, Stefan Hajnoczi, 2013/01/15
- Re: [Qemu-devel] [PULL 00/15] Block patches for QEMU 1.4, Anthony Liguori, 2013/01/15