From patchwork Mon Jun 5 07:52:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9765681 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 B230160364 for ; Mon, 5 Jun 2017 07:58:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A391A27480 for ; Mon, 5 Jun 2017 07:58:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9769827D4A; Mon, 5 Jun 2017 07:58:27 +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 160EF27480 for ; Mon, 5 Jun 2017 07:58:27 +0000 (UTC) Received: from localhost ([::1]:60151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHmuA-0008VI-5D for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Jun 2017 03:58:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHmql-0006Cz-Mw for qemu-devel@nongnu.org; Mon, 05 Jun 2017 03:54:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHmqk-0002fc-OA for qemu-devel@nongnu.org; Mon, 05 Jun 2017 03:54:55 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:34660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHmqk-0002eu-G0; Mon, 05 Jun 2017 03:54:54 -0400 Received: by mail-pg0-x244.google.com with SMTP id v14so5261656pgn.1; Mon, 05 Jun 2017 00:54:54 -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=wlzoG7oQRHBbI3gL8iwuPmGQOHTo9rMYaIJacXohg3U=; b=cPy1bR+YZsuqQ5C8FVYPeJqOzO+CM15b7GwUTFalwiiWt/I0cFwM3fxudFZ6wOyjdq 4xtPya9oeFFmAlrrIVNUaWeUrLSBpBnMx5PWyBhJi3YouKUYIhDHZ2OcjYs+7KPdu4BK oO7J82kU56n+RDfUMzk9K9ySJJ6Gf/B4+NpqyNcxvm8AtX+ZZ0T5KoERb9/SWiglhfmm 7uLsm3lzowwPf7NxUTK+k+ICnDYf4l2YoyfT2o8uzpkdJCwzGI5ydrwB0Em76IMQLpJH m8BtCzRuiqkjq1qndcEsYZ47DBsTHPMAofScss5C3NxHlL5OtIVRa/7IbGk24IMbrcUX i6Dw== 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=wlzoG7oQRHBbI3gL8iwuPmGQOHTo9rMYaIJacXohg3U=; b=TcBa2pP+07LXwtab9/jQIAYyLv+e/2sqTjB5jfuVF6/iPk338H1vP9QooYf1eileeP YDzoSwYTTw9PeucQvS7nuHK4rhM1+BjvnPD4ggmpZC/3B95BJjbcletDf73Skkztwv+v 8NG21CZtczB0Nxr4PeSzjbXxXGQhByZc5hGEH9K5mwbrg6p2Fab9j0Z8JYyZ0loUlfQN 1gULGYlOrLHTUi+ezWr8jVe7kYoxTRA5W/5l0s4+H4ZgxAb1yP0+S2gQjQk7a//EmZg+ LFWbEx9wmGEwW696qXGqno4OC0IJlbhO/Pa55qb9+UhJeJoVyne58RLyP6L2uHTr63t2 T3Nw== X-Gm-Message-State: AODbwcDD+l418du/z8LRrjxsjrTBkLKA3Ekkbi6bHYkajIR0GPH6mFpZ M5T/JE0E28lwcA== X-Received: by 10.99.55.68 with SMTP id g4mr20143467pgn.115.1496649293579; Mon, 05 Jun 2017 00:54:53 -0700 (PDT) Received: from linux.local ([47.247.14.139]) by smtp.gmail.com with ESMTPSA id j71sm11775537pge.63.2017.06.05.00.54.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Jun 2017 00:54:53 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 5 Jun 2017 13:22:47 +0530 Message-Id: <1496649172-26982-4-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::244 Subject: [Qemu-devel] [PATCH v6 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 73ae786..f403981 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1144,7 +1144,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. @@ -1163,14 +1163,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; @@ -1304,9 +1304,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); @@ -1497,8 +1497,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 @@ -1584,10 +1584,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 */ @@ -1596,8 +1596,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) { @@ -2229,9 +2229,9 @@ static int vmdk_check(BlockDriverState *bs, BdrvCheckResult *result, sector_num); 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 %"