From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 402FEC072A2 for ; Wed, 15 Nov 2023 17:37:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230021AbjKORhC (ORCPT ); Wed, 15 Nov 2023 12:37:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjKORhC (ORCPT ); Wed, 15 Nov 2023 12:37:02 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D75D683 for ; Wed, 15 Nov 2023 09:36:58 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B2F2C433C7; Wed, 15 Nov 2023 17:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700069818; bh=3jPFOHGt6Zm4E372LORhHTqzrvU7VPJ0xseRQaIqn18=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lMwjotXFxXXcrKspwSmXVqUAFqj4+eqSb4tKJ5HxftRHIdIqZLJ686rfFMCdbqHyD zPPNumhL6Kmd0927vNbTHAarkVnZpnodtQo/tlsCFtJ1wSxNEJtWMucLeRaAAWdB/o Z6zv6yHqDDFpf2OUwcqUiC7kknPN/V7jtuDIsFRs= Date: Wed, 15 Nov 2023 12:36:53 -0500 From: Greg KH To: Steven Rostedt Cc: beaub@linux.microsoft.com, mark.rutland@arm.com, mhiramat@kernel.org, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] tracing: Have trace_event_file have ref counters" failed to apply to 5.4-stable tree Message-ID: <2023111541-various-pliable-2a2d@gregkh> References: <2023110614-natural-tweak-9ee4@gregkh> <20231106144832.37bc9d16@gandalf.local.home> <2023111508-curly-postbox-26e0@gregkh> <2023111557-cape-ashy-6162@gregkh> <20231115123334.725cb742@rorschach.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231115123334.725cb742@rorschach.local.home> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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 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)" > > > > 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