path: root/block/bfq-iosched.c
diff options
authorFilippo Muzzini <>2018-05-31 15:23:11 +0200
committerJens Axboe <>2018-05-31 08:42:27 -0600
commita12bffebc0c9d6a5851f062aaea3aa7c4adc6042 (patch)
tree11e6b08516332e0f466882cb35f2a67c04a0b887 /block/bfq-iosched.c
parent04c4950d5b373ba712d928592e05e73510785bca (diff)
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 <> Signed-off-by: Paolo Valente <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/bfq-iosched.c')
1 files changed, 0 insertions, 2 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b622e73..02dd4c8 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -1847,7 +1847,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
@@ -1872,7 +1871,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);
bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags);