[v2.6.36-rc7] cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()

Commit Message

Tejun Heo Oct. 19, 2010, 3:55 p.m. UTC

None

Patch

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);
 }

 /**