From patchwork Wed Nov 1 21:37:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160687 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp724376vqx; Wed, 1 Nov 2023 14:38:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDVycwLj8i4ni5eadP+aOpzBbQ5/1LiJnrB7OFsXUT18j9M1BKZ5VA/mJw/ybVFtGFVjjM X-Received: by 2002:a05:6358:7249:b0:169:845b:3420 with SMTP id i9-20020a056358724900b00169845b3420mr9426345rwa.25.1698874709372; Wed, 01 Nov 2023 14:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698874709; cv=none; d=google.com; s=arc-20160816; b=YESk2VYEPE3rW9B+xHAWdvIP9dUtH+vLlYooetfbzboHK9SrHKQ12i7LtxHTlUhsjv YEscwLyQyT7uQStGQypAp9NZgUj0NUrJQy3qTyL1lmLS1pieHGFwjau9voRmKWaFHf1c dAMgrkSI2gsWF+Oq3s7IDNPLuHAdPfQFqKsIj2WX5ayePssLENujGooklx72Tq01MdpH amPfrYnBml+uGWdOMRdC4ZMu+W4miUgwSPU+0sMKE58OiA+3fZl5pu5jc5Tjj98SMYTv 0dytHFpDBm/51o1Ks0tmqbLiPazkMJnXDEKdn7QnZuFKFbvzNccI/6UY7CJYr5IB/erU cOVw== 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=kj358H4RRqkM18wTs619Uzf4Bbl0q37uwWHc43qQLY4=; fh=YD2plINFzzQkeIFsZ95VaD7apA4QxoMdT5d/25lsi30=; b=crjH6pDEezeQq4XSvcdrRDshbFAjPD+Hxml8DTLmQHqQZagCsN2YQaYv0T6CAqhq4F YQ/8CQUiWC05jbt60iWv8z1+vyfNogatd6Eyj5lbXL+FQzHIHFlZMbUmIQZpOAmuFqmf 7ARQVjiCFcGklhxDzKwIVe08WAjva5CYjwzJ/E7yZEX4WKCuKAPXQobYUFvSOc6ouD6e APEr1HnfD8ItEkjk5dIM8b7wT7Nt+B0qIbh0YFreof1y2cdbrF9a6/7aURlByAygryth ehOzHY6sJA2eStUeJKHadEs3MVDUzeu6qlnIucizyGGpARoyLW97zbXGMMZceggmwtCs IMbA== 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 n19-20020a638f13000000b005b9083b81f5si622803pgd.487.2023.11.01.14.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 14:38:29 -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 1960A8197EB3; Wed, 1 Nov 2023 14:38:28 -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 S1346292AbjKAViY (ORCPT + 35 others); Wed, 1 Nov 2023 17:38:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345815AbjKAViH (ORCPT ); Wed, 1 Nov 2023 17:38:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52643123 for ; Wed, 1 Nov 2023 14:38:05 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0284CC433CB; Wed, 1 Nov 2023 21:38:05 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qyIua-00Edc9-0O; Wed, 01 Nov 2023 17:38:04 -0400 Message-ID: <20231101213803.934710766@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Nov 2023 17:37:29 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [for-next][PATCH 11/12] eventfs: Remove special processing of dput() of events directory References: <20231101213718.381015321@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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]); Wed, 01 Nov 2023 14:38:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781399247129222109 X-GMAIL-MSGID: 1781399247129222109 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(). Link: https://lkml.kernel.org/r/20231101172650.340876747@goodmis.org Cc: Ajay Kaher Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton 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 0a04ae0ca8c8..0087a3f455f1 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);