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 <colin.king@canonical.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/elevator.c b/block/elevator.c
index 19351ffa56b1b7af775fdc7b78d869ae3941fd9e..7964362706827a346b34caca15a5ec735f9b4215 100644 (file)
--- 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;
 }