From patchwork Wed Nov 1 17:25:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp583586vqx; Wed, 1 Nov 2023 10:27:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEg5Mkbto7RL5RM1mxFNyUbQMmsjGpEvINMXnzDw+I6kDFvrrrON+x3xjoJ7QQGBrZ12/kr X-Received: by 2002:a17:902:ce88:b0:1cc:636f:f37c with SMTP id f8-20020a170902ce8800b001cc636ff37cmr7437268plg.13.1698859668371; Wed, 01 Nov 2023 10:27:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698859668; cv=none; d=google.com; s=arc-20160816; b=qehLac3HJCxcMmY90eBTXkdzyKZNUylAcT2n29CEzNmY1xZIerw3Z6sXrpDifDF8PM guhaKxXhqnq4LxcpIbPsl0AILJ3t+cmzoEqfiMYDn/XvTKlTLAmhtsS74U65l/OE7h0E Lv41SnqNEZX2tyDfrGPW0I+FqloG9SSL9fx7qrIdQyJxSxnyefhjlo7y1/ruab5i/IiE yTsfL/tJ/XlyaKhB0IjcglNBRzIIrYOXCw4NLHHXjw12Br0h58cOt41irFUIUh+5B+HK OqzeJp3X7/Cu61n5jmiB8akNjF/ZH/HDMd3rTTyZT2iSbYFnFvJT3vV5Jt19yzb8EMVT p8dg== 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=SsHDjxWoHN+d1yQ7xx2++cnsE4eiZ/EzFexWhw5r/3Q=; fh=GOzcny/+Yhxxe/LhYnYPHd+JVjDgZ9WgHyPLWbp+hjU=; b=ZEI2TfhAKU0iYlLos77wmeKbWl0NH4berKbExnOyxOwwbKfk2HX5BHvU3xb+zhRdI2 LET5f4tjJCu8SkevI0tIFgRU0r1uMJYFZzeeZE57sJ6R9ZZfNhnfR0BdqHW5TXsEOUg/ bADA7bquMIJ0fH6OjSWZvImyY5kV6MANKCsJYWf0zJaNykKAp9swjXMHWNkI9Kt3Tm7T WN3rMedVY+dvB8SbbkQnahcC0OXyBvYqEx9H9bu5ybYaZpAR7xg5XsjkeEePXztkpOAh PN2338+N8DKWoX3jrkDBiqkgLo/iVh9Rt9NVEnOcqf3IMX6AWQ1C/espuHqARyubAL6w llHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id j3-20020a170903028300b001c9ad8ca211si3621071plr.18.2023.11.01.10.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 10:27:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 9607580CD738; Wed, 1 Nov 2023 10:27:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344526AbjKAR1E (ORCPT + 34 others); Wed, 1 Nov 2023 13:27:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344439AbjKAR0z (ORCPT ); Wed, 1 Nov 2023 13:26:55 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82830E4 for ; Wed, 1 Nov 2023 10:26:52 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71028C433AB; Wed, 1 Nov 2023 17:26:51 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qyEzS-00EZvQ-1i; Wed, 01 Nov 2023 13:26:50 -0400 Message-ID: <20231101172650.340876747@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Nov 2023 13:25:48 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [PATCH v6 7/8] eventfs: Remove special processing of dput() of events directory References: <20231101172541.971928390@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Wed, 01 Nov 2023 10:27:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781383475421642659 X-GMAIL-MSGID: 1781383475421642659 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(). Cc: Ajay Kaher Signed-off-by: Steven Rostedt (Google) Reviewed-by: Masami Hiramatsu (Google) --- Changes since v5: https://lkml.kernel.org/r/20231031223421.185413077@goodmis.org - Resynced to this patch series 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);