UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: lpfc: Fix upcall to bsg done in non-success cases 

The scsi transport fc bsg interface does not expect the bsg_job_done()
callback to be done if the bsg request call returns failure. Several of the
HST_VENDOR cases in the driver unconditionally call bsg_job_done()
regardless of the returning value.

Fix the code to only call bsg_job_done() if the call to lpfc_bsg_request()
will return success.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
James Smart 2019-08-14 16:56:59 -07:00 committed by Martin K. Petersen
parent 07b1b91412
commit 6db51abb8d
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/lpfc/lpfc_bsg.c
View File

@ -5448,7 +5448,9 @@ ras_job_error:
bsg_reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace */ /* complete the job back to userspace */
bsg_job_done(job, bsg_reply->result, bsg_reply->reply_payload_rcv_len); if (!rc)
bsg_job_done(job, bsg_reply->result,
bsg_reply->reply_payload_rcv_len);
return rc; return rc;
} }
@ -5527,6 +5529,7 @@ ras_job_error:
bsg_reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace */ /* complete the job back to userspace */
if (!rc)
bsg_job_done(job, bsg_reply->result, bsg_job_done(job, bsg_reply->result,
bsg_reply->reply_payload_rcv_len); bsg_reply->reply_payload_rcv_len);
@ -5588,7 +5591,9 @@ ras_job_error:
bsg_reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace */ /* complete the job back to userspace */
bsg_job_done(job, bsg_reply->result, bsg_reply->reply_payload_rcv_len); if (!rc)
bsg_job_done(job, bsg_reply->result,
bsg_reply->reply_payload_rcv_len);
return rc; return rc;
} }
@ -5670,7 +5675,9 @@ lpfc_bsg_get_ras_fwlog(struct bsg_job *job)
ras_job_error: ras_job_error:
bsg_reply->result = rc; bsg_reply->result = rc;
bsg_job_done(job, bsg_reply->result, bsg_reply->reply_payload_rcv_len); if (!rc)
bsg_job_done(job, bsg_reply->result,
bsg_reply->reply_payload_rcv_len);
return rc; return rc;
} }
@ -5741,6 +5748,7 @@ lpfc_get_trunk_info(struct bsg_job *job)
phba->sli4_hba.link_state.logical_speed / 1000; phba->sli4_hba.link_state.logical_speed / 1000;
job_error: job_error:
bsg_reply->result = rc; bsg_reply->result = rc;
if (!rc)
bsg_job_done(job, bsg_reply->result, bsg_job_done(job, bsg_reply->result,
bsg_reply->reply_payload_rcv_len); bsg_reply->reply_payload_rcv_len);
return rc; return rc;