cfq-iosched: Charge at least 1 jiffie instead of 1 ns

Commit aa795a966fc0 (cfq-iosched: Convert from jiffies to nanoseconds)
could result in charging just 1 ns to a cgroup submitting IO instead of 1
jiffie we always charged before. It is arguable what is the right amount
to change but for now lets retain the old behavior of always charging at
least one jiffie.

Fixes: aa795a966fc0e97073dc23c0ef171a487c11a618
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 2d03004dc77cf1bc776ff4139352e6f8a86da8f7..892afd6d40e2de1fb17afe4641dba72b4b119350 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1463,7 +1463,8 @@ static inline u64 cfq_cfqq_slice_usage(struct cfq_queue *cfqq,
                 * a single request on seeky media and cause lots of seek time
                 * and group will never know it.
                 */
-               slice_used = max_t(u64, (now - cfqq->dispatch_start), 1);
+               slice_used = max_t(u64, (now - cfqq->dispatch_start),
+                                       jiffies_to_nsecs(1));
        } else {
                slice_used = now - cfqq->slice_start;
                if (slice_used > cfqq->allocated_slice) {