diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
tree | 9336a14058eed66c335db10512f33a31f9e8c938 /block/ll_rw_blk.c | |
parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index ee5ed98db4cd..03d9c82b0fe7 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -454,7 +454,7 @@ static void queue_flush(request_queue_t *q, unsigned which) | |||
454 | rq->end_io = end_io; | 454 | rq->end_io = end_io; |
455 | q->prepare_flush_fn(q, rq); | 455 | q->prepare_flush_fn(q, rq); |
456 | 456 | ||
457 | __elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 0); | 457 | elv_insert(q, rq, ELEVATOR_INSERT_FRONT); |
458 | } | 458 | } |
459 | 459 | ||
460 | static inline struct request *start_ordered(request_queue_t *q, | 460 | static inline struct request *start_ordered(request_queue_t *q, |
@@ -490,7 +490,7 @@ static inline struct request *start_ordered(request_queue_t *q, | |||
490 | else | 490 | else |
491 | q->ordseq |= QUEUE_ORDSEQ_POSTFLUSH; | 491 | q->ordseq |= QUEUE_ORDSEQ_POSTFLUSH; |
492 | 492 | ||
493 | __elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 0); | 493 | elv_insert(q, rq, ELEVATOR_INSERT_FRONT); |
494 | 494 | ||
495 | if (q->ordered & QUEUE_ORDERED_PREFLUSH) { | 495 | if (q->ordered & QUEUE_ORDERED_PREFLUSH) { |
496 | queue_flush(q, QUEUE_ORDERED_PREFLUSH); | 496 | queue_flush(q, QUEUE_ORDERED_PREFLUSH); |