[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/21] quorum: Fix close path
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 02/21] quorum: Fix close path |
Date: |
Mon, 26 Jan 2015 14:27:29 -0500 |
bdrv_unref() can lead to bdrv_close(), which in turn will result in
bdrv_drain_all(). This function will later be called blk_drain_all() and
iterate only over the BlockBackends for which blk_is_inserted() holds
true; therefore, bdrv_is_inserted() and thus quorum_is_inserted() will
probably be called.
This patch makes quorum_is_inserted() aware of the fact that some
children may have been closed already.
Signed-off-by: Max Reitz <address@hidden>
---
block/quorum.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/quorum.c b/block/quorum.c
index 7811c4a..b249d75 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1005,6 +1005,7 @@ static void quorum_close(BlockDriverState *bs)
for (i = 0; i < s->num_children; i++) {
bdrv_unref(s->bs[i]);
+ s->bs[i] = NULL;
}
g_free(s->bs);
@@ -1070,7 +1071,7 @@ static int quorum_is_inserted(BlockDriverState *bs)
int i;
for (i = 0; i < s->num_children; i++) {
- if (!bdrv_is_inserted(s->bs[i])) {
+ if (s->bs[i] && !bdrv_is_inserted(s->bs[i])) {
return 0;
}
}
--
2.1.0
- Re: [Qemu-devel] [PATCH 04/21] block: Add bdrv_close_all() handlers, (continued)
Re: [Qemu-devel] [PATCH 04/21] block: Add bdrv_close_all() handlers, Eric Blake, 2015/01/28
[Qemu-devel] [PATCH 05/21] block: Remove per-BDS close notifiers, Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 10/21] block: Add blk_next_inserted(), Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 02/21] quorum: Fix close path,
Max Reitz <=
[Qemu-devel] [PATCH 14/21] blockdev: Remove blk_hide_on_behalf_of_do_drive_del(), Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 16/21] block: Move some bdrv_*_all() functions to BB, Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 12/21] block: Use BlockBackend more, Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 15/21] block: Make bdrv_drain_one() public, Max Reitz, 2015/01/26
[Qemu-devel] [PATCH 11/21] block: Add blk_commit_all() and blk_invalidate_cache_all(), Max Reitz, 2015/01/26