Commit cc19f177 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Kevin Wolf
Browse files

block/replication: drop usage of bs->job 



We are going to remove bs->job pointer. Drop it's usage in replication
code. Additionally we have to return job pointer from some mirror APIs.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 835d689d

block/mirror.c

+22 −16
Original line number Diff line number Diff line
@@ -1482,7 +1482,8 @@ static BlockDriver bdrv_mirror_top = { 
    .bdrv_child_perm            = bdrv_mirror_top_child_perm,

};



static void mirror_start_job(const char *job_id, BlockDriverState *bs,

static BlockJob *mirror_start_job(

                             const char *job_id, BlockDriverState *bs,

                             int creation_flags, BlockDriverState *target,

                             const char *replaces, int64_t speed,

                             uint32_t granularity, int64_t buf_size,
@@ -1514,7 +1515,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 


    if (buf_size < 0) {

        error_setg(errp, "Invalid parameter 'buf-size'");

        return;

        return NULL;

    }



    if (buf_size == 0) {
@@ -1523,7 +1524,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 


    if (bs == target) {

        error_setg(errp, "Can't mirror node into itself");

        return;

        return NULL;

    }



    /* In the case of active commit, add dummy driver to provide consistent
@@ -1532,7 +1533,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 
    mirror_top_bs = bdrv_new_open_driver(&bdrv_mirror_top, filter_node_name,

                                         BDRV_O_RDWR, errp);

    if (mirror_top_bs == NULL) {

        return;

        return NULL;

    }

    if (!filter_node_name) {

        mirror_top_bs->implicit = true;
@@ -1554,7 +1555,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 
    if (local_err) {

        bdrv_unref(mirror_top_bs);

        error_propagate(errp, local_err);

        return;

        return NULL;

    }



    /* Make sure that the source is not resized while the job is running */
@@ -1662,7 +1663,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 


    trace_mirror_start(bs, s, opaque);

    job_start(&s->common.job);

    return;



    return &s->common;



fail:

    if (s) {
@@ -1684,6 +1686,8 @@ fail: 
    bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abort);



    bdrv_unref(mirror_top_bs);



    return NULL;

}



void mirror_start(const char *job_id, BlockDriverState *bs,
@@ -1712,7 +1716,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs, 
                     filter_node_name, true, copy_mode, errp);

}



void commit_active_start(const char *job_id, BlockDriverState *bs,

BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,

                              BlockDriverState *base, int creation_flags,

                              int64_t speed, BlockdevOnError on_error,

                              const char *filter_node_name,
@@ -1721,16 +1725,18 @@ void commit_active_start(const char *job_id, BlockDriverState *bs, 
{

    bool base_read_only;

    Error *local_err = NULL;

    BlockJob *ret;



    base_read_only = bdrv_is_read_only(base);



    if (base_read_only) {

        if (bdrv_reopen_set_read_only(base, false, errp) < 0) {

            return;

            return NULL;

        }

    }



    mirror_start_job(job_id, bs, creation_flags, base, NULL, speed, 0, 0,

    ret = mirror_start_job(

                     job_id, bs, creation_flags, base, NULL, speed, 0, 0,

                     MIRROR_LEAVE_BACKING_CHAIN,

                     on_error, on_error, true, cb, opaque,

                     &commit_active_job_driver, false, base, auto_complete,
@@ -1741,7 +1747,7 @@ void commit_active_start(const char *job_id, BlockDriverState *bs, 
        goto error_restore_flags;

    }



    return;

    return ret;



error_restore_flags:

    /* ignore error and errp for bdrv_reopen, because we want to propagate
@@ -1749,5 +1755,5 @@ error_restore_flags: 
    if (base_read_only) {

        bdrv_reopen_set_read_only(base, true, NULL);

    }

    return;

    return NULL;

}

block/replication.c

+12 −9
Original line number Diff line number Diff line
@@ -36,8 +36,10 @@ typedef struct BDRVReplicationState { 
    ReplicationMode mode;

    ReplicationStage stage;

    BdrvChild *active_disk;

    BlockJob *commit_job;

    BdrvChild *hidden_disk;

    BdrvChild *secondary_disk;

    BlockJob *backup_job;

    char *top_id;

    ReplicationState *rs;

    Error *blocker;
@@ -147,7 +149,7 @@ static void replication_close(BlockDriverState *bs) 
        replication_stop(s->rs, false, NULL);

    }

    if (s->stage == BLOCK_REPLICATION_FAILOVER) {

        job_cancel_sync(&s->active_disk->bs->job->job);

        job_cancel_sync(&s->commit_job->job);

    }



    if (s->mode == REPLICATION_MODE_SECONDARY) {
@@ -315,12 +317,12 @@ static void secondary_do_checkpoint(BDRVReplicationState *s, Error **errp) 
    Error *local_err = NULL;

    int ret;



    if (!s->secondary_disk->bs->job) {

    if (!s->backup_job) {

        error_setg(errp, "Backup job was cancelled unexpectedly");

        return;

    }



    backup_do_checkpoint(s->secondary_disk->bs->job, &local_err);

    backup_do_checkpoint(s->backup_job, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;
@@ -449,7 +451,6 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
    int64_t active_length, hidden_length, disk_length;

    AioContext *aio_context;

    Error *local_err = NULL;

    BlockJob *job;



    aio_context = bdrv_get_aio_context(bs);

    aio_context_acquire(aio_context);
@@ -540,7 +541,8 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
        bdrv_op_block_all(top_bs, s->blocker);

        bdrv_op_unblock(top_bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker);



        job = backup_job_create(NULL, s->secondary_disk->bs, s->hidden_disk->bs,

        s->backup_job = backup_job_create(

                                NULL, s->secondary_disk->bs, s->hidden_disk->bs,

                                0, MIRROR_SYNC_MODE_NONE, NULL, false,

                                BLOCKDEV_ON_ERROR_REPORT,

                                BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
@@ -551,7 +553,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
            aio_context_release(aio_context);

            return;

        }

        job_start(&job->job);

        job_start(&s->backup_job->job);

        break;

    default:

        aio_context_release(aio_context);
@@ -653,8 +655,8 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) 
         * before the BDS is closed, because we will access hidden

         * disk, secondary disk in backup_job_completed().

         */

        if (s->secondary_disk->bs->job) {

            job_cancel_sync(&s->secondary_disk->bs->job->job);

        if (s->backup_job) {

            job_cancel_sync(&s->backup_job->job);

        }



        if (!failover) {
@@ -665,7 +667,8 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) 
        }



        s->stage = BLOCK_REPLICATION_FAILOVER;

        commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs,

        s->commit_job = commit_active_start(

                            NULL, s->active_disk->bs, s->secondary_disk->bs,

                            JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,

                            NULL, replication_done, bs, true, errp);

        break;

include/block/block_int.h

+6 −6
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, 
 * @errp: Error object.

 *

 */

void commit_active_start(const char *job_id, BlockDriverState *bs,

BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,

                              BlockDriverState *base, int creation_flags,

                              int64_t speed, BlockdevOnError on_error,

                              const char *filter_node_name,