summaryrefslogtreecommitdiffstats
path: root/block/blk-flush.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-30 09:52:30 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-04-05 23:51:37 +0200
commitb710a480554f2be682bac3cb59b0e085ba3d644b (patch)
treebd1b9d5080bca2b35c861ddbc98d4116445bebfb /block/blk-flush.c
parent8182924bc5850281985d73c312876746acd390b5 (diff)
downloadlinux-b710a480554f2be682bac3cb59b0e085ba3d644b.tar.gz
linux-b710a480554f2be682bac3cb59b0e085ba3d644b.tar.bz2
linux-b710a480554f2be682bac3cb59b0e085ba3d644b.zip
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>
Diffstat (limited to 'block/blk-flush.c')
-rw-r--r--block/blk-flush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 93d5fd8e51eb..d6275cbbaf35 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -261,7 +261,7 @@ static bool blk_kick_flush(struct request_queue *q)
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 @@ static void flush_data_end_io(struct request *rq, int error)
* 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.
*