Commit dbb4c84d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a9a4ea11

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/scsi_bsg.c

+3 −5
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/scsi_ioctl.c

+4 −5
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/scsi_lib.c

+4 −11
Original line number Diff line number Diff line
@@ -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 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, 
			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

drivers/scsi/sg.c

+1 −2
Original line number Diff line number Diff line
@@ -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,