[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/17] block: Fix dirty bitmap in bdrv_co_discard
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 10/17] block: Fix dirty bitmap in bdrv_co_discard |
Date: |
Thu, 2 Jul 2015 10:19:42 +0100 |
From: Fam Zheng <address@hidden>
Unsetting dirty globally with discard is not very correct. The discard may zero
out sectors (depending on can_write_zeroes_with_unmap), we should replicate
this change to destination side to make sure that the guest sees the same data.
Calling bdrv_reset_dirty also troubles mirror job because the hbitmap iterator
doesn't expect unsetting of bits after current position.
So let's do it the opposite way which fixes both problems: set the dirty bits
if we are to discard it.
Reported-by: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index ccf79c3..ad31822 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2412,8 +2412,6 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs,
int64_t sector_num,
return -EPERM;
}
- bdrv_reset_dirty(bs, sector_num, nb_sectors);
-
/* Do nothing if disabled. */
if (!(bs->open_flags & BDRV_O_UNMAP)) {
return 0;
@@ -2423,6 +2421,8 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs,
int64_t sector_num,
return 0;
}
+ bdrv_set_dirty(bs, sector_num, nb_sectors);
+
max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS);
while (nb_sectors > 0) {
int ret;
--
2.4.3
- [Qemu-devel] [PULL 00/17] Block patches, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 01/17] block/iscsi: add support for request timeouts, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 02/17] qcow2: Handle EAGAIN returned from update_refcount, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 03/17] qapi: Rename 'dirty-bitmap' mode to 'incremental', Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 04/17] blockdev: no need to drain+flush in hmp_drive_del, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 05/17] timer: Move NANOSECONDS_PER_SECONDS to timer.h, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 06/17] timer: Use a single definition of NSEC_PER_SEC for the whole codebase, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 07/17] block: Add bdrv_get_block_status_above, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 08/17] qmp: Add optional bool "unmap" to drive-mirror, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 09/17] mirror: Do zero write on target if sectors not allocated, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 10/17] block: Fix dirty bitmap in bdrv_co_discard,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 11/17] block: Remove bdrv_reset_dirty, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 12/17] qemu-iotests: Make block job methods common, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 13/17] qemu-iotests: Add test case for mirror with unmap, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 14/17] iotests: Use event_wait in wait_ready, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 15/17] block/iscsi: restore compatiblity with libiscsi 1.9.0, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 16/17] block/nfs: limit maximum readahead size to 1MB, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 17/17] block: remove redundant check before g_slist_find(), Stefan Hajnoczi, 2015/07/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2015/07/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2015/07/07