diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
| commit | 572e432e01c1f7c64ad8375a6e0d935b0e40ebf5 (patch) | |
| tree | 57ae4168e9bf4c88a1267f4ec6c96df3789cc9cc /block/cfq-iosched.c | |
| parent | d11ea48aab3b57cc931cc7120603e1c2ffb04302 (diff) | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
Merge branch 'master' 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 102ebc2c5c34..aae3123bf3ee 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -936,7 +936,7 @@ static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
| 936 | * seeks. so allow a little bit of time for him to submit a new rq | 936 | * seeks. so allow a little bit of time for him to submit a new rq |
| 937 | */ | 937 | */ |
| 938 | if (sample_valid(cic->seek_samples) && CIC_SEEKY(cic)) | 938 | if (sample_valid(cic->seek_samples) && CIC_SEEKY(cic)) |
| 939 | sl = 2; | 939 | sl = min(sl, msecs_to_jiffies(2)); |
| 940 | 940 | ||
| 941 | mod_timer(&cfqd->idle_slice_timer, jiffies + sl); | 941 | mod_timer(&cfqd->idle_slice_timer, jiffies + sl); |
| 942 | return 1; | 942 | return 1; |