From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 72BFF6B0033 for ; Fri, 6 Oct 2017 10:28:47 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id j64so8543148pfj.22 for ; Fri, 06 Oct 2017 07:28:47 -0700 (PDT) Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id m20sor695865itm.139.2017.10.06.07.28.46 for (Google Transport Security); Fri, 06 Oct 2017 07:28:46 -0700 (PDT) Subject: Re: [PATCH v2] block/laptop_mode: Convert timers to use timer_setup() References: <20171005231623.GA109154@beast> <20171006082020.GA12192@infradead.org> From: Jens Axboe Message-ID: <6471888d-60a6-bba6-0c3d-a967ff9442c4@kernel.dk> Date: Fri, 6 Oct 2017 08:28:43 -0600 MIME-Version: 1.0 In-Reply-To: <20171006082020.GA12192@infradead.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Christoph Hellwig , Kees Cook Cc: linux-kernel@vger.kernel.org, Michal Hocko , Andrew Morton , Jan Kara , Johannes Weiner , Nicholas Piggin , Vladimir Davydov , Matthew Wilcox , Jeff Layton , linux-block@vger.kernel.org, linux-mm@kvack.org, Thomas Gleixner On 10/06/2017 02:20 AM, Christoph Hellwig wrote: >> -static void blk_rq_timed_out_timer(unsigned long data) >> +static void blk_rq_timed_out_timer(struct timer_list *t) >> { >> - struct request_queue *q = (struct request_queue *)data; >> + struct request_queue *q = from_timer(q, t, timeout); >> >> kblockd_schedule_work(&q->timeout_work); >> } > > This isn't the laptop_mode timer, although the change itself looks fine. > >> + timer_setup(&q->backing_dev_info->laptop_mode_wb_timer, >> + laptop_mode_timer_fn, 0); > > And I already pointed out to Jens when he did the previous changes > to this one that it has no business being in the block code, it > really should move to mm/page-writeback.c with the rest of the > handling of this timer. Once that is fixed up your automated script > should pick it up, so we wouldn't need the manual change. Looks reasonable to me, one comment: > @@ -916,6 +950,8 @@ EXPORT_SYMBOL(bdi_register_owner); > */ > static void bdi_remove_from_list(struct backing_dev_info *bdi) > { > + del_timer_sync(&bdi->laptop_mode_wb_timer); > + > spin_lock_bh(&bdi_lock); > list_del_rcu(&bdi->bdi_list); > spin_unlock_bh(&bdi_lock); This should go into bdi_unregister() instead. The rest is mostly mechanical and looks fine to me. -- Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org