[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 4/5] block: disable I/O limits at the beginning of bd
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 4/5] block: disable I/O limits at the beginning of bdrv_close() |
Date: |
Fri, 2 Oct 2015 14:50:57 +0200 |
From: Alberto Garcia <address@hidden>
Disabling I/O limits from a BDS also drains all pending throttled
requests, so it should be done at the beginning of bdrv_close() with
the rest of the bdrv_drain() calls before the BlockDriver is closed.
Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 6268e37..1f90b47 100644
--- a/block.c
+++ b/block.c
@@ -1907,6 +1907,12 @@ void bdrv_close(BlockDriverState *bs)
if (bs->job) {
block_job_cancel_sync(bs->job);
}
+
+ /* Disable I/O limits and drain all pending throttled requests */
+ if (bs->io_limits_enabled) {
+ bdrv_io_limits_disable(bs);
+ }
+
bdrv_drain(bs); /* complete I/O */
bdrv_flush(bs);
bdrv_drain(bs); /* in case flush left pending I/O */
@@ -1958,11 +1964,6 @@ void bdrv_close(BlockDriverState *bs)
blk_dev_change_media_cb(bs->blk, false);
}
- /*throttling disk I/O limits*/
- if (bs->io_limits_enabled) {
- bdrv_io_limits_disable(bs);
- }
-
QLIST_FOREACH_SAFE(ban, &bs->aio_notifiers, list, ban_next) {
g_free(ban);
}
--
1.8.3.1
- [Qemu-block] [PULL 0/5] Block layer patches, Kevin Wolf, 2015/10/08
- [Qemu-block] [PULL 5/5] block/raw-posix: Open file descriptor O_RDWR to work around glibc posix_fallocate emulation issue., Kevin Wolf, 2015/10/08
- [Qemu-block] [PULL 3/5] iotests: Fix test 128 for password-less sudo, Kevin Wolf, 2015/10/08
- [Qemu-block] [PULL 2/5] tests: Fix test 049 fallout from improved HMP error messages, Kevin Wolf, 2015/10/08
- Re: [Qemu-block] [Qemu-devel] [PULL 0/5] Block layer patches, Peter Maydell, 2015/10/08
- [Qemu-block] [PULL 1/5] raw-win32: Fix write request error handling, Kevin Wolf, 2015/10/08
- [Qemu-block] [PULL 4/5] block: disable I/O limits at the beginning of bdrv_close(),
Kevin Wolf <=