Message ID | 282d130abca6fe7db5edef1922c971849397ffa9.1735912719.git.christophe.jaillet@wanadoo.fr |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=t2li=T3=vger.kernel.org=linux-ext4+bounces-5875-patchwork-incoming=ozlabs.org@ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=wanadoo.fr header.i=@wanadoo.fr header.a=rsa-sha256 header.s=t20230301 header.b=qQM+R7kU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=mail.ozlabs.org; envelope-from=srs0=t2li=t3=vger.kernel.org=linux-ext4+bounces-5875-patchwork-incoming=ozlabs.org@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YPld80PgVz1yY9 for <incoming@patchwork.ozlabs.org>; Sat, 4 Jan 2025 01:02:20 +1100 (AEDT) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4YPld23Lrtz4xfV for <incoming@patchwork.ozlabs.org>; Sat, 4 Jan 2025 01:02:14 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4YPld23JBbz4xft; Sat, 4 Jan 2025 01:02:14 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; arc=pass smtp.remote-ip=147.75.199.223 arc.chain=subspace.kernel.org ARC-Seal: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1735912934; cv=pass; b=JmGZReXKo7BwvfZWGwsJOiVSJnk1G2ZYSO7Bf6XiQ7JEe7qix79TGuyt/PpKDTM67KySkZhYqf3aI7WGGqHOrMhGcYt4b/0BjGr0cGf7UkEZ8Sw8Jg3PGduGJZf6vqd49qZvmAi3HwyenOfczALSgsugn38kFJQHnAm+ZyhmZoO552M3u90NiNsiDng4VvBfmlCHcVk+wgIwjG2JS4zEWpln612glhJqu4aW7UEfV2p8sMRP2hCrF6UwoEo8roCqWR4mgPOhzLkmcwoqzQGvFlAda7ZQbWPvKFHTNn9WuhLbpg6iWa+VgPzhK8S4i8KbP5MAsIW6xlz+4DWp3HHUoQ== ARC-Message-Signature: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1735912934; c=relaxed/relaxed; bh=Q7/8sNe6EE+YUMiz3BwMXFn6gQr4fPPu1y7Xq24DSTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FjgBoeoaHOZmYQ+7jmLm3dloRVFxU6lCVmV8NFhwXxkqStNtGLzS6uNWa5lSavmhpFLtRcwVH/+F4KR2hecJYpWx7NG+A5iIBvrBNzga7MD0z5ARfmlBRRw52Vms9AxRQUM5CC6PfjbV3mn1yRV+fd/+iI3z28cvT672HF1iVw78Wxwh2k5NfSUBCaoVyfpjo+qZBE7hZCVkUbXzBqYzoCNhR7m8irvmb+OJkisl/fj7BEwYti6rv8Rih245XqHHAOUaFbjWP2n32o56DjWCEOmseWHjthr/Eyg4Gnfu7VgXa9S6o3EzginhIGwCfFwCujllNEmyo3tkOTLhlYTaZQ== ARC-Authentication-Results: i=2; gandalf.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr; dkim=pass (2048-bit key; unprotected) header.d=wanadoo.fr header.i=@wanadoo.fr header.a=rsa-sha256 header.s=t20230301 header.b=qQM+R7kU; dkim-atps=neutral; spf=pass (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=linux-ext4+bounces-5875-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=wanadoo.fr header.i=@wanadoo.fr header.a=rsa-sha256 header.s=t20230301 header.b=qQM+R7kU; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=linux-ext4+bounces-5875-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [147.75.199.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by gandalf.ozlabs.org (Postfix) with ESMTPS id 4YPlcy6YYnz4xfV for <patchwork-incoming@ozlabs.org>; Sat, 4 Jan 2025 01:02:10 +1100 (AEDT) Received: from smtp.subspace.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 30B0016423E for <patchwork-incoming@ozlabs.org>; Fri, 3 Jan 2025 14:02:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 47EEB1FA267; Fri, 3 Jan 2025 14:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="qQM+R7kU" X-Original-To: linux-ext4@vger.kernel.org Received: from smtp.smtpout.orange.fr (smtp-13.smtpout.orange.fr [80.12.242.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 085BC1B6CE3; Fri, 3 Jan 2025 14:01:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.12.242.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735912917; cv=none; b=BRHZqB58I/moYdv6JLchwHm61BYEsQ9GxnN+Bbsztd7DEP/ql592c0fgj9aZ987MxlP6EfwtPwgSkastfowk2LT0nBKliHCmpQNbTLe6u7y3ITeBqgdFPF8YZPAZaMrurkwHfnpNfINytDFh3nqNLQqy8aaWHH5k3vf0z2ywp8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735912917; c=relaxed/simple; bh=ZRno73Lk2Ty8S0opHivTNzfFl53OIMiLT3tzSC/C688=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dY6RB6t+wnCX7Cy6dA6C49VG88yCdo0Qm9qmpZ3tWNrDg9svDuU85Wdcgpe9xYEnu2NAqFcx67EC1IbjJwL7QcFRLB4JAZdK3yOmOizda9NFBsQWPlMfEGUsqQlLvFBfV0UIuAUVPvTJyTLuKIJLiNhDT1+h1cfs7M6PCumXMNE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr; spf=pass smtp.mailfrom=wanadoo.fr; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b=qQM+R7kU; arc=none smtp.client-ip=80.12.242.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from localhost.localdomain ([90.11.132.44]) by smtp.orange.fr with ESMTPA id TiD9tWQAL3p3ETiEGt9jNC; Fri, 03 Jan 2025 15:00:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1735912844; bh=Q7/8sNe6EE+YUMiz3BwMXFn6gQr4fPPu1y7Xq24DSTo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=qQM+R7kUntUm27bjnscuB4czDTZsh/deE0yB26iMb7BXl/Wn9tmlOvFlj5u7/6M+4 QF/sLtmbApUjGRCugm4FtaprL1XP1/WcdQGt1kGABidmRRELbiV1i2VZQ7eT0C+nv/ caXqebeZtTtsalMFmiOJrBMb52QlTxcP7lzEjTRHL/3GkaoBWCPa/oiyouFf6nckTs c0uk4dCCRua/rHn8NBAS41YDM7KJYQuVQjgTLlKYfaQWhpsFiyRuzdzENgtAzkiqma WG2/83dQFlP+VU0htC0f7oIt7QFjIwvyOUAKFj8NAsPXbPEPHukGmPsdSahM+NwkQO kEFrC+VppkTjQ== X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 03 Jan 2025 15:00:44 +0100 X-ME-IP: 90.11.132.44 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: "Theodore Ts'o" <tytso@mit.edu>, Andreas Dilger <adilger.kernel@dilger.ca> Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr>, linux-ext4@vger.kernel.org Subject: [PATCH 3/3] ext4: Remove some dead code in the error handling path of ext4_mb_init_cache() Date: Fri, 3 Jan 2025 14:59:18 +0100 Message-ID: <282d130abca6fe7db5edef1922c971849397ffa9.1735912719.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <3921e725586edaca611fd3de388f917e959dc85d.1735912719.git.christophe.jaillet@wanadoo.fr> References: <3921e725586edaca611fd3de388f917e959dc85d.1735912719.git.christophe.jaillet@wanadoo.fr> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: <linux-ext4.vger.kernel.org> List-Subscribe: <mailto:linux-ext4+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-ext4+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.2 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on gandalf.ozlabs.org |
Series |
[1/3] ext4: Fix an error handling path in ext4_mb_init_cache()
|
expand
|
…
> This slighly simplifies the code.
Simplify the source code slightly?
Regards,
Markus
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index e536c0e35ca8..c22f7b8fd941 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1430,12 +1430,11 @@ static int ext4_mb_init_cache(struct folio *folio, char *incore, gfp_t gfp) folio_mark_uptodate(folio); out: - if (bh) { - for (i = 0; i < groups_per_page; i++) - brelse(bh[i]); - if (bh != &bhs) - kfree(bh); - } + for (i = 0; i < groups_per_page; i++) + brelse(bh[i]); + if (bh != &bhs) + kfree(bh); + return err; }
'bh' is known to be a non-NULL value if the error handling path is called, so there is no need to test for it. This slighly simplifies the code. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Compile tested only. --- fs/ext4/mballoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)