From: Steven Rostedt (Google) <rostedt@goodmis.org>
Date: Tue, 6 Feb 2024 12:09:07 +0000 (-0500)
Subject: Revert "eventfs: Check for NULL ef in eventfs_set_attr()"
X-Git-Tag: v6.6.18~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e9fb476196d083d79179a1109ab0c5b1135cefc;p=thirdparty%2Fkernel%2Fstable.git

Revert "eventfs: Check for NULL ef in eventfs_set_attr()"

This reverts commit d8f492a059728bbd397defbc9b8d2f4159d869b5.

The eventfs was not designed properly and may have some hidden bugs in it.
Linus rewrote it properly and I trust his version more than this one. Revert
the backported patches for 6.6 and re-apply all the changes to make it
equivalent to Linus's version.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
index efbdc47c74dcf..5fcfb634fec26 100644
--- a/fs/tracefs/event_inode.c
+++ b/fs/tracefs/event_inode.c
@@ -113,14 +113,14 @@ static int eventfs_set_attr(struct mnt_idmap *idmap, struct dentry *dentry,
 
 	mutex_lock(&eventfs_mutex);
 	ef = dentry->d_fsdata;
-	if (ef && ef->is_freed) {
+	if (ef->is_freed) {
 		/* Do not allow changes if the event is about to be removed. */
 		mutex_unlock(&eventfs_mutex);
 		return -ENODEV;
 	}
 
 	ret = simple_setattr(idmap, dentry, iattr);
-	if (!ret && ef)
+	if (!ret)
 		update_attr(ef, iattr);
 	mutex_unlock(&eventfs_mutex);
 	return ret;