Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / ubifs / io.c

diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 97be41215332875a77a450410e356e56a54768bb..3be28900bf3750364f79ac36803eb0eae1066f80 100644 (file)
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_callback_nolock(struct hrtimer *timer)
  */
 static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
 {
+       ktime_t softlimit = ms_to_ktime(dirty_writeback_interval * 10);
+       unsigned long long delta = dirty_writeback_interval;
+
+       /* centi to milli, milli to nano, then 10% */
+       delta *= 10ULL * NSEC_PER_MSEC / 10ULL;
+
        ubifs_assert(!hrtimer_active(&wbuf->timer));
+       ubifs_assert(delta <= ULONG_MAX);
 
        if (wbuf->no_timer)
                return;
        dbg_io("set timer for jhead %s, %llu-%llu millisecs",
               dbg_jhead(wbuf->jhead),
-              div_u64(ktime_to_ns(wbuf->softlimit), USEC_PER_SEC),
-              div_u64(ktime_to_ns(wbuf->softlimit) + wbuf->delta,
-                      USEC_PER_SEC));
-       hrtimer_start_range_ns(&wbuf->timer, wbuf->softlimit, wbuf->delta,
+              div_u64(ktime_to_ns(softlimit), USEC_PER_SEC),
+              div_u64(ktime_to_ns(softlimit) + delta, USEC_PER_SEC));
+       hrtimer_start_range_ns(&wbuf->timer, softlimit, delta,
                               HRTIMER_MODE_REL);
 }
 
@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c, struct ubifs_wbuf *wbuf)
 
        hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        wbuf->timer.function = wbuf_timer_callback_nolock;
-       wbuf->softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);
-       wbuf->delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;
-       wbuf->delta *= 1000000000ULL;
-       ubifs_assert(wbuf->delta <= ULONG_MAX);
        return 0;
 }