diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-09-11 11:46:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-09-20 17:46:01 +0200 |
| commit | 32a8aba37eaae54d3a0a7ae5e93e3e157525660a (patch) | |
| tree | c310d966906d71c635c89425f2e1f314dfafdba9 /block/blklogwrites.c | |
| parent | ede01e4635050a395eacd57b7d7fbea8ea208704 (diff) | |
| download | qemu-32a8aba37eaae54d3a0a7ae5e93e3e157525660a.zip qemu-32a8aba37eaae54d3a0a7ae5e93e3e157525660a.tar.gz qemu-32a8aba37eaae54d3a0a7ae5e93e3e157525660a.tar.bz2 | |
block: Mark bdrv_unref_child() GRAPH_WRLOCK
Instead of taking the writer lock internally, require callers to already
hold it when calling bdrv_unref_child(). 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-21-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/blklogwrites.c')
| -rw-r--r-- | block/blklogwrites.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 3ea7141..a0d7072 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -251,7 +251,9 @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags, ret = 0; fail_log: if (ret < 0) { + bdrv_graph_wrlock(NULL); bdrv_unref_child(bs, s->log_file); + bdrv_graph_wrunlock(); s->log_file = NULL; } fail: @@ -263,8 +265,10 @@ static void blk_log_writes_close(BlockDriverState *bs) { BDRVBlkLogWritesState *s = bs->opaque; + bdrv_graph_wrlock(NULL); bdrv_unref_child(bs, s->log_file); s->log_file = NULL; + bdrv_graph_wrunlock(); } static int64_t coroutine_fn GRAPH_RDLOCK |