[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 8/8] block: Assert !bs->refcnt in bdrv_close()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH 8/8] block: Assert !bs->refcnt in bdrv_close() |
Date: |
Tue, 10 Nov 2015 04:44:23 +0100 |
The only caller of bdrv_close() left is bdrv_delete(). We may as well
assert that, in a way (there are some things in bdrv_close() that make
more sense under that assumption, such as the call to
bdrv_release_all_dirty_bitmaps() which in turn assumes that no frozen
bitmaps are attached to the BDS).
In addition, being called only in bdrv_delete() means that we can drop
bdrv_close()'s forward declaration at the top of block.c.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block.c b/block.c
index f258c54..0abf80f 100644
--- a/block.c
+++ b/block.c
@@ -95,8 +95,6 @@ static void bdrv_release_all_dirty_bitmaps(BlockDriverState
*bs);
/* If non-zero, use only whitelisted block drivers */
static int use_bdrv_whitelist;
-static void bdrv_close(BlockDriverState *bs);
-
#ifdef _WIN32
static int is_windows_drive_prefix(const char *filename)
{
@@ -1872,6 +1870,7 @@ static void bdrv_close(BlockDriverState *bs)
BdrvAioNotifier *ban, *ban_next;
assert(!bs->job);
+ assert(!bs->refcnt);
/* Disable I/O limits and drain all pending throttled requests */
if (bs->throttle_state) {
--
2.6.2
- [Qemu-block] [PATCH 0/8] blockdev: (Nearly) free clean-up work, Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 1/8] qapi: Drop QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 2/8] block: Drop useless bdrv_new() calls, Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 3/8] block: Let bdrv_open_inherit() return the snapshot, Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 4/8] block: Drop BB name from bad option error, Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 5/8] block: Drop blk_new_with_bs(), Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 6/8] block: Drop bdrv_new_root(), Max Reitz, 2015/11/09
- [Qemu-block] [PATCH 8/8] block: Assert !bs->refcnt in bdrv_close(),
Max Reitz <=
- [Qemu-block] [PATCH 7/8] block: Make bdrv_open() return a BDS, Max Reitz, 2015/11/09