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 ABEFCC4167B for ; Tue, 28 Nov 2023 21:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376479AbjK1VOk (ORCPT ); Tue, 28 Nov 2023 16:14:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346913AbjK1VN4 (ORCPT ); Tue, 28 Nov 2023 16:13:56 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67A883A82 for ; Tue, 28 Nov 2023 13:09:50 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CA6EC433BD; Tue, 28 Nov 2023 21:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701205790; bh=xuieMdbLS2+jo5pzjjgrpF53xC2SfxnGYEYhtxU4uS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TjVlabWh6NC0AB6xn/JfJADnZDxuWG4kbMsRiXGatHpFXFRQ2xvGuRa9UduMzGaeb cNVLvOD61CHFBvZ3WX6AUUXpEWjkGbecEN0hT02kzX8UwdER/MPqnw1CC0ybvqq3Y6 HbHC5EKQXfZyd/VwTiBnafCVTUmEpOTPvB5Wt1GlPFshGDMbHYJ3EPn5iUBsEDd8m4 DlTdU30c+u3E8EDqCP41K1pGfZIp/Wjwcl+D/mUeYVlw5WN0QUoJYVlzzylqHKw15t wVGa3bdbpQiY8jJk2HEdwcZ3ttHSexdhullL8GLWdUDP6KV2ferOgVhYJiGNtiCe48 NKPyzU6Thbeyw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Coly Li , Jens Axboe , Sasha Levin , kent.overstreet@gmail.com, linux-bcache@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 05/11] bcache: avoid NULL checking to c->root in run_cache_set() Date: Tue, 28 Nov 2023 16:09:29 -0500 Message-ID: <20231128210941.877094-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231128210941.877094-1-sashal@kernel.org> References: <20231128210941.877094-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.262 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Coly Li [ Upstream commit 3eba5e0b2422aec3c9e79822029599961fdcab97 ] In run_cache_set() after c->root returned from bch_btree_node_get(), it is checked by IS_ERR_OR_NULL(). Indeed it is unncessary to check NULL because bch_btree_node_get() will not return NULL pointer to caller. This patch replaces IS_ERR_OR_NULL() by IS_ERR() for the above reason. Signed-off-by: Coly Li Link: https://lore.kernel.org/r/20231120052503.6122-11-colyli@suse.de Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index d5f57a9551dda..5d1a4eb816694 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1908,7 +1908,7 @@ static int run_cache_set(struct cache_set *c) c->root = bch_btree_node_get(c, NULL, k, j->btree_level, true, NULL); - if (IS_ERR_OR_NULL(c->root)) + if (IS_ERR(c->root)) goto err; list_del_init(&c->root->list); -- 2.42.0