[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/11] rbd: remove unused constants and fields
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/11] rbd: remove unused constants and fields |
Date: |
Tue, 14 Jul 2015 17:39:29 +0200 |
From: Josh Durgin <address@hidden>
RBDAIOCB.status was only used for cancel, which was removed in
7691e24dbebb46658e89b3f950fda6ec78bbb823.
RBDAIOCB.sector_num was never used.
RADOSCB.done and rcbid were never used.
RBD_FD* are obsolete since the pipe was removed in
e04fb07fd1676e9facd7f3f878c1bbe03bccd26b.
Signed-off-by: Josh Durgin <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/rbd.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index fbe87e0..50b5f6b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -74,25 +74,18 @@ typedef struct RBDAIOCB {
QEMUIOVector *qiov;
char *bounce;
RBDAIOCmd cmd;
- int64_t sector_num;
int error;
struct BDRVRBDState *s;
- int status;
} RBDAIOCB;
typedef struct RADOSCB {
- int rcbid;
RBDAIOCB *acb;
struct BDRVRBDState *s;
- int done;
int64_t size;
char *buf;
int64_t ret;
} RADOSCB;
-#define RBD_FD_READ 0
-#define RBD_FD_WRITE 1
-
typedef struct BDRVRBDState {
rados_t cluster;
rados_ioctx_t io_ctx;
@@ -405,7 +398,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
}
qemu_vfree(acb->bounce);
acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));
- acb->status = 0;
qemu_aio_unref(acb);
}
@@ -621,7 +613,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
acb->error = 0;
acb->s = s;
acb->bh = NULL;
- acb->status = -EINPROGRESS;
if (cmd == RBD_AIO_WRITE) {
qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
@@ -633,7 +624,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
size = nb_sectors * BDRV_SECTOR_SIZE;
rcb = g_new(RADOSCB, 1);
- rcb->done = 0;
rcb->acb = acb;
rcb->buf = buf;
rcb->s = acb->s;
--
1.8.3.1
- [Qemu-block] [PULL 00/11] Block layer patches for 2.4.0-rc1, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 02/11] nvme: properly report volatile write caches, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 03/11] block: Move bdrv_attach_child() calls up the call chain, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 01/11] nvme: implement the Flush command, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 04/11] block: Introduce bdrv_open_child(), Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 05/11] block: Introduce bdrv_unref_child(), Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 06/11] block: Reorder cleanups in bdrv_close(), Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 08/11] rbd: remove unused constants and fields,
Kevin Wolf <=
- [Qemu-block] [PULL 09/11] MAINTAINERS: update email address, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 07/11] block: Fix backing file child when modifying graph, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 10/11] rbd: make qemu's cache setting override any ceph setting, Kevin Wolf, 2015/07/14
- [Qemu-block] [PULL 11/11] rbd: fix ceph settings precedence, Kevin Wolf, 2015/07/14
- Re: [Qemu-block] [Qemu-devel] [PULL 00/11] Block layer patches for 2.4.0-rc1, Peter Maydell, 2015/07/14