[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 28/43] block: Fix pending requests check in bdrv_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 28/43] block: Fix pending requests check in bdrv_append() |
Date: |
Mon, 27 Feb 2017 21:09:29 +0100 |
bdrv_append() cares about isolation of the node that it modifies, but
not about activity in some subtree below it. Instead of using the
recursive bdrv_requests_pending(), directly check bs->in_flight, which
considers only the node in question.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 6456917..7926c6c 100644
--- a/block.c
+++ b/block.c
@@ -2886,8 +2886,8 @@ static void change_parent_backing_link(BlockDriverState
*from,
*/
void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top)
{
- assert(!bdrv_requests_pending(bs_top));
- assert(!bdrv_requests_pending(bs_new));
+ assert(!atomic_read(&bs_top->in_flight));
+ assert(!atomic_read(&bs_new->in_flight));
bdrv_ref(bs_top);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 18/43] hw/block: Request permissions, (continued)
- [Qemu-devel] [PATCH v2 18/43] hw/block: Request permissions, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 20/43] blockjob: Add permissions to block_job_create(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 19/43] hw/block: Introduce share-rw qdev property, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 22/43] block: Include details on permission errors in message, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 21/43] block: Add BdrvChildRole.get_parent_desc(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 23/43] block: Add BdrvChildRole.stay_at_node, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 24/43] blockjob: Add permissions to block_job_add_bdrv(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 25/43] commit: Use real permissions in commit block job, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 26/43] commit: Use real permissions for HMP 'commit', Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 27/43] backup: Use real permissions in backup block job, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 28/43] block: Fix pending requests check in bdrv_append(),
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 29/43] block: BdrvChildRole.attach/detach() callbacks, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 30/43] block: Allow backing file links in change_parent_backing_link(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 31/43] mirror: Use real permissions in mirror/active commit block job, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 32/43] stream: Use real permissions in streaming block job, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 33/43] mirror: Add filter-node-name to blockdev-mirror, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 34/43] commit: Add filter-node-name to block-commit, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 35/43] hmp: Request permissions in qemu-io, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 36/43] migration/block: Use real permissions, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 37/43] nbd/server: Use real permissions for NBD exports, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 38/43] tests: Remove FIXME comments, Kevin Wolf, 2017/02/27