cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()
authorTejun Heo <tj@kernel.org>
Tue, 19 Oct 2010 15:55:54 +0000 (17:55 +0200)
committerSteve French <sfrench@us.ibm.com>
Tue, 19 Oct 2010 18:58:36 +0000 (18:58 +0000)
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>
fs/cifs/cifs_dfs_ref.c

index f4aab6f..c68a056 100644 (file)
@@ -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);
 }
 
 /**