diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 14:29:49 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 14:29:49 +1000 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /block/as-iosched.c | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
| download | op-kernel-dev-11c2d8174ed3dc4f1971564732689b4a39129702.zip op-kernel-dev-11c2d8174ed3dc4f1971564732689b4a39129702.tar.gz | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
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 8c39467..743f33a 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; |
