diff options
| author | Fam Zheng <famz@redhat.com> | 2017-04-21 20:27:04 +0800 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-04-24 09:13:44 +0200 |
| commit | 78bbd910bb2ff0d7e46d3744f57bcf1ec094fdcb (patch) | |
| tree | 584cc28101c67be4d517a721b0e93b80e90a156c /block | |
| parent | 51ccfa2dbf4f8ae2e480a7b9c326a7f375217150 (diff) | |
block: Make errp the last parameter of commit_active_start
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-9-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 4 | ||||
| -rw-r--r-- | block/replication.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/mirror.c b/block/mirror.c index 0c1a56c46c..9f5eb692fd 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1290,8 +1290,8 @@ void 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, - BlockCompletionFunc *cb, void *opaque, Error **errp, - bool auto_complete) + BlockCompletionFunc *cb, void *opaque, + bool auto_complete, Error **errp) { int orig_base_flags; Error *local_err = NULL; diff --git a/block/replication.c b/block/replication.c index bf3c395eb4..d300c15475 100644 --- a/block/replication.c +++ b/block/replication.c @@ -656,7 +656,7 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) s->replication_state = BLOCK_REPLICATION_FAILOVER; commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs, BLOCK_JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT, - NULL, replication_done, bs, errp, true); + NULL, replication_done, bs, true, errp); break; default: aio_context_release(aio_context); |