Re: [PATCH 27/28] blk-merge: kill dead queue lock held check

[Hannes Reinecke <hare@xxxxxxx>]

On 10/25/18 11:10 PM, Jens Axboe wrote:
> This is dead code, any queue reaching this part has mq_ops
> attached.
>
> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
> ---
>   block/blk-merge.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 3561dcce2260..0128284bded4 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -704,9 +704,6 @@ static void blk_account_io_merge(struct request *req)
>   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;
>   
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>

Cheers,

Hannes