diff options
| author | Jens Axboe <axboe@suse.de> | 2006-07-25 15:05:21 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@suse.de> | 2006-07-25 15:05:21 +0200 |
| commit | 44eb123126d289bac398cac0232309c228386671 (patch) | |
| tree | 129504f649195d5cff96c4c94a345d459f770896 /block | |
| parent | ad01b1ca797e5898cd40bb32cf0dc8c85aa9f7e8 (diff) | |
| download | blackbird-obmc-linux-44eb123126d289bac398cac0232309c228386671.tar.gz blackbird-obmc-linux-44eb123126d289bac398cac0232309c228386671.zip | |
[PATCH] cfq-iosched: don't use a hard jiffies value, translate from msecs
The CIC_SEEKY() test really wants to use the minimum of either:
- 2 msecs (not jiffies)
- or, the pending slice time
So code it like that.
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block')
| -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) * seeks. so allow a little bit of time for him to submit a new rq */ if (sample_valid(cic->seek_samples) && CIC_SEEKY(cic)) - sl = 2; + sl = min(sl, msecs_to_jiffies(2)); mod_timer(&cfqd->idle_slice_timer, jiffies + sl); return 1; |
