[PATCH AUTOSEL 5.15 10/11] nbd: Fix debugfs_create_dir error checking

From: Sasha Levin
Date: Sat May 20 2023 - 14:25:28 EST


From: Ivan Orlov <ivan.orlov0322@xxxxxxxxx>

[ 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@xxxxxxxxx>
Link: https://lore.kernel.org/r/20230512130533.98709-1-ivan.orlov0322@xxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
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 ade8b839e4458..2a78530fed088 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1599,7 +1599,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;
@@ -1625,7 +1625,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