From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E30EC04AB3 for ; Mon, 27 May 2019 22:40:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4445720859 for ; Mon, 27 May 2019 22:40:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558996823; bh=LI+1NE8W6QnWQh+jNaxqjajm5NEEX9BIy8mk3cg+sxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l3vOkT52PIVWDtyFB09VRQpLUGlgvxQJv2fwpqiBUQTR3W+3xKSA47SG+QX6SvYyk Vt/TLmp4Dgh2MT5GSbn9dOQkkONxxvRy+ss0RnOZlfhCkn4LFTZ1q9tPn4m2qe7CoF fHChYSiEIv9mpp+xftTlQM9wWG82NUf+Q/4uJBl4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727621AbfE0WkW (ORCPT ); Mon, 27 May 2019 18:40:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:46114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727567AbfE0WkW (ORCPT ); Mon, 27 May 2019 18:40:22 -0400 Received: from quaco.ghostprotocols.net (179-240-171-7.3g.claro.net.br [179.240.171.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1C043208C3; Mon, 27 May 2019 22:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558996821; bh=LI+1NE8W6QnWQh+jNaxqjajm5NEEX9BIy8mk3cg+sxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxMDp8eBXqbsxnkmuDX6e41zlwS4Ab1IEVtVik3lvCjnGkgfUvhBWYLSvso9M5OBY SkaRNtfdYZ77E+8Z8CIfwSmciqq5QJzLoy8yzNpD/WHK5KvKGLQ6H+9EwVwDVFAaBe vL7MtmmRZZTTjA4G4WZU9wXz9jmCj16uRzV49Bsw= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Song Liu , Adrian Hunter , Alexander Shishkin , Andi Kleen , Peter Zijlstra , Stanislav Fomichev , Arnaldo Carvalho de Melo Subject: [PATCH 32/44] perf dso: Simplify dso_cache__read function Date: Mon, 27 May 2019 19:37:18 -0300 Message-Id: <20190527223730.11474-33-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190527223730.11474-1-acme@kernel.org> References: <20190527223730.11474-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa There's no need for the while loop now, also we can connect two (ret > 0) condition legs together. Signed-off-by: Jiri Olsa Acked-by: Song Liu Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Cc: Stanislav Fomichev Link: http://lkml.kernel.org/r/20190508132010.14512-4-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 7734f50a6912..1e6a045adb8c 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -823,25 +823,20 @@ static ssize_t dso_cache__read(struct dso *dso, struct machine *machine, u64 offset, u8 *data, ssize_t size) { + u64 cache_offset = offset & DSO__DATA_CACHE_MASK; struct dso_cache *cache; struct dso_cache *old; ssize_t ret; - do { - u64 cache_offset = offset & DSO__DATA_CACHE_MASK; - - cache = zalloc(sizeof(*cache) + DSO__DATA_CACHE_SIZE); - if (!cache) - return -ENOMEM; - - ret = file_read(dso, machine, cache_offset, cache->data); + cache = zalloc(sizeof(*cache) + DSO__DATA_CACHE_SIZE); + if (!cache) + return -ENOMEM; + ret = file_read(dso, machine, cache_offset, cache->data); + if (ret > 0) { cache->offset = cache_offset; cache->size = ret; - } while (0); - - if (ret > 0) { old = dso_cache__insert(dso, cache); if (old) { /* we lose the race */ -- 2.20.1