From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: Re: [PATCH v2.6.36-rc7] cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync() Date: Tue, 19 Oct 2010 12:13:19 -0400 Message-ID: <20101019121319.16f06b76@corrin.poochiereds.net> References: <4CBDBF8A.8010106@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Steve French , linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, lkml To: Tejun Heo Return-path: In-Reply-To: <4CBDBF8A.8010106-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: On Tue, 19 Oct 2010 17:55:54 +0200 Tejun Heo wrote: > flush_scheduled_work() is going away. > > Signed-off-by: Tejun Heo > --- > fs/cifs/cifs_dfs_ref.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > Index: work/fs/cifs/cifs_dfs_ref.c > =================================================================== > --- work.orig/fs/cifs/cifs_dfs_ref.c > +++ work/fs/cifs/cifs_dfs_ref.c > @@ -44,8 +44,7 @@ static void cifs_dfs_expire_automounts(s > void cifs_dfs_release_automount_timer(void) > { > BUG_ON(!list_empty(&cifs_dfs_automount_list)); > - cancel_delayed_work(&cifs_dfs_automount_task); > - flush_scheduled_work(); > + cancel_delayed_work_sync(&cifs_dfs_automount_task); > } > > /** Looks like a better way to do this anyhow. Reviewed-by: Jeff Layton