From: YueHaibing <yuehaibing@huawei.com>
To: <hare@suse.de>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH] scsi: libfc: Fix passing zero to 'PTR_ERR' warning
Date: Tue, 18 Aug 2020 19:42:35 +0800 [thread overview]
Message-ID: <20200818114235.51052-1-yuehaibing@huawei.com> (raw)
drivers/scsi/libfc/fc_disc.c:304
fc_disc_error() warn: passing zero to 'PTR_ERR'
fc_disc_error() expect a ERR_PTR pointer, so pass
ERR_PTR(err) to fix this.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/scsi/libfc/fc_disc.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index d8cbc9c0e766..1077fcff4d50 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -343,6 +343,7 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc)
{
struct fc_frame *fp;
struct fc_lport *lport = fc_disc_lport(disc);
+ int err;
lockdep_assert_held(&disc->disc_mutex);
@@ -356,8 +357,10 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc)
fp = fc_frame_alloc(lport,
sizeof(struct fc_ct_hdr) +
sizeof(struct fc_ns_gid_ft));
- if (!fp)
+ if (!fp) {
+ err = -ENOMEM;
goto err;
+ }
if (lport->tt.elsct_send(lport, 0, fp,
FC_NS_GPN_FT,
@@ -365,7 +368,7 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc)
disc, 3 * lport->r_a_tov))
return;
err:
- fc_disc_error(disc, NULL);
+ fc_disc_error(disc, ERR_PTR(err));
}
/**
--
2.17.1
next reply other threads:[~2020-08-18 11:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 11:42 YueHaibing [this message]
2020-08-18 16:24 ` [PATCH] scsi: libfc: Fix passing zero to 'PTR_ERR' warning kernel test robot
2020-08-19 2:05 ` [PATCH v2] " YueHaibing
2020-08-21 2:21 ` Martin K. Petersen
2020-08-21 11:03 ` Yuehaibing
2020-08-21 11:02 ` [PATCH v3] " YueHaibing
2020-08-21 12:23 ` [PATCH] " Dan Carpenter
2020-09-09 13:54 ` [PATCH v4] " YueHaibing
2020-09-15 21:52 ` Martin K. Petersen
2020-09-22 3:57 ` Martin K. Petersen
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=20200818114235.51052-1-yuehaibing@huawei.com \
--to=yuehaibing@huawei.com \
--cc=hare@suse.de \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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).