From patchwork Mon Jun 5 07:52:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9765677 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 428D860364 for ; Mon, 5 Jun 2017 07:56:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3544627480 for ; Mon, 5 Jun 2017 07:56:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29D8427968; Mon, 5 Jun 2017 07:56:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C39E827480 for ; Mon, 5 Jun 2017 07:56:13 +0000 (UTC) Received: from localhost ([::1]:60134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHms0-0006Bc-RO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Jun 2017 03:56:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHmqh-00069G-Nr for qemu-devel@nongnu.org; Mon, 05 Jun 2017 03:54:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHmqe-0002Yp-Lb for qemu-devel@nongnu.org; Mon, 05 Jun 2017 03:54:51 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHmqe-0002Xj-GM; Mon, 05 Jun 2017 03:54:48 -0400 Received: by mail-pg0-x242.google.com with SMTP id v14so5261418pgn.1; Mon, 05 Jun 2017 00:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y0aLdU8eyizcBISOMqtI7Bfk7gF3uIFfg+flRUveKjg=; b=We6uKc/kPvHAECeGjbYNrpcekoWaZGw3dNmFv1XfLdYv8oGX8s50yuh43ragktxIP0 ncsemT673kIDtu+7dwk1TJBtqj+bfbq7z2+D8yW/91vpRDsHyYqtbFXo/CDUKfyOnEX/ 25+XMM06NcS6E1qAmv4cPTDPJIGO/wzfprdDqwmpa7JAtwuk0kJY6XjcyQAIK8haMjkT vEhsoBi7jr5bGZmsf3rPNI3qzltLTPKzfQO72haAzd2Sp8bq8NxUePn66DfgNGqogAzN dvJakfmv27qWPkRV3OZabbqHolnMCkrg043S5GjLA7bZc7RNiigRKbCUgYkeh+dtryiu jDSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y0aLdU8eyizcBISOMqtI7Bfk7gF3uIFfg+flRUveKjg=; b=osRdyI2ZE58i3zz2adDjXq9saoHQSUMnyhTYZsBJIoLVCHnZdHhTvAXdH4iWFn2+As G3rye/edBp6RJhc+ZLyhTCYMbrfkWNlylUCEGm8C1SuP2eSNYd71ZmglE1l7iovpDeHf CSQLLuZkaudzWseMBwx2Djl1xdW787G+F+sW6fZcSKeiEycVWFefgOjhLJBVZGTLWor6 B863OAYpN5mkUAJeHaaNDRs7nSNVdFKY3LDST9hUPJldFVApZKYIjN8pXzAuHLmNGTfT xoDxN5xKtvjCzpETU5Lnl0TDeOEz21TR/VPezrAdeUhmZrGaWuLrIzgvuTm64KIHnsHz NPOw== X-Gm-Message-State: AODbwcDPyDUVPBvn1I9D1mPN+nrbfviUBNRKcPUPwsUcNUlhsyK2dV12 WR8HiytuwW/yqQ== X-Received: by 10.99.247.83 with SMTP id f19mr20223429pgk.190.1496649287496; Mon, 05 Jun 2017 00:54:47 -0700 (PDT) Received: from linux.local ([47.247.14.139]) by smtp.gmail.com with ESMTPSA id j71sm11775537pge.63.2017.06.05.00.54.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Jun 2017 00:54:47 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 5 Jun 2017 13:22:46 +0530 Message-Id: <1496649172-26982-3-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1496649172-26982-1-git-send-email-ashijeetacharya@gmail.com> References: <1496649172-26982-1-git-send-email-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v6 2/8] vmdk: Rename get_whole_cluster() to vmdk_perform_cow() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, stefanha@gmail.com, qemu-devel@nongnu.org, mreitz@redhat.com, Ashijeet Acharya , jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Rename the existing function get_whole_cluster() to vmdk_perform_cow() as its sole purpose is to perform COW for the first and the last allocated clusters if needed. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 22be887..73ae786 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1028,8 +1028,8 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) } } -/** - * get_whole_cluster +/* + * vmdk_perform_cow * * Copy backing file's cluster that covers @sector_num, otherwise write zero, * to the cluster at @cluster_sector_num. @@ -1037,13 +1037,18 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) * If @skip_start_sector < @skip_end_sector, the relative range * [@skip_start_sector, @skip_end_sector) is not copied or written, and leave * it for call to write user data in the request. + * + * Returns: + * VMDK_OK: on success + * + * VMDK_ERROR: in error cases */ -static int get_whole_cluster(BlockDriverState *bs, - VmdkExtent *extent, - uint64_t cluster_offset, - uint64_t offset, - uint64_t skip_start_bytes, - uint64_t skip_end_bytes) +static int vmdk_perform_cow(BlockDriverState *bs, + VmdkExtent *extent, + uint64_t cluster_offset, + uint64_t offset, + uint64_t skip_start_bytes, + uint64_t skip_end_bytes) { int ret = VMDK_OK; int64_t cluster_bytes; @@ -1244,7 +1249,7 @@ static int get_cluster_offset(BlockDriverState *bs, * This problem may occur because of insufficient space on host disk * or inappropriate VM shutdown. */ - ret = get_whole_cluster(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, + ret = vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, offset, skip_start_bytes, skip_end_bytes); if (ret) { return ret;