blk-merge: kill dead queue lock held check

axboe · axboe · commit 8b98a97f80ed · 2018-11-07T13:42:33.000-07:00
This is dead code, any queue reaching this part has mq_ops
attached.

Reviewed-by: Hannes Reinecke &lt;hare@suse.com&gt;
Tested-by: Ming Lei &lt;ming.lei@redhat.com&gt;
Reviewed-by: Omar Sandoval &lt;osandov@fb.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/block/blk-merge.c b/block/blk-merge.c
@@ -729,9 +729,6 @@ enum elv_merge blk_try_req_merge(struct request *req, struct request *next)
 static struct request *attempt_merge(struct request_queue *q,
 				     struct request *req, struct request *next)
 {
-	if (!q->mq_ops)
-		lockdep_assert_held(q->queue_lock);
-
 	if (!rq_mergeable(req) || !rq_mergeable(next))
 		return NULL;
 

Original file line number	Diff line number	Diff line change
`@@ -729,9 +729,6 @@ enum elv_merge blk_try_req_merge(struct request req, struct request next)`
`729`	`729`	`static struct request attempt_merge(struct request_queue q,`
`730`	`730`	`struct request req, struct request next)`
`731`	`731`	`{`
`732`		`- if (!q->mq_ops)`
`733`		`- lockdep_assert_held(q->queue_lock);`
`734`		`-`
`735`	`732`	`if (!rq_mergeable(req) \|\| !rq_mergeable(next))`
`736`	`733`	`return NULL;`
`737`	`734`