Merge tag 'mmc-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[sfrench/cifs-2.6.git] / block / blk-throttle.c

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 9ea7c0ecad100a41301782cf8be6b14e820eba3e..8ab6c8153223630a6b8d4b6fc4b1acc23ad8fc04 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -881,13 +881,10 @@ static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio,
        unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;
        u64 tmp;
 
-       jiffy_elapsed = jiffy_elapsed_rnd = jiffies - tg->slice_start[rw];
-
-       /* Slice has just started. Consider one slice interval */
-       if (!jiffy_elapsed)
-               jiffy_elapsed_rnd = tg->td->throtl_slice;
+       jiffy_elapsed = jiffies - tg->slice_start[rw];
 
-       jiffy_elapsed_rnd = roundup(jiffy_elapsed_rnd, tg->td->throtl_slice);
+       /* Round up to the next throttle slice, wait time must be nonzero */
+       jiffy_elapsed_rnd = roundup(jiffy_elapsed + 1, tg->td->throtl_slice);
 
        /*
         * jiffy_elapsed_rnd should not be a big value as minimum iops can be