Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 7f86e65182e4..aea76d0e5fbd 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -175,10 +175,8 @@ static void nfs_expire_automounts(struct work_struct *work)
 
 void nfs_release_automount_timer(void)
 {
-        if (list_empty(&nfs_automount_list)) {
-                cancel_delayed_work(&nfs_automount_task);
-                flush_scheduled_work();
-        }
+        if (list_empty(&nfs_automount_list))
+                cancel_delayed_work_sync(&nfs_automount_task);
 }
 
 /*