Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

scsi: stop setting up request->special 



No more need in a blk-mq world where the scsi command and request are
allocated together.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ae3d56d8

drivers/scsi/qedf/qedf_io.c

+0 −6
Original line number Diff line number Diff line
@@ -1128,12 +1128,6 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, 
		return;

	}



	if (!sc_cmd->request->special) {

		QEDF_WARN(&(qedf->dbg_ctx), "request->special is NULL so "

		    "request not valid, sc_cmd=%p.\n", sc_cmd);

		return;

	}



	if (!sc_cmd->request->q) {

		QEDF_WARN(&(qedf->dbg_ctx), "request->q is NULL so request "

		   "is not valid, sc_cmd=%p.\n", sc_cmd);

drivers/scsi/qedi/qedi_fw.c

+0 −7
Original line number Diff line number Diff line
@@ -616,13 +616,6 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi, 
		goto error;

	}



	if (!sc_cmd->request->special) {

		QEDI_WARN(&qedi->dbg_ctx,

			  "request->special is NULL so request not valid, sc_cmd=%p.\n",

			  sc_cmd);

		goto error;

	}



	if (!sc_cmd->request->q) {

		QEDI_WARN(&qedi->dbg_ctx,

			  "request->q is NULL so request is not valid, sc_cmd=%p.\n",

drivers/scsi/scsi_lib.c

+0 −3
Original line number Diff line number Diff line
@@ -1566,10 +1566,7 @@ static blk_status_t scsi_mq_prep_fn(struct request *req) 


	scsi_init_command(sdev, cmd);



	req->special = cmd;



	cmd->request = req;



	cmd->tag = req->tag;

	cmd->prot_op = SCSI_PROT_NORMAL;

drivers/scsi/sr.c

+0 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ static blk_status_t sr_init_command(struct scsi_cmnd *SCpnt) 
	ret = scsi_init_io(SCpnt);

	if (ret != BLK_STS_OK)

		goto out;

	WARN_ON_ONCE(SCpnt != rq->special);

	cd = scsi_cd(rq->rq_disk);



	/* from here on until we're complete, any goto out