summaryrefslogtreecommitdiff
path: root/fs/cifs/cifs_dfs_ref.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-10-19 19:55:54 +0400
committerSteve French <sfrench@us.ibm.com>2010-10-19 22:58:36 +0400
commit3e24e132878c83910b61eb7704511a6d96a0389f (patch)
treee67f001dd582ad202fc779df4b0a93867abc2ea2 /fs/cifs/cifs_dfs_ref.c
parent89f150f401c32b0a587dcb98d3bcfafe0b9c1c70 (diff)
downloadlinux-3e24e132878c83910b61eb7704511a6d96a0389f.tar.xz
cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()
flush_scheduled_work() is going away. Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifs_dfs_ref.c')
-rw-r--r--fs/cifs/cifs_dfs_ref.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index f4aab6f01174..c68a056f27fd 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -44,8 +44,7 @@ static void cifs_dfs_expire_automounts(struct work_struct *work)
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);
}
/**