From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Benoît Canet" <benoit.canet@nodalink.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Max Reitz" <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v8 09/17] qcow2: Let inc_refcounts() return -errno
Date: Wed, 22 Oct 2014 14:09:35 +0200 [thread overview]
Message-ID: <1413979783-1549-10-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1413979783-1549-1-git-send-email-mreitz@redhat.com>
As of a future patch, inc_refcounts() will have to throw errors which
are generally signaled by returning -errno. Therefore, let it return an
integer which is either 0 for success or -errno and handle the -errno
case in all callers.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2-refcount.c | 91 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 60 insertions(+), 31 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 59fb400..6001c85 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1081,17 +1081,18 @@ fail:
*
* Modifies the number of errors in res.
*/
-static void inc_refcounts(BlockDriverState *bs,
- BdrvCheckResult *res,
- uint16_t *refcount_table,
- int64_t refcount_table_size,
- int64_t offset, int64_t size)
+static int inc_refcounts(BlockDriverState *bs,
+ BdrvCheckResult *res,
+ uint16_t *refcount_table,
+ int64_t refcount_table_size,
+ int64_t offset, int64_t size)
{
BDRVQcowState *s = bs->opaque;
uint64_t start, last, cluster_offset, k;
- if (size <= 0)
- return;
+ if (size <= 0) {
+ return 0;
+ }
start = start_of_cluster(s, offset);
last = start_of_cluster(s, offset + size - 1);
@@ -1111,6 +1112,8 @@ static void inc_refcounts(BlockDriverState *bs,
}
}
}
+
+ return 0;
}
/* Flags for check_refcounts_l1() and check_refcounts_l2() */
@@ -1165,8 +1168,11 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
nb_csectors = ((l2_entry >> s->csize_shift) &
s->csize_mask) + 1;
l2_entry &= s->cluster_offset_mask;
- inc_refcounts(bs, res, refcount_table, refcount_table_size,
- l2_entry & ~511, nb_csectors * 512);
+ ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,
+ l2_entry & ~511, nb_csectors * 512);
+ if (ret < 0) {
+ goto fail;
+ }
if (flags & CHECK_FRAG_INFO) {
res->bfi.allocated_clusters++;
@@ -1201,8 +1207,11 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
}
/* Mark cluster as used */
- inc_refcounts(bs, res, refcount_table,refcount_table_size,
- offset, s->cluster_size);
+ ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,
+ offset, s->cluster_size);
+ if (ret < 0) {
+ goto fail;
+ }
/* Correct offsets are cluster aligned */
if (offset_into_cluster(s, offset)) {
@@ -1245,19 +1254,20 @@ static int check_refcounts_l1(BlockDriverState *bs,
int flags)
{
BDRVQcowState *s = bs->opaque;
- uint64_t *l1_table, l2_offset, l1_size2;
+ uint64_t *l1_table = NULL, l2_offset, l1_size2;
int i, ret;
l1_size2 = l1_size * sizeof(uint64_t);
/* Mark L1 table as used */
- inc_refcounts(bs, res, refcount_table, refcount_table_size,
- l1_table_offset, l1_size2);
+ ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,
+ l1_table_offset, l1_size2);
+ if (ret < 0) {
+ goto fail;
+ }
/* Read L1 table entries from disk */
- if (l1_size2 == 0) {
- l1_table = NULL;
- } else {
+ if (l1_size2 > 0) {
l1_table = g_try_malloc(l1_size2);
if (l1_table == NULL) {
ret = -ENOMEM;
@@ -1280,8 +1290,11 @@ static int check_refcounts_l1(BlockDriverState *bs,
if (l2_offset) {
/* Mark L2 table as used */
l2_offset &= L1E_OFFSET_MASK;
- inc_refcounts(bs, res, refcount_table, refcount_table_size,
- l2_offset, s->cluster_size);
+ ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,
+ l2_offset, s->cluster_size);
+ if (ret < 0) {
+ goto fail;
+ }
/* L2 tables are cluster aligned */
if (offset_into_cluster(s, l2_offset)) {
@@ -1550,6 +1563,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
{
BDRVQcowState *s = bs->opaque;
int64_t i;
+ int ret;
for(i = 0; i < s->refcount_table_size; i++) {
uint64_t offset, cluster;
@@ -1572,8 +1586,11 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
}
if (offset != 0) {
- inc_refcounts(bs, res, *refcount_table, *nb_clusters,
- offset, s->cluster_size);
+ ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ offset, s->cluster_size);
+ if (ret < 0) {
+ return ret;
+ }
if ((*refcount_table)[cluster] != 1) {
fprintf(stderr, "%s refcount block %" PRId64
" refcount=%d\n",
@@ -1602,8 +1619,11 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
sizeof(**refcount_table));
}
(*refcount_table)[cluster]--;
- inc_refcounts(bs, res, *refcount_table, *nb_clusters,
- new_offset, s->cluster_size);
+ ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ new_offset, s->cluster_size);
+ if (ret < 0) {
+ return ret;
+ }
res->corruptions_fixed++;
} else {
@@ -1635,8 +1655,11 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
}
/* header */
- inc_refcounts(bs, res, *refcount_table, *nb_clusters,
- 0, s->cluster_size);
+ ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ 0, s->cluster_size);
+ if (ret < 0) {
+ return ret;
+ }
/* current L1 table */
ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
@@ -1649,18 +1672,24 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
for (i = 0; i < s->nb_snapshots; i++) {
sn = s->snapshots + i;
ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
- sn->l1_table_offset, sn->l1_size, 0);
+ sn->l1_table_offset, sn->l1_size, 0);
if (ret < 0) {
return ret;
}
}
- inc_refcounts(bs, res, *refcount_table, *nb_clusters,
- s->snapshots_offset, s->snapshots_size);
+ ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ s->snapshots_offset, s->snapshots_size);
+ if (ret < 0) {
+ return ret;
+ }
/* refcount data */
- inc_refcounts(bs, res, *refcount_table, *nb_clusters,
- s->refcount_table_offset,
- s->refcount_table_size * sizeof(uint64_t));
+ ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ s->refcount_table_offset,
+ s->refcount_table_size * sizeof(uint64_t));
+ if (ret < 0) {
+ return ret;
+ }
return check_refblocks(bs, res, fix, refcount_table, nb_clusters);
}
--
1.9.3
next prev parent reply other threads:[~2014-10-22 12:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-22 12:09 [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 01/17] block: Add qemu_{, try_}blockalign0() Max Reitz
2014-10-22 14:02 ` Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 02/17] qcow2: Calculate refcount block entry count Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 03/17] qcow2: Fix leaks in dirty images Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 04/17] qcow2: Split qcow2_check_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 05/17] qcow2: Use sizeof(**refcount_table) Max Reitz
2014-10-22 14:38 ` Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 06/17] qcow2: Pull check_refblocks() up Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 07/17] qcow2: Use int64_t for in-memory reftable size Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 08/17] qcow2: Split fail code in L1 and L2 checks Max Reitz
2014-10-22 12:09 ` Max Reitz [this message]
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 10/17] qcow2: Let inc_refcounts() resize the reftable Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 11/17] qcow2: Reuse refcount table in calculate_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 12/17] qcow2: Fix refcount blocks beyond image end Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 13/17] qcow2: Do not perform potentially damaging repairs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 14/17] qcow2: Rebuild refcount structure during check Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 15/17] qcow2: Clean up after refcount rebuild Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 16/17] iotests: Fix test outputs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 17/17] iotests: Add test for potentially damaging repairs Max Reitz
2014-10-22 13:18 ` [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing 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=1413979783-1549-10-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=benoit.canet@nodalink.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).