From 7cc09be75f219d045f060ffd60e6c29125a82a8f Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Mon, 4 Nov 2013 22:32:24 +0100 Subject: [PATCH 31/87] qcow2: CHECK_OFLAG_COPIED is obsolete RH-Author: Max Reitz Message-id: <1383604354-12743-34-git-send-email-mreitz@redhat.com> Patchwork-id: 55333 O-Subject: [RHEL-7.0 qemu-kvm PATCH 33/43] qcow2: CHECK_OFLAG_COPIED is obsolete Bugzilla: 1004347 RH-Acked-by: Kevin Wolf RH-Acked-by: Laszlo Ersek RH-Acked-by: Fam Zheng RH-Acked-by: Stefan Hajnoczi BZ: 1004347 CHECK_OFLAG_COPIED as a parameter to check_refcounts_l1 and check_refcounts_l2 is obselete now, since the OFLAG_COPIED consistency check is actually no longer performed by these functions (but by check_oflag_copied). Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi (cherry picked from commit db0749012b3d1cf655bddb3cc79052a0fd4dc97b) Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Signed-off-by: Miroslav Rezanina --- block/qcow2-refcount.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 927bdeb..2a589b8 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1016,7 +1016,6 @@ static void inc_refcounts(BlockDriverState *bs, /* Flags for check_refcounts_l1() and check_refcounts_l2() */ enum { - CHECK_OFLAG_COPIED = 0x1, /* check QCOW_OFLAG_COPIED matches refcount */ CHECK_FRAG_INFO = 0x2, /* update BlockFragInfo counters */ }; @@ -1463,8 +1462,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, /* current L1 table */ ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters, - s->l1_table_offset, s->l1_size, - CHECK_OFLAG_COPIED | CHECK_FRAG_INFO); + s->l1_table_offset, s->l1_size, CHECK_FRAG_INFO); if (ret < 0) { goto fail; } -- 1.7.1