From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CF313B5F48 for ; Thu, 21 May 2026 12:58:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779368297; cv=none; b=j3Hm9DJagTfWbVNkgHk9afQp180YRPPDSpCR7OafyIkLeWs4cZs4gDwdKD14A/rh0/xzWZLVEQWiQYoBDEof1nlMBTB8Zk9cXQH+G4JOtUEFu4Rh4iwdrucfX1AViOYBOs8qMZYWiy/NMQCRyddTl37FQImrcKScQ4T/tV1eKc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779368297; c=relaxed/simple; bh=ytZJdiEh6HR3SVXfTWJzSUhQB0aMDwdDWS//Iv6NP9k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DJKFMhenau61OuVwFc6VevtZKNWZcJyTyxvaNxEXRuqn9fuobzSasqiJhWHtDGiY2QTVb8WsZd9/Wrovm2F6gjhnRLEbvu+yzX78g58+89KmDlz+wTYDVmHXedW/mj2HdjUMs0Iez1xtK9JYPluOgFgyd2Gv3+f7rpmK0a5MyGc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AdT+jegI; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AdT+jegI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 690F01F00A3C; Thu, 21 May 2026 12:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779368295; bh=MEucJDmHGi82EiJqmneA2/C0HIJLSUcqz4N9MPIR0LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AdT+jegIjndWNA3pcle/dph4c3padl63Tdk4g+OtYVfLdN2cXp9lbATvwRUMFe1dA bFQs6gdUGmP6Gmcv5lQTf8SYjownT0wTMWT6MzZpXIQljpyA8yujxjRrrV9MDAFEUO ZcQbupjPS871cda3XAZUiEvK7w0qRRXjY4AkQdOtHMLEanGC1o4xUDTHfLydM4GAQ0 VwG9U6XoeRHMTPI39J83zMU5gGomHMlQ6NHPsAZlkcFx2LcPUNIJPYnl2W7xbEOsvI IIZhoS111eTAF3DiZUP3d0GyxBDDoglWCKz/lLWoOLYdGxXfRF9fpNBC4PBVH464b2 dqNUCOPz4DFqQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Masami Hiramatsu (Google)" , Menglong Dong , Sasha Levin Subject: [PATCH 6.18.y 1/4] tracing: fprobe: Remove unused local variable Date: Thu, 21 May 2026 08:58:10 -0400 Message-ID: <20260521125813.1165339-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051547-headless-mutilated-277a@gregkh> References: <2026051547-headless-mutilated-277a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Masami Hiramatsu (Google)" [ Upstream commit 90e69d291d195d35215b578d210fd3ce0e5a3f42 ] The 'ret' local variable in fprobe_remove_node_in_module() was used for checking the error state in the loop, but commit dfe0d675df82 ("tracing: fprobe: use rhltable for fprobe_ip_table") removed the loop. So we don't need it anymore. Link: https://lore.kernel.org/all/175867358989.600222.6175459620045800878.stgit@devnote2/ Fixes: e5a4cc28a052 ("tracing: fprobe: use rhltable for fprobe_ip_table") Signed-off-by: Masami Hiramatsu (Google) Acked-by: Menglong Dong Stable-dep-of: 0ac0058a74ac ("tracing/fprobe: Check the same type fprobe on table as the unregistered one") Signed-off-by: Sasha Levin --- kernel/trace/fprobe.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 8fa5bff2c26fa..51003d85933d9 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -561,8 +561,6 @@ static int fprobe_addr_list_add(struct fprobe_addr_list *alist, unsigned long ad static void fprobe_remove_node_in_module(struct module *mod, struct fprobe_hlist_node *node, struct fprobe_addr_list *alist) { - int ret = 0; - if (!within_module(node->addr, mod)) return; if (delete_fprobe_node(node)) @@ -571,8 +569,7 @@ static void fprobe_remove_node_in_module(struct module *mod, struct fprobe_hlist * If failed to update alist, just continue to update hlist. * Therefore, at list user handler will not hit anymore. */ - if (!ret) - ret = fprobe_addr_list_add(alist, node->addr); + fprobe_addr_list_add(alist, node->addr); } /* Handle module unloading to manage fprobe_ip_table. */ -- 2.53.0