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 <hare@suse.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 2081a56b

block/blk-merge.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;