redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

cfq-iosched: Convert slice_resid from u64 to s64 

slice_resid can be both positive and negative. Commit 9a7f38c42c
(cfq-iosched: Convert from jiffies to nanoseconds) converted it from
long to u64. Although this did not introduce any functional regression
(the operations just overflow and the result was fine), it is certainly
wrong and could cause issues in future. So convert the type to more
appropriate s64.

Fixes: 9a7f38c42c
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
hifive-unleashed-5.1
Jan Kara 2016-06-28 09:04:00 +02:00 committed by Jens Axboe
parent 9828c2c6c1
commit 93fdf1478a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/cfq-iosched.c
View File

@ -132,7 +132,7 @@ struct cfq_queue {
/* time when first request from queue completed and slice started. */
u64 slice_start;
u64 slice_end;
u64 slice_resid;
s64 slice_resid;
/* pending priority requests */
int prio_pending;
@ -2689,7 +2689,7 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,
cfqq->slice_resid = cfq_scaled_cfqq_slice(cfqd, cfqq);
else
cfqq->slice_resid = cfqq->slice_end - ktime_get_ns();
cfq_log_cfqq(cfqd, cfqq, "resid=%llu", cfqq->slice_resid);
cfq_log_cfqq(cfqd, cfqq, "resid=%lld", cfqq->slice_resid);
}
cfq_group_served(cfqd, cfqq->cfqg, cfqq);