scsi: core: Move the result field from struct scsi_request to struct scsi_cmnd

Prepare for removing the scsi_request structure by moving the result field
to struct scsi_cmnd.

Link: https://lore.kernel.org/r/20220224175552.988286-7-hch@lst.de
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 42c284b..aca94eb 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -718,7 +718,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
                rq->rq_flags |= RQF_QUIET;
 
        blk_execute_rq(rq, false);
-       if (scsi_req(rq)->result)
+       if (scmd->result)
                ret = -EIO;
 out:
        blk_mq_free_request(rq);

diff --git a/drivers/scsi/scsi_bsg.c b/drivers/scsi/scsi_bsg.c
index 4c697d0..8039c3c 100644 (file)
--- a/drivers/scsi/scsi_bsg.c
+++ b/drivers/scsi/scsi_bsg.c
@@ -12,7 +12,6 @@
 static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,
                fmode_t mode, unsigned int timeout)
 {
-       struct scsi_request *sreq;
        struct scsi_cmnd *scmd;
        struct request *rq;
        struct bio *bio;
@@ -33,7 +32,6 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,
        rq->timeout = timeout;
 
        ret = -ENOMEM;
-       sreq = scsi_req(rq);
        scmd = blk_mq_rq_to_pdu(rq);
        scmd->cmd_len = hdr->request_len;
        if (scmd->cmd_len > sizeof(scmd->cmnd)) {
@@ -66,10 +64,10 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,
        /*
         * fill in all the output members
         */
-       hdr->device_status = sreq->result & 0xff;
-       hdr->transport_status = host_byte(sreq->result);
+       hdr->device_status = scmd->result & 0xff;
+       hdr->transport_status = host_byte(scmd->result);
        hdr->driver_status = 0;
-       if (scsi_status_is_check_condition(sreq->result))
+       if (scsi_status_is_check_condition(scmd->result))
                hdr->driver_status = DRIVER_SENSE;
        hdr->info = 0;
        if (hdr->device_status || hdr->transport_status || hdr->driver_status)

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index b066fdd..04b7c70 100644 (file)
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -370,16 +370,15 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
                struct bio *bio)
 {
        struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
-       struct scsi_request *req = scsi_req(rq);
        int r, ret = 0;
 
        /*
         * fill in all the output members
         */
-       hdr->status = req->result & 0xff;
-       hdr->masked_status = status_byte(req->result);
+       hdr->status = scmd->result & 0xff;
+       hdr->masked_status = status_byte(scmd->result);
        hdr->msg_status = COMMAND_COMPLETE;
-       hdr->host_status = host_byte(req->result);
+       hdr->host_status = host_byte(scmd->result);
        hdr->driver_status = 0;
        if (scsi_status_is_check_condition(hdr->status))
                hdr->driver_status = DRIVER_SENSE;
@@ -611,7 +610,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode,
 
        blk_execute_rq(rq, false);
 
-       err = req->result & 0xff;       /* only 8 bit SCSI status */
+       err = scmd->result & 0xff;      /* only 8 bit SCSI status */
        if (err) {
                if (scmd->sense_len && scmd->sense_buffer) {
                        /* limit sense len for backward compatibility */

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index a9d8e80..0c41e02 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -261,7 +261,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
        if (sshdr)
                scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,
                                     sshdr);
-       ret = rq->result;
+       ret = scmd->result;
  out:
        blk_mq_free_request(req);
 
@@ -959,13 +959,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
        if (unlikely(result))   /* a nz result may or may not be an error */
                result = scsi_io_completion_nz_result(cmd, result, &blk_stat);
 
-       if (unlikely(blk_rq_is_passthrough(req))) {
-               /*
-                * scsi_result_to_blk_status may have reset the host_byte
-                */
-               scsi_req(req)->result = cmd->result;
-       }
-
        /*
         * Next deal with any sectors which we were able to correctly
         * handle.
@@ -1779,15 +1772,15 @@ out_put_budget:
                        ret = BLK_STS_DEV_RESOURCE;
                break;
        case BLK_STS_AGAIN:
-               scsi_req(req)->result = DID_BUS_BUSY << 16;
+               cmd->result = DID_BUS_BUSY << 16;
                if (req->rq_flags & RQF_DONTPREP)
                        scsi_mq_uninit_cmd(cmd);
                break;
        default:
                if (unlikely(!scsi_device_online(sdev)))
-                       scsi_req(req)->result = DID_NO_CONNECT << 16;
+                       cmd->result = DID_NO_CONNECT << 16;
                else
-                       scsi_req(req)->result = DID_ERROR << 16;
+                       cmd->result = DID_ERROR << 16;
                /*
                 * Make sure to release all allocated resources when
                 * we hit an error, as we will never see this command

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 3eaabfb..26a7535 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1325,7 +1325,6 @@ sg_rq_end_io(struct request *rq, blk_status_t status)
 {
        struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
        struct sg_request *srp = rq->end_io_data;
-       struct scsi_request *req = scsi_req(rq);
        Sg_device *sdp;
        Sg_fd *sfp;
        unsigned long iflags;
@@ -1345,7 +1344,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)
                pr_info("%s: device detaching\n", __func__);
 
        sense = scmd->sense_buffer;
-       result = req->result;
+       result = scmd->result;
        resid = scmd->resid_len;
 
        SCSI_LOG_TIMEOUT(4, sg_printk(KERN_INFO, sdp,

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 1d19dd1..494d00b 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -996,7 +996,7 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,
        bio = rq->bio;
 
        blk_execute_rq(rq, false);
-       if (scsi_req(rq)->result) {
+       if (scmd->result) {
                struct scsi_sense_hdr sshdr;
 
                scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 0546d2c..c8533ca 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -481,7 +481,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req)
                atomic64_add(ktime_to_ns(now), &STp->stats->tot_write_time);
                atomic64_add(ktime_to_ns(now), &STp->stats->tot_io_time);
                atomic64_inc(&STp->stats->write_cnt);
-               if (scsi_req(req)->result) {
+               if (scmd->result) {
                        atomic64_add(atomic_read(&STp->stats->last_write_size)
                                - STp->buffer->cmdstat.residual,
                                &STp->stats->write_byte_cnt);
@@ -495,7 +495,7 @@ static void st_do_stats(struct scsi_tape *STp, struct request *req)
                atomic64_add(ktime_to_ns(now), &STp->stats->tot_read_time);
                atomic64_add(ktime_to_ns(now), &STp->stats->tot_io_time);
                atomic64_inc(&STp->stats->read_cnt);
-               if (scsi_req(req)->result) {
+               if (scmd->result) {
                        atomic64_add(atomic_read(&STp->stats->last_read_size)
                                - STp->buffer->cmdstat.residual,
                                &STp->stats->read_byte_cnt);
@@ -516,11 +516,10 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)
 {
        struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(req);
        struct st_request *SRpnt = req->end_io_data;
-       struct scsi_request *rq = scsi_req(req);
        struct scsi_tape *STp = SRpnt->stp;
        struct bio *tmp;
 
-       STp->buffer->cmdstat.midlevel_result = SRpnt->result = rq->result;
+       STp->buffer->cmdstat.midlevel_result = SRpnt->result = scmd->result;
        STp->buffer->cmdstat.residual = scmd->resid_len;
 
        st_do_stats(STp, req);

diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index d5828da..5b23a0f 100644 (file)
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -1032,25 +1032,24 @@ static void pscsi_req_done(struct request *req, blk_status_t status)
 {
        struct se_cmd *cmd = req->end_io_data;
        struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(req);
-       int result = scsi_req(req)->result;
-       enum sam_status scsi_status = result & 0xff;
+       enum sam_status scsi_status = scmd->result & 0xff;
        u8 *cdb = cmd->priv;
 
        if (scsi_status != SAM_STAT_GOOD) {
                pr_debug("PSCSI Status Byte exception at cmd: %p CDB:"
-                       " 0x%02x Result: 0x%08x\n", cmd, cdb[0], result);
+                       " 0x%02x Result: 0x%08x\n", cmd, cdb[0], scmd->result);
        }
 
        pscsi_complete_cmd(cmd, scsi_status, scmd->sense_buffer);
 
-       switch (host_byte(result)) {
+       switch (host_byte(scmd->result)) {
        case DID_OK:
                target_complete_cmd_with_length(cmd, scsi_status,
                        cmd->data_length - scmd->resid_len);
                break;
        default:
                pr_debug("PSCSI Host Byte exception at cmd: %p CDB:"
-                       " 0x%02x Result: 0x%08x\n", cmd, cdb[0], result);
+                       " 0x%02x Result: 0x%08x\n", cmd, cdb[0], scmd->result);
                target_complete_cmd(cmd, SAM_STAT_CHECK_CONDITION);
                break;
        }

diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index 74be753..929c7bd 100644 (file)
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -5,7 +5,6 @@
 #include <linux/blk-mq.h>
 
 struct scsi_request {
-       int             result;
        int             retries;
 };