diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index aa32e56cb385..dd527bab57c2 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1845,8 +1845,6 @@ static void bfq_request_merged(struct request_queue *q, struct request *req, * exploits this hook to address the following issue: if 'next' has a * fifo_time lower that rq, then the fifo_time of rq must be set to * the value of 'next', to not forget the greater age of 'next'. - * Moreover 'next' may be in a bfq_queue, in this case it must be - * removed. * * NOTE: in this function we assume that rq is in a bfq_queue, basing * on that rq is picked from the hash table q->elevator->hash, which, @@ -1881,11 +1879,6 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq, if (bfqq->next_rq == next) bfqq->next_rq = rq; - if (!RB_EMPTY_NODE(&next->rb_node)) { - bfq_remove_request(q, next); - bfqg_stats_update_io_remove(bfqq_group(bfqq), next->cmd_flags); - } - bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags); } |