path: root/block
diff options
authorJan Kara <jack@suse.cz>2016-06-28 09:04:00 +0200
committerJens Axboe <axboe@fb.com>2016-06-28 08:21:46 -0600
commit93fdf1478aaba6c397ba54f4cc534bf5019831b4 (patch)
tree819d98cc9cafe4a47dd2fcd162e6c251a1e9e4bc /block
parent9828c2c6c1048c61034a8b94e6376aeff6d2284f (diff)
cfq-iosched: Convert slice_resid from u64 to s64
slice_resid can be both positive and negative. Commit 9a7f38c42c2b (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: 9a7f38c42c2b92391d9dabaf9f51df7cfe5608e4 Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
1 files changed, 2 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index d227ad633242..c1adbd01d0fa 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -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);
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);