Merge tag 'block-6.7-2023-12-01' of git://git.kernel.dk/linux

[thirdparty/linux.git] / drivers / md / bcache / btree.c

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 1b0892fe7ddb6741919bb9ecba0907866c9a4593..196cdacce38f253ffee057da72221b017b94565b 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -1522,7 +1522,7 @@ out_nocoalesce:
        bch_keylist_free(&keylist);
 
        for (i = 0; i < nodes; i++)
-               if (!IS_ERR(new_nodes[i])) {
+               if (!IS_ERR_OR_NULL(new_nodes[i])) {
                        btree_node_free(new_nodes[i]);
                        rw_unlock(true, new_nodes[i]);
                }