commit b710a480554f2be682bac3cb59b0e085ba3d644b
author Jens Axboe <jaxboe@fusionio.com> Wed Mar 30 09:52:30 2011 +0200
committer Jens Axboe <jaxboe@fusionio.com> Tue Apr 05 23:51:37 2011 +0200
tree bd1b9d5080bca2b35c861ddbc98d4116445bebfb
parent 8182924bc5850281985d73c312876746acd390b5

block: get rid of elv_insert() interface

Merge it with __elv_add_request(), it's pretty pointless to
have a function with only two callers. The main interface
is elv_add_request()/__elv_add_request().

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

block/blk-flush.c

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 93d5fd8..d6275cb 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -261,7 +261,7 @@
 	q->flush_rq.end_io = flush_end_io;
 
 	q->flush_pending_idx ^= 1;
-	elv_insert(q, &q->flush_rq, ELEVATOR_INSERT_REQUEUE);
+	__elv_add_request(q, &q->flush_rq, ELEVATOR_INSERT_REQUEUE);
 	return true;
 }
 
@@ -281,7 +281,7 @@
  * blk_insert_flush - insert a new FLUSH/FUA request
  * @rq: request to insert
  *
- * To be called from elv_insert() for %ELEVATOR_INSERT_FLUSH insertions.
+ * To be called from __elv_add_request() for %ELEVATOR_INSERT_FLUSH insertions.
  * @rq is being submitted.  Analyze what needs to be done and put it on the
  * right queue.
  *