Commit ff6657c6c8ac99444e5dd4c4f7c1dc9271173382
1 parent
b0b78f81a5
Exists in
master
and in
7 other branches
cfq-iosched: get rid of private SYNC/ASYNC defines
We can just use the block layer BLK_RW_SYNC/ASYNC defines now. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Showing 1 changed file with 11 additions and 13 deletions Side-by-side Diff
block/cfq-iosched.c
| ... | ... | @@ -56,9 +56,6 @@ |
| 56 | 56 | #define cfq_class_idle(cfqq) ((cfqq)->ioprio_class == IOPRIO_CLASS_IDLE) |
| 57 | 57 | #define cfq_class_rt(cfqq) ((cfqq)->ioprio_class == IOPRIO_CLASS_RT) |
| 58 | 58 | |
| 59 | -#define ASYNC (0) | |
| 60 | -#define SYNC (1) | |
| 61 | - | |
| 62 | 59 | #define sample_valid(samples) ((samples) > 80) |
| 63 | 60 | |
| 64 | 61 | /* |
| 65 | 62 | |
| ... | ... | @@ -1333,14 +1330,14 @@ |
| 1333 | 1330 | if (ioc->ioc_data == cic) |
| 1334 | 1331 | rcu_assign_pointer(ioc->ioc_data, NULL); |
| 1335 | 1332 | |
| 1336 | - if (cic->cfqq[ASYNC]) { | |
| 1337 | - cfq_exit_cfqq(cfqd, cic->cfqq[ASYNC]); | |
| 1338 | - cic->cfqq[ASYNC] = NULL; | |
| 1333 | + if (cic->cfqq[BLK_RW_ASYNC]) { | |
| 1334 | + cfq_exit_cfqq(cfqd, cic->cfqq[BLK_RW_ASYNC]); | |
| 1335 | + cic->cfqq[BLK_RW_ASYNC] = NULL; | |
| 1339 | 1336 | } |
| 1340 | 1337 | |
| 1341 | - if (cic->cfqq[SYNC]) { | |
| 1342 | - cfq_exit_cfqq(cfqd, cic->cfqq[SYNC]); | |
| 1343 | - cic->cfqq[SYNC] = NULL; | |
| 1338 | + if (cic->cfqq[BLK_RW_SYNC]) { | |
| 1339 | + cfq_exit_cfqq(cfqd, cic->cfqq[BLK_RW_SYNC]); | |
| 1340 | + cic->cfqq[BLK_RW_SYNC] = NULL; | |
| 1344 | 1341 | } |
| 1345 | 1342 | } |
| 1346 | 1343 | |
| 1347 | 1344 | |
| 1348 | 1345 | |
| 1349 | 1346 | |
| ... | ... | @@ -1449,17 +1446,18 @@ |
| 1449 | 1446 | |
| 1450 | 1447 | spin_lock_irqsave(cfqd->queue->queue_lock, flags); |
| 1451 | 1448 | |
| 1452 | - cfqq = cic->cfqq[ASYNC]; | |
| 1449 | + cfqq = cic->cfqq[BLK_RW_ASYNC]; | |
| 1453 | 1450 | if (cfqq) { |
| 1454 | 1451 | struct cfq_queue *new_cfqq; |
| 1455 | - new_cfqq = cfq_get_queue(cfqd, ASYNC, cic->ioc, GFP_ATOMIC); | |
| 1452 | + new_cfqq = cfq_get_queue(cfqd, BLK_RW_ASYNC, cic->ioc, | |
| 1453 | + GFP_ATOMIC); | |
| 1456 | 1454 | if (new_cfqq) { |
| 1457 | - cic->cfqq[ASYNC] = new_cfqq; | |
| 1455 | + cic->cfqq[BLK_RW_ASYNC] = new_cfqq; | |
| 1458 | 1456 | cfq_put_queue(cfqq); |
| 1459 | 1457 | } |
| 1460 | 1458 | } |
| 1461 | 1459 | |
| 1462 | - cfqq = cic->cfqq[SYNC]; | |
| 1460 | + cfqq = cic->cfqq[BLK_RW_SYNC]; | |
| 1463 | 1461 | if (cfqq) |
| 1464 | 1462 | cfq_mark_cfqq_prio_changed(cfqq); |
| 1465 | 1463 |