From patchwork Tue Oct 31 22:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp61584vqx; Tue, 31 Oct 2023 15:34:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHS6VJILrCJJdfyu2h82BztVknZfDx/E8GVt9h6jpHHjL0G62aKcNZ3D7mviYyzQ9UQ8Pup X-Received: by 2002:a17:90b:1a8d:b0:27d:3968:8366 with SMTP id ng13-20020a17090b1a8d00b0027d39688366mr11215176pjb.8.1698791679750; Tue, 31 Oct 2023 15:34:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698791679; cv=none; d=google.com; s=arc-20160816; b=qgOSF+/IQMXNfpkp5EWTVk/WgX7im4+DUcgBSx39/nBXuhnW2UkHKByKO2HBZwk49V AvaBDX92ynlNJ6b7IaGqGEwqWdkesNYgDAuiH36UjDcAP7HqBJLpPINWlUriQjCZQaH+ czUIjTMVGMFDQWeiJ/WTBW1hvquZfFoGtIgEZtwfehWmAbGwGq/XU02EUyggP5eNO77Y n4dOXJY08YRr+7k/cOyvvEPtfcdqlx9vmtUOfciJwq4d1xOKm+X4onZ3pOOGklPl9kYS sSCXe/m/eTSGgUCDRzVXZMVX3PUfkf8gHmCIKUrdJRw0bYdqGuKGfssMkDSLN7yG3Lkl 15Kg== 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=9SvfihichicpiY+KLUjM9F/JDY5LWx4pGhSp5b+zIj4=; fh=p9qaSGjxjg7fXhZ2SPcVaCB443dWE9yY5/nXWowH5kM=; b=VjUot8q6VX9D42ch+qN6j64VMZYW3aD1xFJACbb5seJyD0VYsZDYOjkCovf1kt0cj7 tK+NfUAWnuQUWYV6u/CF05hYJoQ5spXHw1qjpNPOa8FJwX2t4sx4fIxnkZkjQiR6Y5fJ F9cyWI8Nd40BJTagh604+J2ISyYrd4E+Sj17vzaWcuK+jJW68NYtCmZKU6dPPngi1X+x 07RrmQyNA/UEUidCOzLy7LFeAkqBetBSjzW5QITlOxzZoqoBzDylN7beWjJ1wxBZlvF6 V0N4Ha76TeNSWV1zGwD76yGhrfdwh0L6yyeGudGKpQNtav0Vw/7869R3VQI7RW8rW/8h IqhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id e63-20020a17090a6fc500b0027ffcd44adasi1575863pjk.133.2023.10.31.15.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:34:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6A66381068D0; Tue, 31 Oct 2023 15:34:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376283AbjJaWed (ORCPT + 33 others); Tue, 31 Oct 2023 18:34:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346804AbjJaWeZ (ORCPT ); Tue, 31 Oct 2023 18:34:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39CEE101 for ; Tue, 31 Oct 2023 15:34:23 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1C42C433CA; Tue, 31 Oct 2023 22:34:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qxxJV-00EPkD-1D; Tue, 31 Oct 2023 18:34:21 -0400 Message-ID: <20231031223421.185413077@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 31 Oct 2023 18:33:33 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Ajay Kaher , Andrew Morton Subject: [PATCH v5 7/7] eventfs: Remove special processing of dput() of events directory References: <20231031223326.794680978@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, T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 31 Oct 2023 15:34:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781312184451548502 X-GMAIL-MSGID: 1781312184451548502 From: "Steven Rostedt (Google)" The top level events directory is no longer special with regards to how it should be delete. Remove the extra processing for it in eventfs_set_ei_status_free(). Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 827ca152cfbe..7cf8f5ebaae7 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -274,28 +274,11 @@ static void free_ei(struct eventfs_inode *ei) */ void eventfs_set_ei_status_free(struct tracefs_inode *ti, struct dentry *dentry) { - struct tracefs_inode *ti_parent; struct eventfs_inode *ei; int i; - /* The top level events directory may be freed by this */ - if (unlikely(ti->flags & TRACEFS_EVENT_TOP_INODE)) { - mutex_lock(&eventfs_mutex); - ei = ti->private; - /* Nothing should access this, but just in case! */ - ti->private = NULL; - mutex_unlock(&eventfs_mutex); - - free_ei(ei); - return; - } - mutex_lock(&eventfs_mutex); - ti_parent = get_tracefs(dentry->d_parent->d_inode); - if (!ti_parent || !(ti_parent->flags & TRACEFS_EVENT_INODE)) - goto out; - ei = dentry->d_fsdata; if (!ei) goto out; @@ -920,6 +903,8 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry inode->i_op = &eventfs_root_dir_inode_operations; inode->i_fop = &eventfs_file_operations; + dentry->d_fsdata = ei; + /* directory inodes start off with i_nlink == 2 (for "." entry) */ inc_nlink(inode); d_instantiate(dentry, inode);