Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acd5f476 authored by Ivan Orlov's avatar Ivan Orlov Committed by Greg Kroah-Hartman
Browse files

nbd: Fix debugfs_create_dir error checking 



[ 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: default avatarIvan Orlov <ivan.orlov0322@gmail.com>
Link: https://lore.kernel.org/r/20230512130533.98709-1-ivan.orlov0322@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 19ce1e1f

drivers/block/nbd.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) 
		return -EIO;

		return -EIO;





	dir = debugfs_create_dir(nbd_name(nbd), nbd_dbg_dir);

	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",

		dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s'\n",

			nbd_name(nbd));

			nbd_name(nbd));

		return -EIO;

		return -EIO;
@@ -1635,7 +1635,7 @@ static int nbd_dbg_init(void) 
	struct dentry *dbg_dir;

	struct dentry *dbg_dir;





	dbg_dir = debugfs_create_dir("nbd", NULL);

	dbg_dir = debugfs_create_dir("nbd", NULL);

	if (!dbg_dir)

	if (IS_ERR(dbg_dir))

		return -EIO;

		return -EIO;





	nbd_dbg_dir = dbg_dir;

	nbd_dbg_dir = dbg_dir;