mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow2-refcount: improve style of check_refcounts_l2()

Browse Source 
- don't use same name for size in bytes and in entries
 - use g_autofree for l2_table
 - add whitespace
 - fix block comment style

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20210914122454.141075-2-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-09-14 15:24:45 +03:00 committed by Hanna Reitz
parent a1c62436a4
commit 786c22d9c2
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
block/qcow2-refcount.c
View File

@ -1601,23 +1601,22 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
int flags, BdrvCheckMode fix, bool active) int flags, BdrvCheckMode fix, bool active)
{ {
BDRVQcow2State *s = bs->opaque; BDRVQcow2State *s = bs->opaque;
uint64_t *l2_table, l2_entry; uint64_t l2_entry;
uint64_t next_contiguous_offset = 0; uint64_t next_contiguous_offset = 0;
int i, l2_size, nb_csectors, ret; int i, nb_csectors, ret;
size_t l2_size_bytes = s->l2_size * l2_entry_size(s);
g_autofree uint64_t *l2_table = g_malloc(l2_size_bytes);
/* Read L2 table from disk */ /* Read L2 table from disk */
l2_size = s->l2_size * l2_entry_size(s); ret = bdrv_pread(bs->file, l2_offset, l2_table, l2_size_bytes);
l2_table = g_malloc(l2_size);
ret = bdrv_pread(bs->file, l2_offset, l2_table, l2_size);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n"); fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
res->check_errors++; res->check_errors++;
goto fail; return ret;
} }
/* Do the actual checks */ /* Do the actual checks */
for(i = 0; i < s->l2_size; i++) { for (i = 0; i < s->l2_size; i++) {
l2_entry = get_l2_entry(s, l2_table, i); l2_entry = get_l2_entry(s, l2_table, i);
switch (qcow2_get_cluster_type(bs, l2_entry)) { switch (qcow2_get_cluster_type(bs, l2_entry)) {
@ -1647,14 +1646,15 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
l2_entry & QCOW2_COMPRESSED_SECTOR_MASK, l2_entry & QCOW2_COMPRESSED_SECTOR_MASK,
nb_csectors * QCOW2_COMPRESSED_SECTOR_SIZE); nb_csectors * QCOW2_COMPRESSED_SECTOR_SIZE);
if (ret < 0) { if (ret < 0) {
goto fail; return ret;
} }
if (flags & CHECK_FRAG_INFO) { if (flags & CHECK_FRAG_INFO) {
res->bfi.allocated_clusters++; res->bfi.allocated_clusters++;
res->bfi.compressed_clusters++; res->bfi.compressed_clusters++;
/* Compressed clusters are fragmented by nature. Since they /*
* Compressed clusters are fragmented by nature. Since they
* take up sub-sector space but we only have sector granularity * take up sub-sector space but we only have sector granularity
* I/O we need to re-read the same sectors even for adjacent * I/O we need to re-read the same sectors even for adjacent
* compressed clusters. * compressed clusters.
@ -1700,9 +1700,11 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "ERROR: Overlap check failed\n"); fprintf(stderr, "ERROR: Overlap check failed\n");
res->check_errors++; res->check_errors++;
/* Something is seriously wrong, so abort checking /*
* this L2 table */ * Something is seriously wrong, so abort checking
goto fail; * this L2 table.
*/
return ret;
} }
ret = bdrv_pwrite_sync(bs->file, l2e_offset, ret = bdrv_pwrite_sync(bs->file, l2e_offset,
@ -1712,13 +1714,17 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
fprintf(stderr, "ERROR: Failed to overwrite L2 " fprintf(stderr, "ERROR: Failed to overwrite L2 "
"table entry: %s\n", strerror(-ret)); "table entry: %s\n", strerror(-ret));
res->check_errors++; res->check_errors++;
/* Do not abort, continue checking the rest of this /*
* L2 table's entries */ * Do not abort, continue checking the rest of this
* L2 table's entries.
*/
} else { } else {
res->corruptions--; res->corruptions--;
res->corruptions_fixed++; res->corruptions_fixed++;
/* Skip marking the cluster as used /*
* (it is unused now) */ * Skip marking the cluster as used
* (it is unused now).
*/
continue; continue;
} }
} }
@ -1743,7 +1749,7 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
refcount_table_size, refcount_table_size,
offset, s->cluster_size); offset, s->cluster_size);
if (ret < 0) { if (ret < 0) {
goto fail; return ret;
} }
} }
break; break;
@ -1758,12 +1764,7 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
} }
} }
g_free(l2_table);
return 0; return 0;
fail:
g_free(l2_table);
return ret;
} }
/* /*