Commit 2081a56b authored by Jens Axboe's avatar Jens Axboe

block: remove req_no_special_merge() from merging code

It'll always be false at this point, just remove it.
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 820efc62
...@@ -595,17 +595,6 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req, ...@@ -595,17 +595,6 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,
return ll_new_hw_segment(q, req, bio); return ll_new_hw_segment(q, req, bio);
} }
/*
* blk-mq uses req->special to carry normal driver per-request payload, it
* does not indicate a prepared command that we cannot merge with.
*/
static bool req_no_special_merge(struct request *req)
{
struct request_queue *q = req->q;
return !q->mq_ops && req->special;
}
static bool req_attempt_discard_merge(struct request_queue *q, struct request *req, static bool req_attempt_discard_merge(struct request_queue *q, struct request *req,
struct request *next) struct request *next)
{ {
...@@ -631,13 +620,6 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, ...@@ -631,13 +620,6 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,
unsigned int seg_size = unsigned int seg_size =
req->biotail->bi_seg_back_size + next->bio->bi_seg_front_size; req->biotail->bi_seg_back_size + next->bio->bi_seg_front_size;
/*
* First check if the either of the requests are re-queued
* requests. Can't merge them if they are.
*/
if (req_no_special_merge(req) || req_no_special_merge(next))
return 0;
if (req_gap_back_merge(req, next->bio)) if (req_gap_back_merge(req, next->bio))
return 0; return 0;
...@@ -757,8 +739,7 @@ static struct request *attempt_merge(struct request_queue *q, ...@@ -757,8 +739,7 @@ static struct request *attempt_merge(struct request_queue *q,
return NULL; return NULL;
if (rq_data_dir(req) != rq_data_dir(next) if (rq_data_dir(req) != rq_data_dir(next)
|| req->rq_disk != next->rq_disk || req->rq_disk != next->rq_disk)
|| req_no_special_merge(next))
return NULL; return NULL;
if (req_op(req) == REQ_OP_WRITE_SAME && if (req_op(req) == REQ_OP_WRITE_SAME &&
...@@ -885,8 +866,8 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) ...@@ -885,8 +866,8 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
if (bio_data_dir(bio) != rq_data_dir(rq)) if (bio_data_dir(bio) != rq_data_dir(rq))
return false; return false;
/* must be same device and not a special request */ /* must be same device */
if (rq->rq_disk != bio->bi_disk || req_no_special_merge(rq)) if (rq->rq_disk != bio->bi_disk)
return false; return false;
/* only merge integrity protected bio into ditto rq */ /* only merge integrity protected bio into ditto rq */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment