Message ID | 1459965434-21531-8-git-send-email-mreitz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Am 06.04.2016 um 19:57 hat Max Reitz geschrieben: > 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 <mreitz@redhat.com> > Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/block.c b/block.c index 355c4be..963abcc 100644 --- a/block.c +++ b/block.c @@ -74,8 +74,6 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, /* 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) { @@ -2106,6 +2104,7 @@ static void bdrv_close(BlockDriverState *bs) BdrvAioNotifier *ban, *ban_next; assert(!bs->job); + assert(!bs->refcnt); bdrv_drained_begin(bs); /* complete I/O */ bdrv_flush(bs);