[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/21] block: Use blk_remove_bs() in blk_delete()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 06/21] block: Use blk_remove_bs() in blk_delete() |
Date: |
Mon, 26 Jan 2015 14:27:33 -0500 |
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index b825d8e..a7264a0 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -164,12 +164,7 @@ static void blk_delete(BlockBackend *blk)
{
assert(!blk->refcnt);
assert(!blk->dev);
- if (blk->bs) {
- assert(blk->bs->blk == blk);
- blk->bs->blk = NULL;
- bdrv_unref(blk->bs);
- blk->bs = NULL;
- }
+ blk_remove_bs(blk);
/* Avoid double-remove after blk_hide_on_behalf_of_do_drive_del() */
if (blk->name[0]) {
QTAILQ_REMOVE(&blk_backends, blk, link);
@@ -333,6 +328,8 @@ void blk_remove_bs(BlockBackend *blk)
return;
}
+ assert(blk->bs->blk == blk);
+
blk_update_root_state(blk);
bdrv_unref(blk->bs);
--
2.1.0
- [Qemu-devel] [PATCH 00/20] block: Rework bdrv_close_all(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 06/21] block: Use blk_remove_bs() in blk_delete(),
Max Reitz <=
- [Qemu-devel] [PATCH 07/21] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 01/21] block: Guard remaining unsafe blk_bs() callers, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 08/21] block: Make bdrv_close() static, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 03/21] block: Add bdrv_close_all() notifiers, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 09/21] block: Add blk_name_taken(), Max Reitz, 2015/01/26