aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/blk-barrier.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 7ce0a32a21fd..eefbde835308 100644
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -13,7 +13,6 @@
13 * blk_queue_ordered - does this queue support ordered writes 13 * blk_queue_ordered - does this queue support ordered writes
14 * @q: the request queue 14 * @q: the request queue
15 * @ordered: one of QUEUE_ORDERED_* 15 * @ordered: one of QUEUE_ORDERED_*
16 * @prepare_flush_fn: rq setup helper for cache flush ordered writes
17 * 16 *
18 * Description: 17 * Description:
19 * For journalled file systems, doing ordered writes on a commit 18 * For journalled file systems, doing ordered writes on a commit
@@ -22,8 +21,7 @@
22 * feature should call this function and indicate so. 21 * feature should call this function and indicate so.
23 * 22 *
24 **/ 23 **/
25int blk_queue_ordered(struct request_queue *q, unsigned ordered, 24int blk_queue_ordered(struct request_queue *q, unsigned ordered)
26 prepare_flush_fn *prepare_flush_fn)
27{ 25{
28 if (ordered != QUEUE_ORDERED_NONE && 26 if (ordered != QUEUE_ORDERED_NONE &&
29 ordered != QUEUE_ORDERED_DRAIN && 27 ordered != QUEUE_ORDERED_DRAIN &&
@@ -38,7 +36,6 @@ int blk_queue_ordered(struct request_queue *q, unsigned ordered,
38 36
39 q->ordered = ordered; 37 q->ordered = ordered;
40 q->next_ordered = ordered; 38 q->next_ordered = ordered;
41 q->prepare_flush_fn = prepare_flush_fn;
42 39
43 return 0; 40 return 0;
44} 41}
@@ -140,8 +137,6 @@ static void queue_flush(struct request_queue *q, unsigned which)
140 rq->cmd_flags = REQ_HARDBARRIER | REQ_FLUSH; 137 rq->cmd_flags = REQ_HARDBARRIER | REQ_FLUSH;
141 rq->rq_disk = q->bar_rq.rq_disk; 138 rq->rq_disk = q->bar_rq.rq_disk;
142 rq->end_io = end_io; 139 rq->end_io = end_io;
143 if (q->prepare_flush_fn)
144 q->prepare_flush_fn(q, rq);
145 140
146 elv_insert(q, rq, ELEVATOR_INSERT_FRONT); 141 elv_insert(q, rq, ELEVATOR_INSERT_FRONT);
147} 142}