From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481AbbE0QtI (ORCPT ); Wed, 27 May 2015 12:49:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38969 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753041AbbE0QtD (ORCPT ); Wed, 27 May 2015 12:49:03 -0400 Date: Wed, 27 May 2015 09:48:42 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: dsahern@gmail.com, hpa@zytor.com, a.p.zijlstra@chello.nl, jolsa@redhat.com, acme@redhat.com, mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org Reply-To: namhyung@kernel.org, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, hpa@zytor.com, jolsa@redhat.com, a.p.zijlstra@chello.nl In-Reply-To: <1432137821-10853-2-git-send-email-namhyung@kernel.org> References: <1432137821-10853-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Get rid of dso__data_fd() from dso__data_size() Git-Commit-ID: e840238d7c6afcde0f6402aac3a74723ee9c448f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e840238d7c6afcde0f6402aac3a74723ee9c448f Gitweb: http://git.kernel.org/tip/e840238d7c6afcde0f6402aac3a74723ee9c448f Author: Namhyung Kim AuthorDate: Thu, 21 May 2015 01:03:40 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 May 2015 12:21:44 -0300 perf tools: Get rid of dso__data_fd() from dso__data_size() It seems that the dso__data_fd() was needed to find a binary type since open in data_file_size() alone used to fail. But as it can open the dso fine now, the dso__data_fd() can go away. Signed-off-by: Namhyung Kim Acked-by: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1432137821-10853-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 516e0c2..e95e850 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -745,12 +745,6 @@ out: */ off_t dso__data_size(struct dso *dso, struct machine *machine) { - int fd; - - fd = dso__data_fd(dso, machine); - if (fd < 0) - return fd; - if (data_file_size(dso, machine)) return -1;