path: root/block/elevator.c
diff options
authorColin Ian King <>2018-11-14 22:17:05 +0000
committerJens Axboe <>2018-11-14 15:21:25 -0700
commit98c98cb770da9469ee868f21299b2ba21fe438ac (patch)
treee66d66d22708c1f351364140bda4650daaadaa8a /block/elevator.c
parent30e066286e232772cad72c87008a958e23e40a33 (diff)
block: clean up dead code that is now redundant
The boolean next_sorted is set to false and is never changed, hence the code that checks if it is true is dead code and can now be removed. This dead code occurred from a previous commit that cleaned up the elevator and removed the setting of next_sorted to true. Detected by CoverityScan, CID#1475401 ("'Constant' variable guards dead code") Fixes: a1ce35fa4985 ("block: remove dead elevator code") Signed-off-by: Colin Ian King <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/elevator.c')
1 files changed, 0 insertions, 7 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 19351ffa56b1..796436270682 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -394,18 +394,11 @@ void elv_merge_requests(struct request_queue *q, struct request *rq,
struct request *next)
struct elevator_queue *e = q->elevator;
- bool next_sorted = false;
if (e->type->ops.requests_merged)
e->type->ops.requests_merged(q, rq, next);
elv_rqhash_reposition(q, rq);
- if (next_sorted) {
- elv_rqhash_del(q, next);
- q->nr_sorted--;
- }
q->last_merge = rq;