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 0DAAFC7EE2E for ; Sat, 20 May 2023 18:24:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232173AbjETSYm (ORCPT ); Sat, 20 May 2023 14:24:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232075AbjETSYU (ORCPT ); Sat, 20 May 2023 14:24:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCC15E4F; Sat, 20 May 2023 11:23:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8824560F87; Sat, 20 May 2023 18:22:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33532C433EF; Sat, 20 May 2023 18:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684606931; bh=7ipye+KJW4UEOwLE+t99KJTCrFwtRYxx7g9rkw1yhSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y/+c1c3LjtZEb/LMnDj83FKD05qNXKJWKFE50xYFEfcwa4nYX7pk6AbrJzmrMZdc/ dS2nW2NtQBOE7P8Qpuy9oxQUOD9duCZK5/ZMuu5UGhRYYG0nt1Jbz/uSuYlO3hJOV/ 1U8Hu9iIyyuXcXXG8SgD7S503LVNMbC21qXgOfYy+Qe59aKzM66fEszh0kHDp7Cx+Q hk2GeoNeTT7qRYAcRKYIkvLLxQdzCMwPWGEwHVugRGyuuK56dLnh5HSfglyz6chGU1 DfGxvaymxVPzcafP2jRtWyQdVFuftkWZnObj+TYPf/OQNkd8ucpvWJQJsYkqQLnHSu oRqGECZ3hjiRw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ivan Orlov , Jens Axboe , Sasha Levin , josef@toxicpanda.com, linux-block@vger.kernel.org, nbd@other.debian.org Subject: [PATCH AUTOSEL 6.1 13/14] nbd: Fix debugfs_create_dir error checking Date: Sat, 20 May 2023 14:20:41 -0400 Message-Id: <20230520182044.836702-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230520182044.836702-1-sashal@kernel.org> References: <20230520182044.836702-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ivan Orlov [ Upstream commit 4913cfcf014c95f0437db2df1734472fd3e15098 ] The debugfs_create_dir function returns ERR_PTR in case of error, and the only correct way to check if an error occurred is 'IS_ERR' inline function. This patch will replace the null-comparison with IS_ERR. Signed-off-by: Ivan Orlov Link: https://lore.kernel.org/r/20230512130533.98709-1-ivan.orlov0322@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index e379ccc63c520..c92aef565a231 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1659,7 +1659,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) return -EIO; dir = debugfs_create_dir(nbd_name(nbd), nbd_dbg_dir); - if (!dir) { + if (IS_ERR(dir)) { dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s'\n", nbd_name(nbd)); return -EIO; @@ -1685,7 +1685,7 @@ static int nbd_dbg_init(void) struct dentry *dbg_dir; dbg_dir = debugfs_create_dir("nbd", NULL); - if (!dbg_dir) + if (IS_ERR(dbg_dir)) return -EIO; nbd_dbg_dir = dbg_dir; -- 2.39.2