From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932712AbdJPW7R (ORCPT ); Mon, 16 Oct 2017 18:59:17 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:48437 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932443AbdJPW7Q (ORCPT ); Mon, 16 Oct 2017 18:59:16 -0400 X-Google-Smtp-Source: AOwi7QDw+FicahpmqVif6v8M46ldw/BGz+avrOQX+23052C4qSEmM+4TPXKHEkDvW8lyzEDp1jtmig== Date: Mon, 16 Oct 2017 15:59:13 -0700 From: Kees Cook To: Andrew Morton Cc: Jan Kara , Johannes Weiner , Vladimir Davydov , Matthew Wilcox , Jeff Layton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] writeback: Convert timers to use timer_setup() Message-ID: <20171016225913.GA99214@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Cc: Andrew Morton Cc: Jan Kara Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Matthew Wilcox Cc: Jeff Layton Cc: linux-mm@kvack.org Signed-off-by: Kees Cook --- mm/page-writeback.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 94854e243b11..65ba42c7c7da 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -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; -- 2.7.4 -- Kees Cook Pixel Security