From 3e83e409cbe257917c5d4f2a71534520fa6ac0c9 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Wed, 24 Jun 2009 10:15:12 +0300 Subject: [PATCH] --- yaml --- r: 155297 b: refs/heads/master c: 44737589442bf69d811e003d9d0064b8fc1541d6 h: refs/heads/master i: 155295: 384d4f62159443e7ef6a96bc954c7df968524430 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/io.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9c3aa1a906d2..a37af7a3bd24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb54ef8b1304fe25f3d57031e0f85558a043239f +refs/heads/master: 44737589442bf69d811e003d9d0064b8fc1541d6 diff --git a/trunk/fs/ubifs/io.c b/trunk/fs/ubifs/io.c index 7e4267ecfa56..762a7d6cec73 100644 --- a/trunk/fs/ubifs/io.c +++ b/trunk/fs/ubifs/io.c @@ -315,8 +315,9 @@ static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf) if (wbuf->no_timer) return; dbg_io("set timer for jhead %d, %llu-%llu millisecs", wbuf->jhead, - ktime_to_ns(wbuf->softlimit)/USEC_PER_SEC, - (ktime_to_ns(wbuf->softlimit) + wbuf->delta)/USEC_PER_SEC); + 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, HRTIMER_MODE_REL); }