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

From: Tejun Heo
Date: Tue Oct 19 2010 - 11:56:11 EST


flush_scheduled_work() is going away.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
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);
}

/**
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/