From 128b5ee87e82217ebb4290753a7f375112a68c3e Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 19 Oct 2010 17:55:54 +0200 Subject: [PATCH] --- yaml --- r: 213442 b: refs/heads/master c: 3e24e132878c83910b61eb7704511a6d96a0389f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifs_dfs_ref.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6b5bd6b018e..bf398898137b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89f150f401c32b0a587dcb98d3bcfafe0b9c1c70 +refs/heads/master: 3e24e132878c83910b61eb7704511a6d96a0389f diff --git a/trunk/fs/cifs/cifs_dfs_ref.c b/trunk/fs/cifs/cifs_dfs_ref.c index f4aab6f01174..c68a056f27fd 100644 --- a/trunk/fs/cifs/cifs_dfs_ref.c +++ b/trunk/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); } /**