Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block

[mirror_ubuntu-disco-kernel.git] / block / blk-iolatency.c

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index bb240a0c1309f8da1260e2d727406388e3a002d3..38c35c32aff2dcf3fc0e9ac294a649f0be4a1cb1 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -153,7 +153,7 @@ struct iolatency_grp {
 #define BLKIOLATENCY_MAX_WIN_SIZE NSEC_PER_SEC
 /*
  * These are the constants used to fake the fixed-point moving average
- * calculation just like load average.  The call to CALC_LOAD folds
+ * calculation just like load average.  The call to calc_load() folds
  * (FIXED_1 (2048) - exp_factor) * new_sample into lat_avg.  The sampling
  * window size is bucketed to try to approximately calculate average
  * latency such that 1/exp (decay rate) is [1 min, 2.5 min) when windows
@@ -248,7 +248,7 @@ static inline void iolat_update_total_lat_avg(struct iolatency_grp *iolat,
                return;
 
        /*
-        * CALC_LOAD takes in a number stored in fixed point representation.
+        * calc_load() takes in a number stored in fixed point representation.
         * Because we are using this for IO time in ns, the values stored
         * are significantly larger than the FIXED_1 denominator (2048).
         * Therefore, rounding errors in the calculation are negligible and
@@ -257,7 +257,9 @@ static inline void iolat_update_total_lat_avg(struct iolatency_grp *iolat,
        exp_idx = min_t(int, BLKIOLATENCY_NR_EXP_FACTORS - 1,
                        div64_u64(iolat->cur_win_nsec,
                                  BLKIOLATENCY_EXP_BUCKET_SIZE));
-       CALC_LOAD(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat->rqs.mean);
+       iolat->lat_avg = calc_load(iolat->lat_avg,
+                                  iolatency_exp_factors[exp_idx],
+                                  stat->rqs.mean);
 }
 
 static inline bool iolatency_may_queue(struct iolatency_grp *iolat,