[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V7 06/32] qcow2: Make qcow2_update_cluster_refcount pu
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V7 06/32] qcow2: Make qcow2_update_cluster_refcount public. |
Date: |
Fri, 15 Mar 2013 15:49:20 +0100 |
Also add it a flush parameter.
Signed-off-by: Benoit Canet <address@hidden>
---
block/qcow2-refcount.c | 28 ++++++++++++++++++++--------
block/qcow2.h | 4 ++++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 55543ed..e12b58c 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -510,13 +510,15 @@ fail:
/*
* Increases or decreases the refcount of a given cluster by one.
* addend must be 1 or -1.
+ * flush must be true if flushing is needed
*
* If the return value is non-negative, it is the new refcount of the cluster.
* If it is negative, it is -errno and indicates an error.
*/
-static int update_cluster_refcount(BlockDriverState *bs,
- int64_t cluster_index,
- int addend)
+int qcow2_update_cluster_refcount(BlockDriverState *bs,
+ int64_t cluster_index,
+ int addend,
+ bool flush)
{
BDRVQcowState *s = bs->opaque;
int ret;
@@ -526,7 +528,9 @@ static int update_cluster_refcount(BlockDriverState *bs,
return ret;
}
- bdrv_flush(bs->file);
+ if (flush) {
+ bdrv_flush(bs->file);
+ }
return get_refcount(bs, cluster_index);
}
@@ -645,7 +649,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
if (free_in_cluster == 0)
s->free_byte_offset = 0;
if ((offset & (s->cluster_size - 1)) != 0)
- update_cluster_refcount(bs, offset >> s->cluster_bits, 1);
+ qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
+ true);
} else {
offset = qcow2_alloc_clusters(bs, s->cluster_size);
if (offset < 0) {
@@ -655,7 +660,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
if ((cluster_offset + s->cluster_size) == offset) {
/* we are lucky: contiguous data */
offset = s->free_byte_offset;
- update_cluster_refcount(bs, offset >> s->cluster_bits, 1);
+ qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
+ true);
s->free_byte_offset += size;
} else {
s->free_byte_offset = offset;
@@ -792,7 +798,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
} else {
uint64_t cluster_index = (offset & L2E_OFFSET_MASK) >>
s->cluster_bits;
if (addend != 0) {
- refcount = update_cluster_refcount(bs,
cluster_index, addend);
+ refcount = qcow2_update_cluster_refcount(bs,
+ cluster_index,
+ addend,
+ true);
} else {
refcount = get_refcount(bs, cluster_index);
}
@@ -824,7 +833,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
if (addend != 0) {
- refcount = update_cluster_refcount(bs, l2_offset >>
s->cluster_bits, addend);
+ refcount = qcow2_update_cluster_refcount(bs,
+ l2_offset >> s->cluster_bits,
+ addend,
+ true);
} else {
refcount = get_refcount(bs, l2_offset >> s->cluster_bits);
}
diff --git a/block/qcow2.h b/block/qcow2.h
index 6c45520..3dc9834 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -410,6 +410,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
BdrvCheckMode fix);
+int qcow2_update_cluster_refcount(BlockDriverState *bs,
+ int64_t cluster_index,
+ int addend,
+ bool flush);
/* qcow2-cluster.c functions */
int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size);
--
1.7.10.4
- [Qemu-devel] [RFC V7 00/32] QCOW2 deduplication core functionality, Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 02/32] qmp: Add DedupStatus enum., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 01/32] qcow2: Add deduplication to the qcow2 specification., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 03/32] qcow2: Add deduplication structures and fields., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 04/32] qcow2: Add qcow2_de dup_read_missing_and_concatenate, Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 05/32] qcow2: Create a way to link to l2 tables when deduplicating., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 06/32] qcow2: Make qcow2_update_cluster_refcount public.,
Benoît Canet <=
- [Qemu-devel] [RFC V7 09/32] qcow2: Do allocate on rewrite on the dedup case., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 07/32] qcow2: Add qcow2_dedup and related functions, Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 08/32] qcow2: Add qcow2_dedup_store_new_hashes., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 10/32] qcow2: Implement qcow2_compute_cluster_hash., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 12/32] qcow2: Makes qcow2_alloc_cluster_link_l2 mark to deduplicate clusters., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 11/32] qcow2: Add qcow2_dedup_grow_table and use it., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 13/32] qcow2: make the deduplication forget a cluster hash when a cluster is to dedupe, Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 14/32] qcow2: Create qcow2_is_cluster_to_dedup., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 16/32] qcow2: Extract qcow2_do_table_init., Benoît Canet, 2013/03/15
- [Qemu-devel] [RFC V7 15/32] qcow2: Load and save deduplication table header extension., Benoît Canet, 2013/03/15