aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-11-09 13:35:11 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2019-02-05 21:30:09 -0500
commit69ed175c195595c73901e18366cb0ebeaeb68b8a (patch)
tree3ba504f46d45401bd82f7257aa43b9c9a63e0e2c
parentb9f91992991b27e72d93113095b9b92919ed0b71 (diff)
scsi: block: remove req->special
No users left. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--block/blk-mq.c1
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--include/linux/blkdev.h2
3 files changed, 0 insertions, 5 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3ba37b9e15e9..502cbf964a3b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -331,7 +331,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
331#if defined(CONFIG_BLK_DEV_INTEGRITY) 331#if defined(CONFIG_BLK_DEV_INTEGRITY)
332 rq->nr_integrity_segments = 0; 332 rq->nr_integrity_segments = 0;
333#endif 333#endif
334 rq->special = NULL;
335 /* tag was already set */ 334 /* tag was already set */
336 rq->extra_len = 0; 335 rq->extra_len = 0;
337 WRITE_ONCE(rq->deadline, 0); 336 WRITE_ONCE(rq->deadline, 0);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3db9b1fe7516..c124459041dc 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1171,8 +1171,6 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
1171 if (ret != BLK_STS_OK) 1171 if (ret != BLK_STS_OK)
1172 return ret; 1172 return ret;
1173 1173
1174 WARN_ON_ONCE(cmd != rq->special);
1175
1176 if (!scsi_device_online(sdp) || sdp->changed) { 1174 if (!scsi_device_online(sdp) || sdp->changed) {
1177 scmd_printk(KERN_ERR, cmd, "device offline or changed\n"); 1175 scmd_printk(KERN_ERR, cmd, "device offline or changed\n");
1178 return BLK_STS_IOERR; 1176 return BLK_STS_IOERR;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 338604dff7d0..fd1450d53f1c 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -216,8 +216,6 @@ struct request {
216 unsigned short write_hint; 216 unsigned short write_hint;
217 unsigned short ioprio; 217 unsigned short ioprio;
218 218
219 void *special; /* opaque pointer available for LLD use */
220
221 unsigned int extra_len; /* length of alignment and padding */ 219 unsigned int extra_len; /* length of alignment and padding */
222 220
223 enum mq_rq_state state; 221 enum mq_rq_state state;