diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /block/cfq-iosched.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index aae3123bf3ee..3a3aee08ec5f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -1561,7 +1561,7 @@ restart: | |||
| 1561 | /* ->key must be copied to avoid race with cfq_exit_queue() */ | 1561 | /* ->key must be copied to avoid race with cfq_exit_queue() */ |
| 1562 | k = __cic->key; | 1562 | k = __cic->key; |
| 1563 | if (unlikely(!k)) { | 1563 | if (unlikely(!k)) { |
| 1564 | cfq_drop_dead_cic(ioc, cic); | 1564 | cfq_drop_dead_cic(ioc, __cic); |
| 1565 | goto restart; | 1565 | goto restart; |
| 1566 | } | 1566 | } |
| 1567 | 1567 | ||