Commit c8ff919f authored by Ivan Orlov's avatar Ivan Orlov Committed by Zhong Jinghua
Browse files

nbd: Fix debugfs_create_dir error checking 

stable inclusion
from stable-v5.10.183
commit 01c3d3064975944a2edefef6e2f99db3244ca999
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7FF4R

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=01c3d3064975944a2edefef6e2f99db3244ca999



--------------------------------

[ Upstream commit 4913cfcf ]

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>
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huaweicloud.com>
parent 80e7361a

drivers/block/nbd.c

+2 −2
Original line number Diff line number Diff line
@@ -1719,7 +1719,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;
@@ -1745,7 +1745,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;