Patchwork qcow2: Invalidate cache after failed read

login
register
mail settings
Submitter Kevin Wolf
Date Oct. 28, 2010, 2:23 p.m.
Message ID <1288275820-11267-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/69466/
State New
Headers show

Comments

Kevin Wolf - Oct. 28, 2010, 2:23 p.m.
The cache content may be destroyed after a failed read, better not use it any
more.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-cluster.c  |    1 +
 block/qcow2-refcount.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
Stefan Hajnoczi - Oct. 28, 2010, 3 p.m.
On Thu, Oct 28, 2010 at 3:23 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> The cache content may be destroyed after a failed read, better not use it any
> more.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/qcow2-cluster.c  |    1 +
>  block/qcow2-refcount.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Patch

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 4f7dc59..b040208 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -188,6 +188,7 @@  static int l2_load(BlockDriverState *bs, uint64_t l2_offset,
     ret = bdrv_pread(bs->file, l2_offset, *l2_table,
         s->l2_size * sizeof(uint64_t));
     if (ret < 0) {
+        qcow2_l2_cache_reset(bs);
         return ret;
     }
 
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 0efb676..a10453c 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -103,6 +103,7 @@  static int load_refcount_block(BlockDriverState *bs,
     ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache,
                      s->cluster_size);
     if (ret < 0) {
+        s->refcount_block_cache_offset = 0;
         return ret;
     }