diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-09-11 11:46:11 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-09-20 17:46:01 +0200 |
| commit | afdaeb9ea06ea641ccc4226964b8e278af5e7685 (patch) | |
| tree | ca548ea5c809b8c5c5825294e367b02b159f6deb /block/replication.c | |
| parent | 5661a00d40a59c28796a59c9df55d03efe8c56fc (diff) | |
| download | qemu-afdaeb9ea06ea641ccc4226964b8e278af5e7685.zip qemu-afdaeb9ea06ea641ccc4226964b8e278af5e7685.tar.gz qemu-afdaeb9ea06ea641ccc4226964b8e278af5e7685.tar.bz2 | |
block: Mark bdrv_attach_child() GRAPH_WRLOCK
Instead of taking the writer lock internally, require callers to already
hold it when calling bdrv_attach_child_common(). These callers will
typically already hold the graph lock once the locking work is
completed, which means that they can't call functions that take it
internally.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230911094620.45040-13-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/replication.c')
| -rw-r--r-- | block/replication.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/replication.c b/block/replication.c index ea4bf1a..eec9819 100644 --- a/block/replication.c +++ b/block/replication.c @@ -542,12 +542,15 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, return; } + bdrv_graph_wrlock(bs); + bdrv_ref(hidden_disk->bs); s->hidden_disk = bdrv_attach_child(bs, hidden_disk->bs, "hidden disk", &child_of_bds, BDRV_CHILD_DATA, &local_err); if (local_err) { error_propagate(errp, local_err); + bdrv_graph_wrunlock(); aio_context_release(aio_context); return; } @@ -558,10 +561,13 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, BDRV_CHILD_DATA, &local_err); if (local_err) { error_propagate(errp, local_err); + bdrv_graph_wrunlock(); aio_context_release(aio_context); return; } + bdrv_graph_wrunlock(); + /* start backup job now */ error_setg(&s->blocker, "Block device is in use by internal backup job"); |