diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-10-20 23:43:37 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-07 21:42:33 +0100 |
| commit | 8b98a97f80ed0345d254fb645e7c78c40ebed8a6 (patch) | |
| tree | eb112c4a2b21531480f7749ba8e3f1ee5843ed97 /block/blk-merge.c | |
| parent | block: remove req_no_special_merge() from merging code (diff) | |
| download | linux-8b98a97f80ed0345d254fb645e7c78c40ebed8a6.tar.xz linux-8b98a97f80ed0345d254fb645e7c78c40ebed8a6.zip | |
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>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 28c92b3098c0..a399b2fa8bc8 100644 --- 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; |