blk-merge: kill dead queue lock held check

This is dead code, any queue reaching this part has mq_ops
attached.

Reviewed-by: Hannes Reinecke <[email protected]>
Tested-by: Ming Lei <[email protected]>
Reviewed-by: Omar Sandoval <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 28c92b3098c0b30ec3366a786c079d35cf70f444..a399b2fa8bc8f0c89ce82af0a6daa0d1360656ef 100644 (file)
--- 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;