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=-12.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS 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 099D2C43381 for ; Thu, 21 Feb 2019 09:42:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CADF620880 for ; Thu, 21 Feb 2019 09:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550742119; bh=2JoNYyIUNXlGyFjqVeOvwafmSSQ0GVx0Kty4okAt/bQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vdrGM9NP2ptWJDtkPRxUewAceFCH1H23VdYJjmBD7aRD2EUfBLusEEiYjRLyX1m/e UdBmmBgwKSDwPX0Y6HucFf0K+wRTJ7jg0OKwRA1hFIxTOZcfTct0Z8pAQWyDhcK2cC Qln4IQ56PdWoP9kfcUuzMuxPzQrLX4sX8fVniZU0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727528AbfBUJl6 (ORCPT ); Thu, 21 Feb 2019 04:41:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56440 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727440AbfBUJlz (ORCPT ); Thu, 21 Feb 2019 04:41:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E532307D84C; Thu, 21 Feb 2019 09:41:55 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D8E060BE6; Thu, 21 Feb 2019 09:41:53 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Adrian Hunter , Andi Kleen , Stephane Eranian , Alexey Budankov Subject: [PATCH 03/17] perf data: Make check_backup work over directories Date: Thu, 21 Feb 2019 10:41:31 +0100 Message-Id: <20190221094145.9151-4-jolsa@kernel.org> In-Reply-To: <20190221094145.9151-1-jolsa@kernel.org> References: <20190221094145.9151-1-jolsa@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 21 Feb 2019 09:41:55 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changing check_backup to call rm_rf instead of unlink to work over directory paths. Also moving the call earlier in the code, before we fork for file/dir, so it can backup also directory data. Link: http://lkml.kernel.org/n/tip-j4lwm20en1yk1hsaqb8zpxkr@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/data.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index e16d06ed1100..0a3051cc0ea0 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -37,12 +37,15 @@ static int check_backup(struct perf_data *data) { struct stat st; + if (perf_data__is_read(data)) + return 0; + if (!stat(data->path, &st) && st.st_size) { /* TODO check errors properly */ char oldname[PATH_MAX]; snprintf(oldname, sizeof(oldname), "%s.old", data->path); - unlink(oldname); + rm_rf(oldname); rename(data->path, oldname); } @@ -95,9 +98,6 @@ static int open_file_write(struct perf_data *data) int fd; char sbuf[STRERR_BUFSIZE]; - if (check_backup(data)) - return -1; - fd = open(data->file.path, O_CREAT|O_RDWR|O_TRUNC|O_CLOEXEC, S_IRUSR|S_IWUSR); @@ -141,6 +141,9 @@ int perf_data__open(struct perf_data *data) if (!data->path) data->path = "perf.data"; + if (check_backup(data)) + return -1; + return open_file_dup(data); } -- 2.17.2