Commit 670df5e3 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Pass discard type to qcow2_discard_clusters() 



The function will be used internally instead of only being called for
guest discard requests.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 2d1fe187

block/qcow2-cluster.c

+4 −4
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) 
 * clusters.

 */

static int discard_single_l2(BlockDriverState *bs, uint64_t offset,

    unsigned int nb_clusters)

    unsigned int nb_clusters, enum qcow2_discard_type type)

{

    BDRVQcowState *s = bs->opaque;

    uint64_t *l2_table;
@@ -1367,7 +1367,7 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset, 
        l2_table[l2_index + i] = cpu_to_be64(0);



        /* Then decrease the refcount */

        qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);

        qcow2_free_any_clusters(bs, old_offset, 1, type);

    }



    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
@@ -1379,7 +1379,7 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset, 
}



int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,

    int nb_sectors)

    int nb_sectors, enum qcow2_discard_type type)

{

    BDRVQcowState *s = bs->opaque;

    uint64_t end_offset;
@@ -1402,7 +1402,7 @@ int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset, 


    /* Each L2 table is handled by its own loop iteration */

    while (nb_clusters > 0) {

        ret = discard_single_l2(bs, offset, nb_clusters);

        ret = discard_single_l2(bs, offset, nb_clusters, type);

        if (ret < 0) {

            goto fail;

        }

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ static coroutine_fn int qcow2_co_discard(BlockDriverState *bs, 


    qemu_co_mutex_lock(&s->lock);

    ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS,

        nb_sectors);

        nb_sectors, QCOW2_DISCARD_REQUEST);

    qemu_co_mutex_unlock(&s->lock);

    return ret;

}

block/qcow2.h

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, 


int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);

int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,

    int nb_sectors);

    int nb_sectors, enum qcow2_discard_type type);

int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors);



/* qcow2-snapshot.c functions */