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 00327C77B7D for ; Sat, 20 May 2023 18:28:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232380AbjETS2T (ORCPT ); Sat, 20 May 2023 14:28:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232171AbjETS1O (ORCPT ); Sat, 20 May 2023 14:27:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB27F1BD4; Sat, 20 May 2023 11:26:35 -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 EE03C616DD; Sat, 20 May 2023 18:23:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 972D4C433D2; Sat, 20 May 2023 18:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684607024; bh=sFCQ4KYq+xqXpRBzo2EOBj2+f/Qf46ErrZESno4vpSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nG8gP6XikrDvizEQL1R5f96oyREa8QrGfJYVKxDcPXYbqQotsNhU7/gaTWVP4Uq0w 99Q9lTt8mqb+OYYMb7oSxsVzXK6VU9W/ylEFd8UabhOhsCF0eZIxmEAi99XctPh88e 6TY2xY8E3nK5gN6RHReEXvVLlEpZ+vX6sj+ZwaaAg2Kz70iygvHVtDrkMimfauiHJ2 6RLlPgfmrClu7IiN7IxFOz6Z9AdCbDMH4BDeAsiKScDXGTLQ5SQWeATMAp5mOLTNbo kjgmTHW8+lP5I3FSUtvzPygXmA3jcoRVJtqlqlalqJN2aJ5wksbSqP5g139A4tQprg jJqzac4+TvWoA== 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 5.10 7/8] nbd: Fix debugfs_create_dir error checking Date: Sat, 20 May 2023 14:23:11 -0400 Message-Id: <20230520182312.851751-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230520182312.851751-1-sashal@kernel.org> References: <20230520182312.851751-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 dbcd903ba128f..b6940f0a9c905 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1624,7 +1624,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; @@ -1650,7 +1650,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