diff options
author | Christoph Hellwig <hch@lst.de> | 2018-12-06 11:01:10 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-02-05 21:30:27 -0500 |
commit | 8b3238cabd50e2715b6544e724e74685209b190a (patch) | |
tree | dd0a2758ec0c8bd9066874d448e9afe713b6f359 /block | |
parent | 69ed175c195595c73901e18366cb0ebeaeb68b8a (diff) |
scsi: block: remove bidi support
Unused now, and another field in struct request bites the dust.
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>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-mq-debugfs.c | 1 | ||||
-rw-r--r-- | block/blk-mq.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 90d68760af08..ac832547160a 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c | |||
@@ -115,7 +115,6 @@ static int queue_pm_only_show(void *data, struct seq_file *m) | |||
115 | static const char *const blk_queue_flag_name[] = { | 115 | static const char *const blk_queue_flag_name[] = { |
116 | QUEUE_FLAG_NAME(STOPPED), | 116 | QUEUE_FLAG_NAME(STOPPED), |
117 | QUEUE_FLAG_NAME(DYING), | 117 | QUEUE_FLAG_NAME(DYING), |
118 | QUEUE_FLAG_NAME(BIDI), | ||
119 | QUEUE_FLAG_NAME(NOMERGES), | 118 | QUEUE_FLAG_NAME(NOMERGES), |
120 | QUEUE_FLAG_NAME(SAME_COMP), | 119 | QUEUE_FLAG_NAME(SAME_COMP), |
121 | QUEUE_FLAG_NAME(FAIL_IO), | 120 | QUEUE_FLAG_NAME(FAIL_IO), |
diff --git a/block/blk-mq.c b/block/blk-mq.c index 502cbf964a3b..820d131a6893 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -339,7 +339,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, | |||
339 | 339 | ||
340 | rq->end_io = NULL; | 340 | rq->end_io = NULL; |
341 | rq->end_io_data = NULL; | 341 | rq->end_io_data = NULL; |
342 | rq->next_rq = NULL; | ||
343 | 342 | ||
344 | data->ctx->rq_dispatched[op_is_sync(op)]++; | 343 | data->ctx->rq_dispatched[op_is_sync(op)]++; |
345 | refcount_set(&rq->ref, 1); | 344 | refcount_set(&rq->ref, 1); |
@@ -549,8 +548,6 @@ inline void __blk_mq_end_request(struct request *rq, blk_status_t error) | |||
549 | rq_qos_done(rq->q, rq); | 548 | rq_qos_done(rq->q, rq); |
550 | rq->end_io(rq, error); | 549 | rq->end_io(rq, error); |
551 | } else { | 550 | } else { |
552 | if (unlikely(blk_bidi_rq(rq))) | ||
553 | blk_mq_free_request(rq->next_rq); | ||
554 | blk_mq_free_request(rq); | 551 | blk_mq_free_request(rq); |
555 | } | 552 | } |
556 | } | 553 | } |