[v6,7/8] eventfs: Remove special processing of dput() of events directory
Commit Message
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
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 <akaher@vmware.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
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(-)
Comments
On Wed, 01 Nov 2023 13:25:48 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> 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().
>
Looks good to me.
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> Cc: Ajay Kaher <akaher@vmware.com>
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> 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);
> --
> 2.42.0
@@ -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);