Commit 5e901a2b authored by Vivek Goyal's avatar Vivek Goyal Committed by Jens Axboe
Browse files

blkio-throttle: There is no need to convert jiffies to milli seconds 



o Do not convert jiffies to mili seconds as it is not required. Just work
  with jiffies and HZ.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 3aad5d3e

block/blk-throttle.c

+3 −4
Original line number Diff line number Diff line
@@ -439,8 +439,7 @@ static bool tg_with_in_iops_limit(struct throtl_data *td, struct throtl_grp *tg, 


	jiffy_elapsed_rnd = roundup(jiffy_elapsed_rnd, throtl_slice);



	io_allowed = (tg->iops[rw] * jiffies_to_msecs(jiffy_elapsed_rnd))

				/ MSEC_PER_SEC;

	io_allowed = (tg->iops[rw] * jiffy_elapsed_rnd) / HZ;



	if (tg->io_disp[rw] + 1 <= io_allowed) {

		if (wait)
@@ -476,8 +475,8 @@ static bool tg_with_in_bps_limit(struct throtl_data *td, struct throtl_grp *tg, 


	jiffy_elapsed_rnd = roundup(jiffy_elapsed_rnd, throtl_slice);



	tmp = tg->bps[rw] * jiffies_to_msecs(jiffy_elapsed_rnd);

	do_div(tmp, MSEC_PER_SEC);

	tmp = tg->bps[rw] * jiffy_elapsed_rnd;

	do_div(tmp, HZ);

	bytes_allowed = tmp;



	if (tg->bytes_disp[rw] + bio->bi_size <= bytes_allowed) {