From patchwork Fri Feb 17 10:09:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 58472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp806384wrn; Fri, 17 Feb 2023 02:18:24 -0800 (PST) X-Google-Smtp-Source: AK7set9Fom5rVLtgIzDABvr8ZCxq9wF7k1QP2FqCWp62lKh0dVAXi7es/u00+azYAWrATGryQWtZ X-Received: by 2002:a17:906:af92:b0:878:545b:e540 with SMTP id mj18-20020a170906af9200b00878545be540mr8725415ejb.51.1676629104359; Fri, 17 Feb 2023 02:18:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676629104; cv=none; d=google.com; s=arc-20160816; b=UjjPehKGksCoa2YCZcie9e3ps0thYMX0x3GcCQg2zRkEbMUCL6MlblQUy38Fpw5vEn y9DghcfnNdXbx/TmpuZdsOvA/DhIcXUBf6AEZNefbwzxfDfeOZ8gx0HKuDj1QskE/2LL 5UOfMNmBVWVJn61KUgsi+sSxc3fl6cpwRFSpVvRhpp/FDJdhzY+JTgOmrmLsOUQQIW/e gzdTLu0tJfwS7dP387foI2IhmxKo3ZTLXzIJZP+h7PFa8fXyb8mV6FF4EX8kZm0ddEzL 3/HvjFioGhxfj/DPeRhGmrlPjMuVDyiY2gwrHFDR9WN44RHJLh5xbSRt17A8K+Yn0ZMP 0A7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WrR//zva4ZesymP/eKoj5KyCPnat+CUvA7ZEtVA4JNA=; b=L8ZvC0pZ4YOmN8OgQWHumBahrgQ9Z/pkU8EcuGpHVgNhb9Oiek7G1LiIIh2qWz0hvo Eus89wPRJlzIpdEnQOk1xBJnBpsIKThvI9Sh5oH/TADgsp/z6VfFxoT4SCh2/GGBih4S wYKxDUOYmtHs1Lsm8tBLVq0KHK/zDeFRAH+3fIR76TvcRVvfTa5GCxQTZ98FZPzS72n9 jVJ1yD+bJLnmNWZ1dh72Ahm/X+RgyIXww47+UH2Avr7aKXSm7rXD2GIDCxhiW8AQ1pyd tzMTwwhsI7eSHQxj0+kU/tL8I2m6w0XPFdNGJcgcsM9Gy5maVjNHgLZpYcq8q+I3g+bO aT2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="UW/DWt5L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fm15-20020a1709072acf00b008b1820a95e7si1784818ejc.617.2023.02.17.02.18.00; Fri, 17 Feb 2023 02:18:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="UW/DWt5L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229746AbjBQKJP (ORCPT + 99 others); Fri, 17 Feb 2023 05:09:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbjBQKJN (ORCPT ); Fri, 17 Feb 2023 05:09:13 -0500 Received: from m12.mail.163.com (m12.mail.163.com [123.126.96.234]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 03881604F7; Fri, 17 Feb 2023 02:09:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=WrR// zva4ZesymP/eKoj5KyCPnat+CUvA7ZEtVA4JNA=; b=UW/DWt5LJSPWho/WF8aZg 2tGnVb1Hw4AOTSGuMU6aAc44e/wyVjQKB7zD8D/bsWWShFO/DVpgraKTs+PoNHv8 9oNT4RGBJqRrL0srDDA17Cyj5m9nVmnAh3gzSpMMSqEK03WcXKozRje54ArOFqOK +bfxw9AqcmOQTXLpeCREV0= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by smtp16 (Coremail) with SMTP id MNxpCgAXRz9iUu9jEKWQEQ--.51377S2; Fri, 17 Feb 2023 18:09:38 +0800 (CST) From: Zheng Wang To: colyli@suse.de Cc: hackerzheng666@gmail.com, kent.overstreet@gmail.com, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, alex000young@gmail.com, Zheng Wang , stable@vger.kernel.org Subject: [RESEBD PATCH v3] bcache: Remove some unnecessary NULL point check for the return value of __bch_btree_node_alloc-related pointer Date: Fri, 17 Feb 2023 18:09:01 +0800 Message-Id: <20230217100901.707245-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: MNxpCgAXRz9iUu9jEKWQEQ--.51377S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAr48WF4xXrW3Aw4ktFWxtFb_yoW5CF1Dpr W29ryayr97Xr4UCr9Yg3WvvFyfXw12vFWUWr93u3WfZry7AFyrCay0934jvrWUuFWxuF4U Zr40yw1UXr4UtF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziLSdPUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/xtbBuhQZU1+GuN4EbgABsw X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758073039589805464?= X-GMAIL-MSGID: =?utf-8?q?1758073039589805464?= Due to the previously fix of __bch_btree_node_alloc, the return value will never be a NULL pointer. So IS_ERR is enough to handle the failure situation. Fix it by replacing IS_ERR_OR_NULL check to IS_ERR check. Fixes: cafe56359144 ("bcache: A block layer cache") Cc: stable@vger.kernel.org Signed-off-by: Zheng Wang --- v3: - Add Cc: stable@vger.kernel.org suggested by Eric v2: - Replace more checks --- drivers/md/bcache/btree.c | 10 +++++----- drivers/md/bcache/super.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 147c493a989a..7c21e54468bf 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -1138,7 +1138,7 @@ static struct btree *btree_node_alloc_replacement(struct btree *b, { struct btree *n = bch_btree_node_alloc(b->c, op, b->level, b->parent); - if (!IS_ERR_OR_NULL(n)) { + if (!IS_ERR(n)) { mutex_lock(&n->write_lock); bch_btree_sort_into(&b->keys, &n->keys, &b->c->sort); bkey_copy_key(&n->key, &b->key); @@ -1340,7 +1340,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, memset(new_nodes, 0, sizeof(new_nodes)); closure_init_stack(&cl); - while (nodes < GC_MERGE_NODES && !IS_ERR_OR_NULL(r[nodes].b)) + while (nodes < GC_MERGE_NODES && !IS_ERR(r[nodes].b)) keys += r[nodes++].keys; blocks = btree_default_blocks(b->c) * 2 / 3; @@ -1352,7 +1352,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, for (i = 0; i < nodes; i++) { new_nodes[i] = btree_node_alloc_replacement(r[i].b, NULL); - if (IS_ERR_OR_NULL(new_nodes[i])) + if (IS_ERR(new_nodes[i])) goto out_nocoalesce; } @@ -1487,7 +1487,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, bch_keylist_free(&keylist); for (i = 0; i < nodes; i++) - if (!IS_ERR_OR_NULL(new_nodes[i])) { + if (!IS_ERR(new_nodes[i])) { btree_node_free(new_nodes[i]); rw_unlock(true, new_nodes[i]); } @@ -1669,7 +1669,7 @@ static int bch_btree_gc_root(struct btree *b, struct btree_op *op, if (should_rewrite) { n = btree_node_alloc_replacement(b, NULL); - if (!IS_ERR_OR_NULL(n)) { + if (!IS_ERR(n)) { bch_btree_node_write_sync(n); bch_btree_set_root(n); diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index ba3909bb6bea..7660962e7b8b 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1724,7 +1724,7 @@ static void cache_set_flush(struct closure *cl) if (!IS_ERR_OR_NULL(c->gc_thread)) kthread_stop(c->gc_thread); - if (!IS_ERR_OR_NULL(c->root)) + if (!IS_ERR(c->root)) list_add(&c->root->list, &c->btree_cache); /* @@ -2088,7 +2088,7 @@ static int run_cache_set(struct cache_set *c) err = "cannot allocate new btree root"; c->root = __bch_btree_node_alloc(c, NULL, 0, true, NULL); - if (IS_ERR_OR_NULL(c->root)) + if (IS_ERR(c->root)) goto err; mutex_lock(&c->root->write_lock);