Commit 29142dc9 authored by Linus Torvalds's avatar Linus Torvalds Committed by Steven Rostedt (Google)
Browse files

tracefs: remove stale 'update_gid' code 

The 'eventfs_update_gid()' function is no longer called, so remove it
(and the helper function it uses).

Link: https://lore.kernel.org/all/CAHk-=wj+DsZZ=2iTUkJ-Nojs9fjYMvPs1NuoM3yK7aTDtJfPYQ@mail.gmail.com/



Fixes: 8186fff7 ("tracefs/eventfs: Use root and instance inodes as default ownership")
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 0958b33e

fs/tracefs/event_inode.c

+0 −38
Original line number Diff line number Diff line
@@ -281,44 +281,6 @@ static void update_inode_attr(struct dentry *dentry, struct inode *inode, 
		inode->i_gid = attr->gid;

}



static void update_gid(struct eventfs_inode *ei, kgid_t gid, int level)

{

	struct eventfs_inode *ei_child;



	/* at most we have events/system/event */

	if (WARN_ON_ONCE(level > 3))

		return;



	ei->attr.gid = gid;



	if (ei->entry_attrs) {

		for (int i = 0; i < ei->nr_entries; i++) {

			ei->entry_attrs[i].gid = gid;

		}

	}



	/*

	 * Only eventfs_inode with dentries are updated, make sure

	 * all eventfs_inodes are updated. If one of the children

	 * do not have a dentry, this function must traverse it.

	 */

	list_for_each_entry_srcu(ei_child, &ei->children, list,

				 srcu_read_lock_held(&eventfs_srcu)) {

		if (!ei_child->dentry)

			update_gid(ei_child, gid, level + 1);

	}

}



void eventfs_update_gid(struct dentry *dentry, kgid_t gid)

{

	struct eventfs_inode *ei = dentry->d_fsdata;

	int idx;



	idx = srcu_read_lock(&eventfs_srcu);

	update_gid(ei, gid, 0);

	srcu_read_unlock(&eventfs_srcu, idx);

}



/**

 * create_file - create a file in the tracefs filesystem

 * @name: the name of the file to create.

fs/tracefs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct inode *tracefs_get_inode(struct super_block *sb); 
struct dentry *eventfs_start_creating(const char *name, struct dentry *parent);

struct dentry *eventfs_failed_creating(struct dentry *dentry);

struct dentry *eventfs_end_creating(struct dentry *dentry);

void eventfs_update_gid(struct dentry *dentry, kgid_t gid);

void eventfs_set_ei_status_free(struct tracefs_inode *ti, struct dentry *dentry);



#endif /* _TRACEFS_INTERNAL_H */