From patchwork Wed Feb 6 12:31:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 218604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B45922C02B7 for ; Thu, 7 Feb 2013 00:34:48 +1100 (EST) Received: from localhost ([::1]:34147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34BM-0006Ln-4w for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2013 07:32:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34B9-0006JE-MJ for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:32:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U34B6-00054S-N1 for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:32:43 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43600 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34B6-00054E-DH for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:32:40 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id C45BD874326; Wed, 6 Feb 2013 13:32:39 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id DCB6587432A; Wed, 6 Feb 2013 13:31:19 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2013 13:31:44 +0100 Message-Id: <1360153926-9492-12-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360153926-9492-1-git-send-email-benoit@irqsave.net> References: <1360153926-9492-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V6 11/33] qcow2: Add qcow2_dedup_grow_table and use it. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- block/qcow2-dedup.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index de1b366..de6e3a3 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -38,6 +38,44 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs, bool write); /* + * Save the dedup table information into the header extensions + * + * @table_offset: the dedup table offset in the QCOW2 file + * @size: the size of the dedup table + * @ret: 0 on success, -errno on error + */ +static int qcow2_dedup_save_table_info(BlockDriverState *bs, + int64_t table_offset, int size) +{ + BDRVQcowState *s = bs->opaque; + s->dedup_table_offset = table_offset; + s->dedup_table_size = size; + return qcow2_update_header(bs); +} + +/* + * Grow the deduplication table + * + * @min_size: minimal size + * @exact_size: if true force to grow to the exact size + * @ret: 0 on success, -errno on error + */ +static int qcow2_dedup_grow_table(BlockDriverState *bs, + int min_size, + bool exact_size) +{ + BDRVQcowState *s = bs->opaque; + return qcow2_do_grow_table(bs, + min_size, + exact_size, + &s->dedup_table, + &s->dedup_table_offset, + &s->dedup_table_size, + qcow2_dedup_save_table_info, + "dedup"); +} + +/* * Prepare a buffer containing all the required data required to compute cluster * sized deduplication hashes. * If sector_num or nb_sectors are not cluster-aligned, missing data @@ -712,7 +750,11 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs, index_in_dedup_table = cluster_number / nb_hash_in_block; if (s->dedup_table_size <= index_in_dedup_table) { - return -ENOSPC; + ret = qcow2_dedup_grow_table(bs, index_in_dedup_table + 1, false); + } + + if (ret < 0) { + return ret; } /* if we must read and there is nothing to read return a null hash */