Commit db3a3972 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

eventfs: Have a free_ei() that just frees the eventfs_inode 

As the eventfs_inode is freed in two different locations, make a helper
function free_ei() to make sure all the allocated fields of the
eventfs_inode is freed.

This requires renaming the existing free_ei() which is called by the srcu
handler to free_rcu_ei() and have free_ei() just do the freeing, where
free_rcu_ei() will call it.

Link: https://lkml.kernel.org/r/20231101172649.265214087@goodmis.org



Cc: Ajay Kaher <akaher@vmware.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent f2f49637

fs/tracefs/event_inode.c

+11 −8
Original line number Diff line number Diff line
@@ -129,6 +129,13 @@ static struct dentry *create_dir(const char *name, struct dentry *parent) 
	return eventfs_end_creating(dentry);

}



static void free_ei(struct eventfs_inode *ei)

{

	kfree_const(ei->name);

	kfree(ei->d_children);

	kfree(ei);

}



/**

 * eventfs_set_ei_status_free - remove the dentry reference from an eventfs_inode

 * @ti: the tracefs_inode of the dentry
@@ -168,9 +175,7 @@ void eventfs_set_ei_status_free(struct tracefs_inode *ti, struct dentry *dentry) 
			eventfs_remove_dir(ei_child);

		}



		kfree_const(ei->name);

		kfree(ei->d_children);

		kfree(ei);

		free_ei(ei);

		return;

	}
@@ -784,13 +789,11 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry 
	return ERR_PTR(-ENOMEM);

}



static void free_ei(struct rcu_head *head)

static void free_rcu_ei(struct rcu_head *head)

{

	struct eventfs_inode *ei = container_of(head, struct eventfs_inode, rcu);



	kfree_const(ei->name);

	kfree(ei->d_children);

	kfree(ei);

	free_ei(ei);

}



/**
@@ -881,7 +884,7 @@ void eventfs_remove_dir(struct eventfs_inode *ei) 
		for (i = 0; i < ei->nr_entries; i++)

			unhook_dentry(&ei->d_children[i], &dentry_list);

		unhook_dentry(&ei->dentry, &dentry_list);

		call_srcu(&eventfs_srcu, &ei->rcu, free_ei);

		call_srcu(&eventfs_srcu, &ei->rcu, free_rcu_ei);

	}

	mutex_unlock(&eventfs_mutex);