OSDN Git Service

scsi: block: remove req->special
authorChristoph Hellwig <hch@lst.de>
Fri, 9 Nov 2018 18:35:11 +0000 (19:35 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 6 Feb 2019 02:30:09 +0000 (21:30 -0500)
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>
block/blk-mq.c
drivers/scsi/sd.c
include/linux/blkdev.h

index 3ba37b9..502cbf9 100644 (file)
@@ -331,7 +331,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
        rq->nr_integrity_segments = 0;
 #endif
-       rq->special = NULL;
        /* tag was already set */
        rq->extra_len = 0;
        WRITE_ONCE(rq->deadline, 0);
index 3db9b1f..c124459 100644 (file)
@@ -1171,8 +1171,6 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
        if (ret != BLK_STS_OK)
                return ret;
 
-       WARN_ON_ONCE(cmd != rq->special);
-
        if (!scsi_device_online(sdp) || sdp->changed) {
                scmd_printk(KERN_ERR, cmd, "device offline or changed\n");
                return BLK_STS_IOERR;
index 338604d..fd1450d 100644 (file)
@@ -216,8 +216,6 @@ struct request {
        unsigned short write_hint;
        unsigned short ioprio;
 
-       void *special;          /* opaque pointer available for LLD use */
-
        unsigned int extra_len; /* length of alignment and padding */
 
        enum mq_rq_state state;