diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:25:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:25:36 -0700 |
| commit | 0e77a07ff9d18cdfc6c1fdd5b3c667ae79895489 (patch) | |
| tree | 0b8b5a24f3c7081244b0a64625f6184733de43cf /block/as-iosched.c | |
| parent | 23c0e4a2257051113a99e1377c49af224bd27bc8 (diff) | |
| parent | 18ce3751ccd488c78d3827e9f6bf54e6322676fb (diff) | |
| download | kernel-crypto-0e77a07ff9d18cdfc6c1fdd5b3c667ae79895489.tar.gz kernel-crypto-0e77a07ff9d18cdfc6c1fdd5b3c667ae79895489.tar.xz kernel-crypto-0e77a07ff9d18cdfc6c1fdd5b3c667ae79895489.zip | |
Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
Properly notify block layer of sync writes
block: Fix the starving writes bug in the anticipatory IO scheduler
Diffstat (limited to 'block/as-iosched.c')
| -rw-r--r-- | block/as-iosched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index 8c3946787db..743f33a01a0 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c @@ -831,6 +831,8 @@ static void as_completed_request(struct request_queue *q, struct request *rq) } if (ad->changed_batch && ad->nr_dispatched == 1) { + ad->current_batch_expires = jiffies + + ad->batch_expire[ad->batch_data_dir]; kblockd_schedule_work(&ad->antic_work); ad->changed_batch = 0; |