Commit 8a5bb1f1 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

qcow2-refcount: rename inc_refcounts() and make it public 



This is needed for the following patch, which will introduce refcounts
checking for qcow2 bitmaps.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20170628120530.31251-8-vsementsov@virtuozzo.com
[mreitz: s/inc_refcounts/qcow2_inc_refcounts_imrt/ in one more (new)
         place]
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 6bdc8b71

block/qcow2-refcount.c

+31 −28
Original line number Diff line number Diff line
@@ -1323,8 +1323,7 @@ static int realloc_refcount_array(BDRVQcow2State *s, void **array, 
 *

 * Modifies the number of errors in res.

 */

static int inc_refcounts(BlockDriverState *bs,

                         BdrvCheckResult *res,

int qcow2_inc_refcounts_imrt(BlockDriverState *bs, BdrvCheckResult *res,

                             void **refcount_table,

                             int64_t *refcount_table_size,

                             int64_t offset, int64_t size)
@@ -1420,7 +1419,8 @@ 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;

            ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,

            ret = qcow2_inc_refcounts_imrt(bs, res,

                                           refcount_table, refcount_table_size,

                                           l2_entry & ~511, nb_csectors * 512);

            if (ret < 0) {

                goto fail;
@@ -1454,7 +1454,8 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res, 
            }



            /* Mark cluster as used */

            ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,

            ret = qcow2_inc_refcounts_imrt(bs, res,

                                           refcount_table, refcount_table_size,

                                           offset, s->cluster_size);

            if (ret < 0) {

                goto fail;
@@ -1508,7 +1509,7 @@ static int check_refcounts_l1(BlockDriverState *bs, 
    l1_size2 = l1_size * sizeof(uint64_t);



    /* Mark L1 table as used */

    ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,

    ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, refcount_table_size,

                                   l1_table_offset, l1_size2);

    if (ret < 0) {

        goto fail;
@@ -1538,7 +1539,8 @@ static int check_refcounts_l1(BlockDriverState *bs, 
        if (l2_offset) {

            /* Mark L2 table as used */

            l2_offset &= L1E_OFFSET_MASK;

            ret = inc_refcounts(bs, res, refcount_table, refcount_table_size,

            ret = qcow2_inc_refcounts_imrt(bs, res,

                                           refcount_table, refcount_table_size,

                                           l2_offset, s->cluster_size);

            if (ret < 0) {

                goto fail;
@@ -1757,14 +1759,15 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res, 
                }



                res->corruptions_fixed++;

                ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

                ret = qcow2_inc_refcounts_imrt(bs, res,

                                               refcount_table, nb_clusters,

                                               offset, s->cluster_size);

                if (ret < 0) {

                    return ret;

                }

                /* No need to check whether the refcount is now greater than 1:

                 * This area was just allocated and zeroed, so it can only be

                 * exactly 1 after inc_refcounts() */

                 * exactly 1 after qcow2_inc_refcounts_imrt() */

                continue;



resize_fail:
@@ -1779,7 +1782,7 @@ resize_fail: 
        }



        if (offset != 0) {

            ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

            ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, nb_clusters,

                                           offset, s->cluster_size);

            if (ret < 0) {

                return ret;
@@ -1820,7 +1823,7 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, 
    }



    /* header */

    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

    ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, nb_clusters,

                                   0, s->cluster_size);

    if (ret < 0) {

        return ret;
@@ -1842,14 +1845,14 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, 
            return ret;

        }

    }

    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

    ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, nb_clusters,

                                   s->snapshots_offset, s->snapshots_size);

    if (ret < 0) {

        return ret;

    }



    /* refcount data */

    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

    ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, nb_clusters,

                                   s->refcount_table_offset,

                                   s->refcount_table_size * sizeof(uint64_t));

    if (ret < 0) {
@@ -1858,7 +1861,7 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, 


    /* encryption */

    if (s->crypto_header.length) {

        ret = inc_refcounts(bs, res, refcount_table, nb_clusters,

        ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table, nb_clusters,

                                       s->crypto_header.offset,

                                       s->crypto_header.length);

        if (ret < 0) {

block/qcow2.h

+4 −0
Original line number Diff line number Diff line
@@ -544,6 +544,10 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset, 
                                 int64_t size);

int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,

                                  int64_t size);

int qcow2_inc_refcounts_imrt(BlockDriverState *bs, BdrvCheckResult *res,

                             void **refcount_table,

                             int64_t *refcount_table_size,

                             int64_t offset, int64_t size);



int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order,

                                BlockDriverAmendStatusCB *status_cb,