Re: FAILED: patch "[PATCH] tracing: Have trace_event_file have ref counters" failed to apply to 5.4-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Wed, Nov 15, 2023 at 12:33:34PM -0500, Steven Rostedt wrote:
> On Wed, 15 Nov 2023 07:04:42 -0500
> Greg KH <gregkh@linuxfoundation.org> wrote:
> 
> > On Wed, Nov 15, 2023 at 06:58:14AM -0500, Greg KH wrote:
> > > On Mon, Nov 06, 2023 at 02:48:32PM -0500, Steven Rostedt wrote:  
> > > > 
> > > > [ This should work for v5.4 ]
> > > > 
> > > > From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
> > > > Subject: [PATCH] tracing: Have trace_event_file have ref counters
> > > > 
> > > > commit bb32500fb9b78215e4ef6ee8b4345c5f5d7eafb4 upstream  
> > > 
> > > All now queued up, thanks.  
> > 
> > No, wait, all of these break the build with this error:
> > 
> > kernel/trace/trace_events.c: In function ‘remove_event_file_dir’:
> > kernel/trace/trace_events.c:1015:24: error: unused variable ‘child’ [-Werror=unused-variable]
> >  1015 |         struct dentry *child;
> >       |                        ^~~~~
> > 
> > So I'm going to drop them now :(
> > 
> 
> Ah, this patch I didn't run through all my tests, like I did with the
> 6.6 patches, so I didn't test with fail on warnings. The patch deleted
> the following code:
> 
>  static void remove_event_file_dir(struct trace_event_file *file)
>  {
>  	struct dentry *dir = file->dir;
>  	struct dentry *child;
>  
> -	if (dir) {
> -		spin_lock(&dir->d_lock);	/* probably unneeded */
> -		list_for_each_entry(child, &dir->d_subdirs, d_child) {
> -			if (d_really_is_positive(child))	/* probably unneeded */
> -				d_inode(child)->i_private = NULL;
> -		}
> -		spin_unlock(&dir->d_lock);
> -
> +	if (dir)
>  		tracefs_remove_recursive(dir);
> -	}
>  
>  	list_del(&file->list);
> 
> The extra check that that utilized that child variable is no longer
> needed, and I forgot to delete the declaration of the child variable.
> 
> Did you just want to delete that, or do you want me to create a new
> patch?

I need all new patches, sorry, these are long gone from my queue.

greg k-h