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

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig 2018-11-08 09:32:43 +01:00 committed by Martin K. Petersen
parent ae3d56d815
commit b9f9199299
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/qedf/qedf_io.c
View File

@ -1128,12 +1128,6 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,
return; 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) { if (!sc_cmd->request->q) {
QEDF_WARN(&(qedf->dbg_ctx), "request->q is NULL so request " QEDF_WARN(&(qedf->dbg_ctx), "request->q is NULL so request "
"is not valid, sc_cmd=%p.\n", sc_cmd); "is not valid, sc_cmd=%p.\n", sc_cmd);

7
drivers/scsi/qedi/qedi_fw.c
View File

@ -616,13 +616,6 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi,
goto error; 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) { if (!sc_cmd->request->q) {
QEDI_WARN(&qedi->dbg_ctx, QEDI_WARN(&qedi->dbg_ctx,
"request->q is NULL so request is not valid, sc_cmd=%p.\n", "request->q is NULL so request is not valid, sc_cmd=%p.\n",

3
drivers/scsi/scsi_lib.c
View File

@ -1566,10 +1566,7 @@ static blk_status_t scsi_mq_prep_fn(struct request *req)
scsi_init_command(sdev, cmd); scsi_init_command(sdev, cmd);
req->special = cmd;
cmd->request = req; cmd->request = req;
cmd->tag = req->tag; cmd->tag = req->tag;
cmd->prot_op = SCSI_PROT_NORMAL; cmd->prot_op = SCSI_PROT_NORMAL;

1
drivers/scsi/sr.c
View File

@ -394,7 +394,6 @@ static blk_status_t sr_init_command(struct scsi_cmnd *SCpnt)
ret = scsi_init_io(SCpnt); ret = scsi_init_io(SCpnt);
if (ret != BLK_STS_OK) if (ret != BLK_STS_OK)
goto out; goto out;
WARN_ON_ONCE(SCpnt != rq->special);
cd = scsi_cd(rq->rq_disk); cd = scsi_cd(rq->rq_disk);
/* from here on until we're complete, any goto out /* from here on until we're complete, any goto out