summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorFiona Ebner <f.ebner@proxmox.com>2025-05-30 17:11:21 +0200
committerKevin Wolf <kwolf@redhat.com>2025-07-14 15:42:23 +0200
commit94371745d763755efde8442c40a2cd02571f2b5e (patch)
tree2f9b8807b24d933ec04540420de844e9d72febfb
parent04f4d9c555d194526126235d752c092017818d6b (diff)
downloadfocaccia-qemu-94371745d763755efde8442c40a2cd02571f2b5e.tar.gz
focaccia-qemu-94371745d763755efde8442c40a2cd02571f2b5e.zip
block: mark bdrv_drop_intermediate() as GRAPH_UNLOCKED
The function bdrv_drop_intermediate() calls bdrv_drained_begin(),
which must be called with the graph unlocked.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20250530151125.955508-45-f.ebner@proxmox.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--include/block/block-global-state.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index cb4d8bca22..d3dd951013 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -143,9 +143,10 @@ int bdrv_commit(BlockDriverState *bs);
 int GRAPH_RDLOCK bdrv_make_empty(BdrvChild *c, Error **errp);
 
 void bdrv_register(BlockDriver *bdrv);
-int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
-                           const char *backing_file_str,
-                           bool backing_mask_protocol);
+int GRAPH_UNLOCKED
+bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
+                       const char *backing_file_str,
+                       bool backing_mask_protocol);
 
 BlockDriverState * GRAPH_RDLOCK
 bdrv_find_overlay(BlockDriverState *active, BlockDriverState *bs);