[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 06/13] block: Use blk_remove_bs() in blk_delete()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 06/13] block: Use blk_remove_bs() in blk_delete() |
Date: |
Tue, 3 Mar 2015 15:13:04 -0500 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <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 755262d..76e6893 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -163,12 +163,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_hmp_drive_del() */
if (blk->name[0]) {
QTAILQ_REMOVE(&blk_backends, blk, link);
@@ -324,6 +319,8 @@ void blk_remove_bs(BlockBackend *blk)
return;
}
+ assert(blk->bs->blk == blk);
+
notifier_list_notify(&blk->remove_bs_notifiers, blk);
blk_update_root_state(blk);
--
2.1.0
- [Qemu-block] [PATCH v5 00/13] block: Rework bdrv_close_all(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 02/13] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 06/13] block: Use blk_remove_bs() in blk_delete(),
Max Reitz <=
- [Qemu-block] [PATCH v5 07/13] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 01/13] iotests: Move _filter_nbd into common.filter, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 03/13] iotests: Add test for eject under NBD server, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 05/13] block: Move BDS close notifiers into BB, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 08/13] block: Make bdrv_close() static, Max Reitz, 2015/03/03
- [Qemu-block] [PATCH v5 04/13] quorum: Fix close path, Max Reitz, 2015/03/03