[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/17] block: Fix error path in bdrv_invalidate_cache
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 09/17] block: Fix error path in bdrv_invalidate_cache() |
Date: |
Wed, 20 Jan 2016 17:24:58 +0100 |
We can only clear BDRV_O_INCOMING if the caches were actually
invalidated.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block.c b/block.c
index 1a13716..6ac3191 100644
--- a/block.c
+++ b/block.c
@@ -3272,12 +3272,14 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error
**errp)
bdrv_invalidate_cache(bs->file->bs, &local_err);
}
if (local_err) {
+ bs->open_flags |= BDRV_O_INCOMING;
error_propagate(errp, local_err);
return;
}
ret = refresh_total_sectors(bs, bs->total_sectors);
if (ret < 0) {
+ bs->open_flags |= BDRV_O_INCOMING;
error_setg_errno(errp, -ret, "Could not refresh total sector count");
return;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/17] Block patches, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 03/17] qemu-img: Speed up comparing empty/zero images, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 02/17] block/raw-posix: avoid bogus fixup for cylinders on DASD disks, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 01/17] block: Fix .bdrv_open flags, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 07/17] qcow2: Write full header on image creation, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 08/17] block: Assert no write requests under BDRV_O_INCOMING, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 04/17] qemu-iotests: Reduce racy output in 028, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 09/17] block: Fix error path in bdrv_invalidate_cache(),
Kevin Wolf <=
- [Qemu-devel] [PULL 06/17] qcow2: Write feature table only for v3 images, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 10/17] block: Rename BDRV_O_INCOMING to BDRV_O_INACTIVE, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 13/17] qcow2: Fix BDRV_O_INACTIVE handling in qcow2_invalidate_cache(), Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 12/17] qcow2: Implement .bdrv_inactivate, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 15/17] vmdk: Create streamOptimized as version 3, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 14/17] qcow2: Make image inaccessible after failed qcow2_invalidate_cache(), Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 17/17] iotests: Test that throttle values ranges, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 16/17] blockdev: Error out on negative throttling option values, Kevin Wolf, 2016/01/20
- [Qemu-devel] [PULL 05/17] block: Clean up includes, Kevin Wolf, 2016/01/20