qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset()
This function doesn't need any changes to support L2 slices, but since it's now dealing with slices instead of full tables, the l2_table variable is renamed for clarity. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 0c5d4b9bf163aa3b49ec19cc512a50d83563f2ad.1517840877.git.berto@igalia.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
13bec229d8
commit
e4e7254829
|
@ -747,26 +747,26 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
|
||||||
{
|
{
|
||||||
BDRVQcow2State *s = bs->opaque;
|
BDRVQcow2State *s = bs->opaque;
|
||||||
int l2_index, ret;
|
int l2_index, ret;
|
||||||
uint64_t *l2_table;
|
uint64_t *l2_slice;
|
||||||
int64_t cluster_offset;
|
int64_t cluster_offset;
|
||||||
int nb_csectors;
|
int nb_csectors;
|
||||||
|
|
||||||
ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
|
ret = get_cluster_table(bs, offset, &l2_slice, &l2_index);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compression can't overwrite anything. Fail if the cluster was already
|
/* Compression can't overwrite anything. Fail if the cluster was already
|
||||||
* allocated. */
|
* allocated. */
|
||||||
cluster_offset = be64_to_cpu(l2_table[l2_index]);
|
cluster_offset = be64_to_cpu(l2_slice[l2_index]);
|
||||||
if (cluster_offset & L2E_OFFSET_MASK) {
|
if (cluster_offset & L2E_OFFSET_MASK) {
|
||||||
qcow2_cache_put(s->l2_table_cache, (void **) &l2_table);
|
qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
cluster_offset = qcow2_alloc_bytes(bs, compressed_size);
|
cluster_offset = qcow2_alloc_bytes(bs, compressed_size);
|
||||||
if (cluster_offset < 0) {
|
if (cluster_offset < 0) {
|
||||||
qcow2_cache_put(s->l2_table_cache, (void **) &l2_table);
|
qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -781,9 +781,9 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
|
||||||
/* compressed clusters never have the copied flag */
|
/* compressed clusters never have the copied flag */
|
||||||
|
|
||||||
BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED);
|
BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED);
|
||||||
qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
|
qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice);
|
||||||
l2_table[l2_index] = cpu_to_be64(cluster_offset);
|
l2_slice[l2_index] = cpu_to_be64(cluster_offset);
|
||||||
qcow2_cache_put(s->l2_table_cache, (void **) &l2_table);
|
qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
|
||||||
|
|
||||||
return cluster_offset;
|
return cluster_offset;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue