|
@@ -628,9 +628,9 @@ EXPORT_SYMBOL_GPL(wb_writeout_inc);
|
|
|
* On idle system, we can be called long after we scheduled because we use
|
|
|
* deferred timers so count with missed periods.
|
|
|
*/
|
|
|
-static void writeout_period(unsigned long t)
|
|
|
+static void writeout_period(struct timer_list *t)
|
|
|
{
|
|
|
- struct wb_domain *dom = (void *)t;
|
|
|
+ struct wb_domain *dom = from_timer(dom, t, period_timer);
|
|
|
int miss_periods = (jiffies - dom->period_time) /
|
|
|
VM_COMPLETIONS_PERIOD_LEN;
|
|
|
|
|
@@ -653,8 +653,7 @@ int wb_domain_init(struct wb_domain *dom, gfp_t gfp)
|
|
|
|
|
|
spin_lock_init(&dom->lock);
|
|
|
|
|
|
- setup_deferrable_timer(&dom->period_timer, writeout_period,
|
|
|
- (unsigned long)dom);
|
|
|
+ timer_setup(&dom->period_timer, writeout_period, TIMER_DEFERRABLE);
|
|
|
|
|
|
dom->dirty_limit_tstamp = jiffies;
|
|
|
|