--- block/elevator.c

+++ block/elevator.c

@@ -353,7 +353,7 @@ static struct request *elv_rqhash_find(s

* RB-tree support functions for inserting/lookup/removal of requests

* in a sorted RB tree.

*/

-struct request *elv_rb_add(struct rb_root *root, struct request *rq)

+void elv_rb_add(struct rb_root *root, struct request *rq)

{

struct rb_node **p = &root->rb_node;

struct rb_node *parent = NULL;

@@ -365,15 +365,12 @@ struct request *elv_rb_add(struct rb_roo

if (blk_rq_pos(rq) < blk_rq_pos(__rq))

p = &(*p)->rb_left;

- else if (blk_rq_pos(rq) > blk_rq_pos(__rq))

+ else if (blk_rq_pos(rq) >= blk_rq_pos(__rq))

p = &(*p)->rb_right;

- else

- return __rq;

}

rb_link_node(&rq->rb_node, parent, p);

rb_insert_color(&rq->rb_node, root);

- return NULL;

}

EXPORT_SYMBOL(elv_rb_add);