]> err.no Git - linux-2.6/commitdiff
NFS: Fix use of cancel_delayed_work_sync in nfs_release_automount_timer
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 27 Aug 2007 13:14:56 +0000 (09:14 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 1 Sep 2007 14:14:36 +0000 (10:14 -0400)
Doh! We can't use cancel_delayed_work_sync because we may have been called
from an unmount that was being performed by nfs_automount_task.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/namespace.c

index aea76d0e5fbdf5d9c24dafd89caa94d691277ee4..acfc56f9edc04c53b25efaffeb80eb0ba9d887c5 100644 (file)
@@ -176,7 +176,7 @@ static void nfs_expire_automounts(struct work_struct *work)
 void nfs_release_automount_timer(void)
 {
        if (list_empty(&nfs_automount_list))
-               cancel_delayed_work_sync(&nfs_automount_task);
+               cancel_delayed_work(&nfs_automount_task);
 }
 
 /*