From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbbETGng (ORCPT ); Wed, 20 May 2015 02:43:36 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:51302 "EHLO lgemrelse7q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752039AbbETGnd (ORCPT ); Wed, 20 May 2015 02:43:33 -0400 X-Original-SENDERIP: 10.177.220.203 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Adrian Hunter Subject: [PATCH 3/4] perf tools: Get rid of dso__data_fd() from dso__data_size() Date: Wed, 20 May 2015 15:34:06 +0900 Message-Id: <1432103647-14017-3-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1432103647-14017-1-git-send-email-namhyung@kernel.org> References: <1432103647-14017-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Cc: Adrian Hunter Signed-off-by: Namhyung Kim --- 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 a3984beca723..21fae6908717 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -744,12 +744,6 @@ static int data_file_size(struct dso *dso, struct machine *machine) */ 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; -- 2.4.0