Patchwork [RFC,V4,28/30] qcow: Set dedup cluster block size to 64KB.

login
register
mail settings
Submitter Benoît Canet
Date Jan. 2, 2013, 4:16 p.m.
Message ID <1357143393-29832-29-git-send-email-benoit@irqsave.net>
Download mbox | patch
Permalink /patch/209082/
State New
Headers show

Comments

Benoît Canet - Jan. 2, 2013, 4:16 p.m.
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 block/qcow2-refcount.c |    4 ++--
 block/qcow2.c          |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 092546d..3f3efd8 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1061,7 +1061,7 @@  static int check_dedup_l2(BlockDriverState *bs, BdrvCheckResult *res,
     int i, l2_size;
 
     /* Read L2 table from disk */
-    l2_size = s->cluster_size;
+    l2_size = s->hash_block_size;
     l2_table = g_malloc(l2_size);
 
     if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size) {
@@ -1151,7 +1151,7 @@  static int check_refcounts_l1(BlockDriverState *bs,
             /* Mark L2 table as used */
             l2_offset &= L1E_OFFSET_MASK;
             inc_refcounts(bs, res, refcount_table, refcount_table_size,
-                l2_offset, s->l2_size << 3);
+                l2_offset, dedup ? s->hash_block_size : s->l2_size << 3);
 
             /* L2 tables are cluster aligned */
             if (l2_offset & (s->cluster_size - 1)) {
diff --git a/block/qcow2.c b/block/qcow2.c
index 16038db..f1e0f5f 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -432,6 +432,7 @@  static int qcow2_open(BlockDriverState *bs, int flags)
     s->cluster_sectors = 1 << (s->cluster_bits - 9);
     if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) {
         s->l2_bits = 16 - 3; /* 64 KB L2 */
+        s->hash_block_size = DEFAULT_CLUSTER_SIZE;
     } else {
         s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
     }