From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 2/3] qcow2: Free allocated L2 cluster on error
Date: Wed, 25 Sep 2013 16:37:19 +0200 [thread overview]
Message-ID: <1380119840-12672-3-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1380119840-12672-1-git-send-email-mreitz@redhat.com>
If an error occurs in l2_allocate, the allocated (but unused) L2 cluster
should be freed.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2-cluster.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index f6d47c9..1c3d3fc 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -269,6 +269,10 @@ fail:
qcow2_cache_put(bs, s->l2_table_cache, (void**) table);
}
s->l1_table[l1_index] = old_l2_offset;
+ if (l2_offset > 0) {
+ qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t),
+ QCOW2_DISCARD_ALWAYS);
+ }
return ret;
}
--
1.8.3.1
next prev parent reply other threads:[~2013-09-25 14:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 14:37 [Qemu-devel] [PATCH 0/3] qcow2: Small error path fixes for l2_allocate Max Reitz
2013-09-25 14:37 ` [Qemu-devel] [PATCH 1/3] qcow2: Don't put invalid L2 table into cache Max Reitz
2013-09-25 14:47 ` Benoît Canet
2013-09-25 14:37 ` Max Reitz [this message]
2013-09-25 14:50 ` [Qemu-devel] [PATCH 2/3] qcow2: Free allocated L2 cluster on error Benoît Canet
2013-09-27 14:54 ` Kevin Wolf
2013-09-30 9:48 ` Max Reitz
2013-09-30 11:24 ` Kevin Wolf
2013-09-25 14:37 ` [Qemu-devel] [PATCH 3/3] qcow2: Always use error path in l2_allocate Max Reitz
2013-09-25 14:56 ` Benoît Canet
2013-09-27 9:38 ` [Qemu-devel] [PATCH 0/3] qcow2: Small error path fixes for l2_allocate Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380119840-12672-3-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).