block, bfq: remove wrong lock in bfq_requests_merged

[ Upstream commit a12bffebc0c9d6a5851f062aaea3aa7c4adc6042 ]

In bfq_requests_merged(), there is a deadlock because the lock on
bfqq->bfqd->lock is held by the calling function, but the code of
this function tries to grab the lock again.

This deadlock is currently hidden by another bug (fixed by next commit
for this source file), which causes the body of bfq_requests_merged()
to be never executed.

This commit removes the deadlock by removing the lock/unlock pair.

Signed-off-by: Filippo Muzzini <filippo.muzzini@outlook.it>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 771ae9730ac6869430f8f8d196eb804d9f356053..1f0951d364240a0b31fd7708d8283488e1355b77 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -1898,7 +1898,6 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,
 
        if (!RB_EMPTY_NODE(&rq->rb_node))
                goto end;
-       spin_lock_irq(&bfqq->bfqd->lock);
 
        /*
         * If next and rq belong to the same bfq_queue and next is older
@@ -1923,7 +1922,6 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,
        bfq_remove_request(q, next);
        bfqg_stats_update_io_remove(bfqq_group(bfqq), next->cmd_flags);
 
-       spin_unlock_irq(&bfqq->bfqd->lock);
 end:
        bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags);
 }