From patchwork Sat Sep 9 03:16:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp964078vqo; Fri, 8 Sep 2023 22:35:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELPMDb/BQ//nqeTzUyLlrZmlnDaUSZWn/MWRWwyc0ggidYBICCRs/Uc3NFqVyx4Zjfvk/r X-Received: by 2002:aca:1212:0:b0:3a3:ed41:5ab with SMTP id 18-20020aca1212000000b003a3ed4105abmr4994679ois.9.1694237757121; Fri, 08 Sep 2023 22:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694237757; cv=none; d=google.com; s=arc-20160816; b=fr3H4Sj5rGxBg1DlvFEfp0YVKYP767mElBRy6HNARjpi3oy38c7KlC5g39T1F9irFO EF2A8uggJQ+XbxiV7oHhaWC6uJcezfoV3ga2N3MTBUN4+V6skT/42QlctVzIXxJyksGR QPvtJINwJ3YAIcGv8+fL4FNaAYrNb+KRWoaxVt07UmOczSOK8QeHEYryHXOhMKyuzhJa DoRAN5AFO+yAsUzpoyHOLx6qNJTn81A/NYYrhwxMoDZBn0GSCoK9wOwcH6mDwWNkXW6/ +UUpOXUxr8H2rYkpCpLvdW14Xcl1Ke7j9JGhdJA3bjV+D1NGZd/xmK3VtnG1S4+lkHhA V/aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=NVUpJrIE/J3cvrwQXRlgE2Ke4O4I2EQehIxnnYwIfPg=; fh=YD2plINFzzQkeIFsZ95VaD7apA4QxoMdT5d/25lsi30=; b=j9n1svdQvYHVuteGk4qxcBHRZNSGiRJ415Zsn7vTM+q5c3rn/ipwRYesXuoZmDW7w3 kKL58qtH/zwwvSGD8d/f/ukpbgBIvedme7ED6e6DPqMpYO1ndWneTBsXw52Aa/avl5Ii kSQLLQkUacjIvTspSh4WF19diU2+lgM4F01HGOMYQHUpDxJubzmaeP6ZztiQVKMy47fg afNhG6sdQvEJ3ovECfK/J8w8/zCtgaV2sTRoVCvrAkwAHAxWOvbNV0z1+y9w4pgcVeE2 +EgdBqLvOifpsRdYNzZHrTEyaI3blEYhvpX06Fx8s8/gifVmIBqpCH9RFsrpM6fySO9s w7GA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id by42-20020a056a0205aa00b005694ceaf704si2763413pgb.522.2023.09.08.22.35.48; Fri, 08 Sep 2023 22:35:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239972AbjIIDYb (ORCPT + 38 others); Fri, 8 Sep 2023 23:24:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234652AbjIIDXh (ORCPT ); Fri, 8 Sep 2023 23:23:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC25E1FE9 for ; Fri, 8 Sep 2023 20:23:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EB84C433AB; Sat, 9 Sep 2023 03:23:32 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZa-000Yjz-2n; Fri, 08 Sep 2023 23:23:50 -0400 Message-ID: <20230909032350.681044501@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:28 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [for-linus][PATCH 13/15] tracing: Remove unused trace_event_file dir field References: <20230909031615.047488015@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776537050613669137 X-GMAIL-MSGID: 1776537050613669137 From: "Steven Rostedt (Google)" Now that eventfs structure is used to create the events directory via the eventfs dynamically allocate code, the "dir" field of the trace_event_file structure is no longer used. Remove it. Link: https://lkml.kernel.org/r/20230908022001.580400115@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: Ajay Kaher Signed-off-by: Steven Rostedt (Google) --- include/linux/trace_events.h | 1 - kernel/trace/trace_events.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index eb5c3add939b..12f875e9e69a 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -650,7 +650,6 @@ struct trace_event_file { struct trace_event_call *event_call; struct event_filter __rcu *filter; struct eventfs_file *ef; - struct dentry *dir; struct trace_array *tr; struct trace_subsystem_dir *system; struct list_head triggers; diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 2af92177b765..065c63991858 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -992,19 +992,6 @@ static void remove_subsystem(struct trace_subsystem_dir *dir) static void remove_event_file_dir(struct trace_event_file *file) { - struct dentry *dir = file->dir; - struct dentry *child; - - if (dir) { - spin_lock(&dir->d_lock); /* probably unneeded */ - list_for_each_entry(child, &dir->d_subdirs, d_child) { - if (d_really_is_positive(child)) /* probably unneeded */ - d_inode(child)->i_private = NULL; - } - spin_unlock(&dir->d_lock); - - tracefs_remove(dir); - } eventfs_remove(file->ef); list_del(&file->list); remove_subsystem(file->system);