scsi: block: remove req->special

No users left.

Christoph Hellwig committed 8 years ago

Commit 69ed1751 parent b9f91993 files · +0 −5Browse files

Unified · Split

3 files

block/blk-mq.c +0 −1
drivers/scsi/sd.c +0 −2
include/linux/blkdev.h +0 −2

block/blk-mq.c+0−1

@@ -331,7 +331,6 @@ static struct request blk_mq_rq_ctx_init(struct blk_mq_alloc_data data, · 330 unmodified lines
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);

drivers/scsi/sd.c+0−2

@@ -1171,8 +1171,6 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) · 1170 unmodified lines
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;

include/linux/blkdev.h+0−2

@@ -216,8 +216,6 @@ struct request { · 215 unmodified lines
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;