diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-30 03:52:30 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-04-05 17:51:37 -0400 |
commit | b710a480554f2be682bac3cb59b0e085ba3d644b (patch) | |
tree | bd1b9d5080bca2b35c861ddbc98d4116445bebfb /block/blk-flush.c | |
parent | 8182924bc5850281985d73c312876746acd390b5 (diff) |
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.c | 4 |
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) | |||
261 | q->flush_rq.end_io = flush_end_io; | 261 | q->flush_rq.end_io = flush_end_io; |
262 | 262 | ||
263 | q->flush_pending_idx ^= 1; | 263 | q->flush_pending_idx ^= 1; |
264 | elv_insert(q, &q->flush_rq, ELEVATOR_INSERT_REQUEUE); | 264 | __elv_add_request(q, &q->flush_rq, ELEVATOR_INSERT_REQUEUE); |
265 | return true; | 265 | return true; |
266 | } | 266 | } |
267 | 267 | ||
@@ -281,7 +281,7 @@ static void flush_data_end_io(struct request *rq, int error) | |||
281 | * blk_insert_flush - insert a new FLUSH/FUA request | 281 | * blk_insert_flush - insert a new FLUSH/FUA request |
282 | * @rq: request to insert | 282 | * @rq: request to insert |
283 | * | 283 | * |
284 | * To be called from elv_insert() for %ELEVATOR_INSERT_FLUSH insertions. | 284 | * To be called from __elv_add_request() for %ELEVATOR_INSERT_FLUSH insertions. |
285 | * @rq is being submitted. Analyze what needs to be done and put it on the | 285 | * @rq is being submitted. Analyze what needs to be done and put it on the |
286 | * right queue. | 286 | * right queue. |
287 | * | 287 | * |