From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ivan Orlov <ivan.orlov0322@gmail.com>,
Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>,
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 [thread overview]
Message-ID: <20230520182044.836702-13-sashal@kernel.org> (raw)
In-Reply-To: <20230520182044.836702-1-sashal@kernel.org>
From: Ivan Orlov <ivan.orlov0322@gmail.com>
[ 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 <ivan.orlov0322@gmail.com>
Link: https://lore.kernel.org/r/20230512130533.98709-1-ivan.orlov0322@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2023-05-20 18:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 18:20 [PATCH AUTOSEL 6.1 01/14] drm/ast: Fix ARM compatibility Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 02/14] btrfs: abort transaction when sibling keys check fails for leaves Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 03/14] ARM: 9295/1: unwind:fix unwind abort for uleb128 case Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 04/14] hwmon: (k10temp) Add PCI ID for family 19, model 78h Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 05/14] media: rcar-vin: Select correct interrupt mode for V4L2_FIELD_ALTERNATE Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 06/14] platform/x86: intel_scu_pcidrv: Add back PCI ID for Medfield Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 07/14] platform/mellanox: fix potential race in mlxbf-tmfifo driver Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 08/14] gfs2: Don't deref jdesc in evict Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 09/14] drm/amdgpu: set gfx9 onwards APU atomics support to be true Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 10/14] fbdev: imsttfb: Fix use after free bug in imsttfb_probe Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 11/14] fbdev: modedb: Add 1920x1080 at 60 Hz video mode Sasha Levin
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 12/14] fbdev: stifb: Fix info entry in sti_struct on error path Sasha Levin
2023-05-20 18:20 ` Sasha Levin [this message]
2023-05-20 18:20 ` [PATCH AUTOSEL 6.1 14/14] block/rnbd: replace REQ_OP_FLUSH with REQ_OP_WRITE Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230520182044.836702-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=ivan.orlov0322@gmail.com \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).