diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /block/elevator.c | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c index 96a61e029ce5..2fc269f69726 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -323,7 +323,8 @@ void __elv_add_request(request_queue_t *q, struct request *rq, int where, | |||
| 323 | /* | 323 | /* |
| 324 | * toggle ordered color | 324 | * toggle ordered color |
| 325 | */ | 325 | */ |
| 326 | q->ordcolor ^= 1; | 326 | if (blk_barrier_rq(rq)) |
| 327 | q->ordcolor ^= 1; | ||
| 327 | 328 | ||
| 328 | /* | 329 | /* |
| 329 | * barriers implicitly indicate back insertion | 330 | * barriers implicitly indicate back insertion |