Commit 3dbf00e0 authored by Josh Durgin's avatar Josh Durgin Committed by Kevin Wolf
Browse files

rbd: remove unused constants and fields 



RBDAIOCB.status was only used for cancel, which was removed in
7691e24d.

RBDAIOCB.sector_num was never used.

RADOSCB.done and rcbid were never used.

RBD_FD* are obsolete since the pipe was removed in
e04fb07f.

Signed-off-by: default avatarJosh Durgin <jdurgin@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 80a1e130

block/rbd.c

+0 −10
Original line number Diff line number Diff line
@@ -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;