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>
This commit is contained in:
Родитель
2081a56bfa
Коммит
8b98a97f80
|
@ -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,
|
static struct request *attempt_merge(struct request_queue *q,
|
||||||
struct request *req, struct request *next)
|
struct request *req, struct request *next)
|
||||||
{
|
{
|
||||||
if (!q->mq_ops)
|
|
||||||
lockdep_assert_held(q->queue_lock);
|
|
||||||
|
|
||||||
if (!rq_mergeable(req) || !rq_mergeable(next))
|
if (!rq_mergeable(req) || !rq_mergeable(next))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче