Patchwork qcow2: CHECK_OFLAG_COPIED is obsolete

login
register
mail settings
Submitter Max Reitz
Date Sept. 30, 2013, 7:21 a.m.
Message ID <1380525667-8703-1-git-send-email-mreitz@redhat.com>
Download mbox | patch
Permalink /patch/278929/
State New
Headers show

Comments

Max Reitz - Sept. 30, 2013, 7:21 a.m.
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 <mreitz@redhat.com>
---
 block/qcow2-refcount.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Kevin Wolf - Sept. 30, 2013, 8:07 a.m.
Am 30.09.2013 um 09:21 hat Max Reitz geschrieben:
> 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 <mreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Stefan Hajnoczi - Oct. 2, 2013, 9:40 a.m.
On Mon, Sep 30, 2013 at 09:21:07AM +0200, Max Reitz wrote:
> 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 <mreitz@redhat.com>
> ---
>  block/qcow2-refcount.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Patch

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index d2b7064..c0b4184 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1034,7 +1034,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 */
 };
 
@@ -1481,8 +1480,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;
     }