diff mbox series

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

Message ID 20181025211039.11559-28-axboe@kernel.dk (mailing list archive)
State Superseded
Headers show
Series blk-mq driver conversions and legacy path removal | expand

Commit Message

Jens Axboe Oct. 25, 2018, 9:10 p.m. UTC 
This is dead code, any queue reaching this part has mq_ops
attached.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 block/blk-merge.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Hannes Reinecke Oct. 29, 2018, 7:12 a.m. UTC | #1 
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@kernel.dk>
> ---
>   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@suse.com>

Cheers,

Hannes
diff mbox series

Patch

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;