From patchwork Fri Jul 29 04:49:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Nakamura X-Patchwork-Id: 107339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A10DAB6F68 for ; Fri, 29 Jul 2011 15:25:37 +1000 (EST) Received: from localhost ([::1]:60623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf3P-00059k-5u for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2011 00:52:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1x-0002GW-TO for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf1w-0000SC-Qi for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:37 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:46817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1w-0000NN-Jj for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:36 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=lIQZxqwdZJR7zudTrHp++dw8tOiSpd7Sfhfl6JS9BEA=; b=WYU98NZ9Kynjdzff/a3vft9URwZh5DYA1VU8AV+XgQvmY4hNP+DaKevZWpDs2uEpjz YKE5WGW5ehQOEi8z2JNbKW/JtG4ZPVO7K5loqKD/cusjziqVxljDpEbYIIum7fHVOu5E nTXtw+Uiy0FQMWLBhbLS1IdMS1n2BtyWITGig= Received: by 10.42.145.69 with SMTP id e5mr555416icv.432.1311915036288; Thu, 28 Jul 2011 21:50:36 -0700 (PDT) Received: from localhost.localdomain (d72-39-252-38.home1.cgocable.net [72.39.252.38]) by mx.google.com with ESMTPS id v16sm1109424ibf.25.2011.07.28.21.50.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jul 2011 21:50:35 -0700 (PDT) From: Devin Nakamura To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2011 00:49:46 -0400 Message-Id: <1311914994-20482-17-git-send-email-devin122@gmail.com> X-Mailer: git-send-email 1.7.6.rc1 In-Reply-To: <1311914994-20482-1-git-send-email-devin122@gmail.com> References: <1311914994-20482-1-git-send-email-devin122@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, Devin Nakamura Subject: [Qemu-devel] [RFC 16/24] qcow2: add qcow2_drop_leaked_clusters() 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: Devin Nakamura --- block/qcow2-refcount.c | 34 ++++++++++++++++++++++++++++++++++ block/qcow2.h | 2 ++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 75f1f88..2f78a71 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1202,3 +1202,37 @@ fail: return ret; } + +int qcow2_drop_leaked_clusters(BlockDriverState *bs) { + BDRVQcowState *s = bs->opaque; + int64_t size; + int nb_clusters, refcount, i; + uint16_t *refcount_table; + BdrvCheckResult res; + int ret; + + ret = inc_refcount_table(bs, &res, &refcount_table); + if (ret) { + goto fail; + } + size = bdrv_getlength(bs->file); + nb_clusters = size_to_clusters(s, size); + + for(i = 0; i < nb_clusters; i++) { + refcount = get_refcount(bs, i); + refcount = refcount_table[i] - refcount; + if (refcount < 0) { //we only want to change leaked clusters + ret = update_cluster_refcount(bs, i , refcount); + if (ret) { + goto fail; + } + } + } + + ret = 0; + +fail: + qemu_free(refcount_table); + + return ret; +} diff --git a/block/qcow2.h b/block/qcow2.h index 6a0a21b..e9efb74 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -193,6 +193,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res); +int qcow2_drop_leaked_clusters(BlockDriverState *bs) ; + /* qcow2-cluster.c functions */ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size); void qcow2_l2_cache_reset(BlockDriverState *bs);