[PATCH 047/117] fc: Convert to the scsi_status union

Bart Van Assche
2021-04-20T00:09:58Z

Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: James Smart <james.smart@broadcom.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/scsi_transport_fc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 2d4db2ae45db..d21301b4c7b2 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -4153,9 +4153,9 @@ static int fc_bsg_host_dispatch(struct Scsi_Host *shost, struct bsg_job *job)
/* return the errno failure code as the only status */
BUG_ON(job->reply_len < sizeof(uint32_t));
bsg_reply->reply_payload_rcv_len = 0;
- bsg_reply->result = ret;
+ bsg_reply->status.combined = ret;
job->reply_len = sizeof(uint32_t);
- bsg_job_done(job, bsg_reply->result,
+ bsg_job_done(job, bsg_reply->status.combined,
bsg_reply->reply_payload_rcv_len);
return 0;
}
@@ -4222,9 +4222,9 @@ static int fc_bsg_rport_dispatch(struct Scsi_Host *shost, struct bsg_job *job)
/* return the errno failure code as the only status */
BUG_ON(job->reply_len < sizeof(uint32_t));
bsg_reply->reply_payload_rcv_len = 0;
- bsg_reply->result = ret;
+ bsg_reply->status.combined = ret;
job->reply_len = sizeof(uint32_t);
- bsg_job_done(job, bsg_reply->result,
+ bsg_job_done(job, bsg_reply->status.combined,
bsg_reply->reply_payload_rcv_len);
return 0;
}