OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2-refcount: fix check_oflag_copied 

Increase corruptions_fixed only after successful fix.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190227131433.197063-2-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-02-27 16:14:29 +03:00 committed by Max Reitz
parent 19eb2d4e73
commit 7e3e736cbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/qcow2-refcount.c
View File

@ -1846,7 +1846,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
for (i = 0; i < s->l1_size; i++) { for (i = 0; i < s->l1_size; i++) {
uint64_t l1_entry = s->l1_table[i]; uint64_t l1_entry = s->l1_table[i];
uint64_t l2_offset = l1_entry & L1E_OFFSET_MASK; uint64_t l2_offset = l1_entry & L1E_OFFSET_MASK;
bool l2_dirty = false; int l2_dirty = 0;
if (!l2_offset) { if (!l2_offset) {
continue; continue;
@ -1912,8 +1912,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
l2_table[j] = cpu_to_be64(refcount == 1 l2_table[j] = cpu_to_be64(refcount == 1
? l2_entry | QCOW_OFLAG_COPIED ? l2_entry | QCOW_OFLAG_COPIED
: l2_entry & ~QCOW_OFLAG_COPIED); : l2_entry & ~QCOW_OFLAG_COPIED);
l2_dirty = true; l2_dirty++;
res->corruptions_fixed++;
} else { } else {
res->corruptions++; res->corruptions++;
} }
@ -1921,7 +1920,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
} }
} }
if (l2_dirty) { if (l2_dirty > 0) {
ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_ACTIVE_L2, ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_ACTIVE_L2,
l2_offset, s->cluster_size, l2_offset, s->cluster_size,
false); false);
@ -1940,6 +1939,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
res->check_errors++; res->check_errors++;
goto fail; goto fail;
} }
res->corruptions_fixed += l2_dirty;
} }
} }