From patchwork Mon Oct 9 12:59:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9992949 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 A929160244 for ; Mon, 9 Oct 2017 12:59:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A9FE28543 for ; Mon, 9 Oct 2017 12:59:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F4EB28799; Mon, 9 Oct 2017 12:59:21 +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 1F5CE28543 for ; Mon, 9 Oct 2017 12:59:21 +0000 (UTC) Received: from localhost ([::1]:57749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1XeS-00013a-Cj for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Oct 2017 08:59:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1Xd1-0000xd-Gf for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1Xd0-0001wQ-GO for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:57:51 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1Xd0-0001vr-8t; Mon, 09 Oct 2017 08:57:50 -0400 Received: by mail-pf0-x242.google.com with SMTP id z11so10194689pfk.3; Mon, 09 Oct 2017 05:57:50 -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=rDgzsycOLvOFBDTIcjAlbOL166d1VnW+OrwxLBVnFuM=; b=PRenKElUmzMfr2ZXI+D9qMZnOjuHvYPj9Fz4QGLmtSy4BIgahv1ssyx3V3EG/la2Oo 7bnvdAwR5/oB5wPO3BPKfAdU1txs9scRemkxqSamrAEeGxXdXUIVGP+he3qOMrH1mTyt Zuv3Xs1WUjeKVniJnopR5yO/eDN0csFz25CCoUdjJgQZsqkq5FqmICTjptpth1hMmWdh 8aP0YHAvzw0zyBPBWaRwOyDE2D8JkQlM8IquTWdp8a1UOjyy1Nekvsys6EqQqSa+lN0+ +pRiubk0JszuyuFMxOkORjggYZxzDij7JbWPj0tpPWB1x5ZJmohZ0lO9zGxXgPNA8ZJm 9yRQ== 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=rDgzsycOLvOFBDTIcjAlbOL166d1VnW+OrwxLBVnFuM=; b=RcBrfWlLtXCDB1clMmA3R+XX9JQhdpEywRyzJjd5gc8GXTB/FxdK2aPuTc0Oe7jQcH k+1PLRUAKBz7QKKmEZN9hAMkKGSK3Pn2L5bCJ+ad8iSIVilCFPWPYPbaLwzHvci/yaS5 kt5l0n+eJpJFwak1Cl49cariPUzeH/HGd+OKMhZgAmpEhl0biERDmgS8p25pm1T/e3Xc Nj91bxaggoC4VQENF4Wvk+y1JoiA27KVrFEyjtm8WeG03mckJnjfL5Nc+j8yEABAHDoI ia/hXhGgimSaOJMnlDSYgqM7S0ZsmmmA3TuULX9MViE+dlcs5fwU0e3oentvPpdc8dec qMig== X-Gm-Message-State: AMCzsaXSYnUVke1HG1PaPxpTsuiXBLRKAXUsaPSBfKibZnzpr8n5c7al YFUsmrkco820EEpcUEWCqqpP2w== X-Google-Smtp-Source: AOwi7QB60/v0qrSpPSFw7IHjjJxet+HTGEFEjtXaFOXovPzytFaYXlU79Z6MoF57/UFtU5YwvloBMA== X-Received: by 10.101.93.65 with SMTP id e1mr9284104pgt.150.1507553869177; Mon, 09 Oct 2017 05:57:49 -0700 (PDT) Received: from localhost.localdomain ([27.251.197.195]) by smtp.gmail.com with ESMTPSA id d190sm14781283pgc.11.2017.10.09.05.57.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 05:57:48 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 9 Oct 2017 18:29:35 +0530 Message-Id: <20171009125940.24220-4-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171009125940.24220-1-ashijeetacharya@gmail.com> References: <20171009125940.24220-1-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v9 3/8] vmdk: Rename get_cluster_offset() to vmdk_get_cluster_offset() 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 get_cluster_offset() to vmdk_get_cluster_offset() and update name in all the callers accordingly. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 109c589b43..d4ea92bdcf 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1161,7 +1161,7 @@ static int vmdk_L2update(VmdkExtent *extent, VmdkMetaData *m_data, } /** - * get_cluster_offset + * vmdk_get_cluster_offset * * Look up cluster offset in extent file by sector number, and store in * @cluster_offset. @@ -1180,14 +1180,14 @@ static int vmdk_L2update(VmdkExtent *extent, VmdkMetaData *m_data, * VMDK_UNALLOC if cluster is not mapped and @allocate is false. * VMDK_ERROR if failed. */ -static int get_cluster_offset(BlockDriverState *bs, - VmdkExtent *extent, - VmdkMetaData *m_data, - uint64_t offset, - bool allocate, - uint64_t *cluster_offset, - uint64_t skip_start_bytes, - uint64_t skip_end_bytes) +static int vmdk_get_cluster_offset(BlockDriverState *bs, + VmdkExtent *extent, + VmdkMetaData *m_data, + uint64_t offset, + bool allocate, + uint64_t *cluster_offset, + uint64_t skip_start_bytes, + uint64_t skip_end_bytes) { unsigned int l1_index, l2_offset, l2_index; int min_index, i, j; @@ -1321,9 +1321,9 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, return 0; } qemu_co_mutex_lock(&s->lock); - ret = get_cluster_offset(bs, extent, NULL, - sector_num * 512, false, &offset, - 0, 0); + ret = vmdk_get_cluster_offset(bs, extent, NULL, + sector_num * 512, false, &offset, + 0, 0); qemu_co_mutex_unlock(&s->lock); index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); @@ -1514,8 +1514,8 @@ vmdk_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes, ret = -EIO; goto fail; } - ret = get_cluster_offset(bs, extent, NULL, - offset, false, &cluster_offset, 0, 0); + ret = vmdk_get_cluster_offset(bs, extent, NULL, + offset, false, &cluster_offset, 0, 0); offset_in_cluster = vmdk_find_offset_in_cluster(extent, offset); n_bytes = MIN(bytes, extent->cluster_sectors * BDRV_SECTOR_SIZE @@ -1601,10 +1601,10 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, n_bytes = MIN(bytes, extent->cluster_sectors * BDRV_SECTOR_SIZE - offset_in_cluster); - ret = get_cluster_offset(bs, extent, &m_data, offset, - !(extent->compressed || zeroed), - &cluster_offset, offset_in_cluster, - offset_in_cluster + n_bytes); + ret = vmdk_get_cluster_offset(bs, extent, &m_data, offset, + !(extent->compressed || zeroed), + &cluster_offset, offset_in_cluster, + offset_in_cluster + n_bytes); if (extent->compressed) { if (ret == VMDK_OK) { /* Refuse write to allocated cluster for streamOptimized */ @@ -1613,8 +1613,8 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, return -EIO; } else { /* allocate */ - ret = get_cluster_offset(bs, extent, &m_data, offset, - true, &cluster_offset, 0, 0); + ret = vmdk_get_cluster_offset(bs, extent, &m_data, offset, + true, &cluster_offset, 0, 0); } } if (ret == VMDK_ERROR) { @@ -2244,9 +2244,9 @@ static int vmdk_check(BlockDriverState *bs, BdrvCheckResult *result, ret = -EINVAL; break; } - ret = get_cluster_offset(bs, extent, NULL, - sector_num << BDRV_SECTOR_BITS, - false, &cluster_offset, 0, 0); + ret = vmdk_get_cluster_offset(bs, extent, NULL, + sector_num << BDRV_SECTOR_BITS, + false, &cluster_offset, 0, 0); if (ret == VMDK_ERROR) { fprintf(stderr, "ERROR: could not get cluster_offset for sector %"