diff mbox series

scsi: qla2xxx: Fix the NULL vs IS_ERR() bug for debugfs_create_dir()

Message ID 20230831140930.3166359-1-ruanjinjie@huawei.com
State New
Headers show
Series scsi: qla2xxx: Fix the NULL vs IS_ERR() bug for debugfs_create_dir() | expand

Commit Message

Jinjie Ruan Aug. 31, 2023, 2:09 p.m. UTC 
Since both debugfs_create_dir() and debugfs_create_file() return
ERR_PTR and never return NULL, So use IS_ERR() to check it
instead of checking NULL.

Fixes: 1e98fb0f9208 ("scsi: qla2xxx: Setup debugfs entries for remote ports")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 drivers/scsi/qla2xxx/qla_dfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Martin K. Petersen Sept. 5, 2023, 9:51 a.m. UTC | #1 
Jinjie,

> Since both debugfs_create_dir() and debugfs_create_file() return
> ERR_PTR and never return NULL, So use IS_ERR() to check it instead of
> checking NULL.

Applied to 6.6/scsi-staging, thanks!
Martin K. Petersen Sept. 14, 2023, 1:40 a.m. UTC | #2 
On Thu, 31 Aug 2023 22:09:29 +0800, Jinjie Ruan wrote:

> Since both debugfs_create_dir() and debugfs_create_file() return
> ERR_PTR and never return NULL, So use IS_ERR() to check it
> instead of checking NULL.
> 
> 

Applied to 6.6/scsi-fixes, thanks!

[1/1] scsi: qla2xxx: Fix the NULL vs IS_ERR() bug for debugfs_create_dir()
      https://git.kernel.org/mkp/scsi/c/d0b0822e32db
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
index f060e593685d..a7a364760b80 100644
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@ -116,7 +116,7 @@  qla2x00_dfs_create_rport(scsi_qla_host_t *vha, struct fc_port *fp)
 
 	sprintf(wwn, "pn-%016llx", wwn_to_u64(fp->port_name));
 	fp->dfs_rport_dir = debugfs_create_dir(wwn, vha->dfs_rport_root);
-	if (!fp->dfs_rport_dir)
+	if (IS_ERR(fp->dfs_rport_dir))
 		return;
 	if (NVME_TARGET(vha->hw, fp))
 		debugfs_create_file("dev_loss_tmo", 0600, fp->dfs_rport_dir,
@@ -708,14 +708,14 @@  qla2x00_dfs_setup(scsi_qla_host_t *vha)
 	if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha)) {
 		ha->tgt.dfs_naqp = debugfs_create_file("naqp",
 		    0400, ha->dfs_dir, vha, &dfs_naqp_ops);
-		if (!ha->tgt.dfs_naqp) {
+		if (IS_ERR(ha->tgt.dfs_naqp)) {
 			ql_log(ql_log_warn, vha, 0xd011,
 			       "Unable to create debugFS naqp node.\n");
 			goto out;
 		}
 	}
 	vha->dfs_rport_root = debugfs_create_dir("rports", ha->dfs_dir);
-	if (!vha->dfs_rport_root) {
+	if (IS_ERR(vha->dfs_rport_root)) {
 		ql_log(ql_log_warn, vha, 0xd012,
 		       "Unable to create debugFS rports node.\n");
 		goto out;