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>

diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index 6bbc38b1b4654d199eae48f5baaaa7f0c8ece299..6ca583bdde23ca4b7603da6901822e252e133d21 100644 (file)
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -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);

diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
index 25d763ae5d5a6a81a56dde06608e1c2236aa802b..e2a995a6e8e7308dfe06dc116109f83cb8b4a1a6 100644 (file)
--- a/drivers/scsi/qedi/qedi_fw.c
+++ b/drivers/scsi/qedi/qedi_fw.c
@@ -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",

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 2667bb95a4410c3a2846280abeffd3e385719d67..d25101c5e3b8f750b497d8a4354732863542e093 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -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;
 

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 38ddbbfe5f3c942069e01665554deda338686170..039c27c2d7b3a3cc2e8d6e0470e798d8144e5585 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -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