Commit f13d712b authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qed: Remove callback from qed_write_header() 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 7076309a

block/qed.c

+12 −20
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ int qed_write_header_sync(BDRVQEDState *s) 
 * This function only updates known header fields in-place and does not affect

 * extra data after the QED header.

 */

static void qed_write_header(BDRVQEDState *s, BlockCompletionFunc cb,

                             void *opaque)

static int qed_write_header(BDRVQEDState *s)

{

    /* We must write full sectors for O_DIRECT but cannot necessarily generate

     * the data following the header if an unrecognized compat feature is
@@ -137,7 +136,7 @@ static void qed_write_header(BDRVQEDState *s, BlockCompletionFunc cb, 
    ret = 0;

out:

    qemu_vfree(buf);

    cb(opaque, ret);

    return ret;

}



static uint64_t qed_max_image_size(uint32_t cluster_size, uint32_t table_size)
@@ -289,21 +288,6 @@ static void qed_unplug_allocating_write_reqs(BDRVQEDState *s) 
    }

}



static void qed_finish_clear_need_check(void *opaque, int ret)

{

    /* Do nothing */

}



static void qed_flush_after_clear_need_check(void *opaque, int ret)

{

    BDRVQEDState *s = opaque;



    bdrv_aio_flush(s->bs, qed_finish_clear_need_check, s);



    /* No need to wait until flush completes */

    qed_unplug_allocating_write_reqs(s);

}



static void qed_clear_need_check(void *opaque, int ret)

{

    BDRVQEDState *s = opaque;
@@ -314,7 +298,13 @@ static void qed_clear_need_check(void *opaque, int ret) 
    }



    s->header.features &= ~QED_F_NEED_CHECK;

    qed_write_header(s, qed_flush_after_clear_need_check, s);

    ret = qed_write_header(s);

    (void) ret;



    qed_unplug_allocating_write_reqs(s);



    ret = bdrv_flush(s->bs);

    (void) ret;

}



static void qed_need_check_timer_cb(void *opaque)
@@ -1179,6 +1169,7 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len) 
{

    BDRVQEDState *s = acb_to_s(acb);

    BlockCompletionFunc *cb;

    int ret;



    /* Cancel timer when the first allocating request comes in */

    if (QSIMPLEQ_EMPTY(&s->allocating_write_reqs)) {
@@ -1213,7 +1204,8 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len) 


    if (qed_should_set_need_check(s)) {

        s->header.features |= QED_F_NEED_CHECK;

        qed_write_header(s, cb, acb);

        ret = qed_write_header(s);

        cb(acb, ret);

    } else {

        cb(acb, 0);

    }