block, bfq: remove case of redirected bic from insert_request

Before commit 18e5a57d7987 ("block, bfq: postpone rq preparation to
insert or merge"), the destination queue for a request was chosen by a
different hook than the one that then inserted the request. So, between
the execution of the two hooks, the bic of the process generating the
request could happen to be redirected to a different bfq_queue. As a
consequence, the destination bfq_queue stored in the request could be
wrong. Such an event does not need to ba handled any longer.

Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b0e8006475be7489161cb101afb181108faea28d..a9275ed577261cbc1c18cae94dcd99400eefac89 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -4633,8 +4633,6 @@ static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
        bool waiting, idle_timer_disabled = false;
 
        if (new_bfqq) {
-               if (bic_to_bfqq(RQ_BIC(rq), 1) != bfqq)
-                       new_bfqq = bic_to_bfqq(RQ_BIC(rq), 1);
                /*
                 * Release the request's reference to the old bfqq
                 * and make sure one is taken to the shared queue.