block, bfq: remove wrong lock in bfq_requests_merged
authorFilippo Muzzini <filippo.muzzini@outlook.it>
Thu, 31 May 2018 13:23:11 +0000 (15:23 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 31 May 2018 14:42:27 +0000 (08:42 -0600)
commita12bffebc0c9d6a5851f062aaea3aa7c4adc6042
tree11e6b08516332e0f466882cb35f2a67c04a0b887
parent04c4950d5b373ba712d928592e05e73510785bca
block, bfq: remove wrong lock in bfq_requests_merged

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>
block/bfq-iosched.c