Commit 9823e51b authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

mm/page-writeback.c: convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer
to all timer callbacks, switch to using the new timer_setup() and
from_timer() to pass the timer pointer explicitly.

Link: http://lkml.kernel.org/r/20171016225913.GA99214@beastSigned-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Jeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b6b18aa8
...@@ -628,9 +628,9 @@ EXPORT_SYMBOL_GPL(wb_writeout_inc); ...@@ -628,9 +628,9 @@ EXPORT_SYMBOL_GPL(wb_writeout_inc);
* On idle system, we can be called long after we scheduled because we use * On idle system, we can be called long after we scheduled because we use
* deferred timers so count with missed periods. * 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) / int miss_periods = (jiffies - dom->period_time) /
VM_COMPLETIONS_PERIOD_LEN; VM_COMPLETIONS_PERIOD_LEN;
...@@ -653,8 +653,7 @@ int wb_domain_init(struct wb_domain *dom, gfp_t gfp) ...@@ -653,8 +653,7 @@ int wb_domain_init(struct wb_domain *dom, gfp_t gfp)
spin_lock_init(&dom->lock); spin_lock_init(&dom->lock);
setup_deferrable_timer(&dom->period_timer, writeout_period, timer_setup(&dom->period_timer, writeout_period, TIMER_DEFERRABLE);
(unsigned long)dom);
dom->dirty_limit_tstamp = jiffies; dom->dirty_limit_tstamp = jiffies;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment