summaryrefslogtreecommitdiff
path: root/block/as-iosched.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 12:32:56 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 12:32:56 +0400
commit896395c290f902576270d84291c1f7f8bfbe339d (patch)
tree650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /block/as-iosched.c
parentaf1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff)
parent1b40a895df6c7d5a80e71f65674060b03d84bbef (diff)
downloadlinux-896395c290f902576270d84291c1f7f8bfbe339d.tar.xz
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'block/as-iosched.c')
-rw-r--r--block/as-iosched.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 8c3946787dbb..743f33a01a07 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;