diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-03-22 15:01:49 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-03-22 20:16:56 -0600 |
| commit | 7642747d674aff1f7cfe74ad9af7e9b12ab1d5ee (patch) | |
| tree | 48036419f49ccc36d8f39ab97532444c80b0eec2 | |
| parent | d01b2dcb441b14c3b860d3d16ecb9ed6ed4ba7fb (diff) | |
| download | linux-stable-7642747d674aff1f7cfe74ad9af7e9b12ab1d5ee.tar.gz linux-stable-7642747d674aff1f7cfe74ad9af7e9b12ab1d5ee.tar.bz2 linux-stable-7642747d674aff1f7cfe74ad9af7e9b12ab1d5ee.zip | |
blk-mq: remove BLK_MQ_F_DEFER_ISSUE
This flag was never used since it was introduced.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-mq.c | 8 | ||||
| -rw-r--r-- | include/linux/blk-mq.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 5ff66f203cd0..998c041358f2 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1531,13 +1531,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) } plug = current->plug; - /* - * If the driver supports defer issued based on 'last', then - * queue it up like normal since we can potentially save some - * CPU this way. - */ - if (((plug && !blk_queue_nomerges(q)) || is_sync) && - !(data.hctx->flags & BLK_MQ_F_DEFER_ISSUE)) { + if (((plug && !blk_queue_nomerges(q)) || is_sync)) { struct request *old_rq = NULL; blk_mq_bio_to_request(rq, bio); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index b296a9006117..5b3e201c8d4f 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -152,7 +152,6 @@ enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_TAG_SHARED = 1 << 1, BLK_MQ_F_SG_MERGE = 1 << 2, - BLK_MQ_F_DEFER_ISSUE = 1 << 4, BLK_MQ_F_BLOCKING = 1 << 5, BLK_MQ_F_NO_SCHED = 1 << 6, BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, |