From: Trond Myklebust Date: Mon, 27 Aug 2007 13:14:56 +0000 (-0400) Subject: NFS: Fix use of cancel_delayed_work_sync in nfs_release_automount_timer X-Git-Tag: v2.6.23-rc6~23^2~7 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560aef74503e928f44ddbf481b8b02d9cef37dbf;p=linux-2.6 NFS: Fix use of cancel_delayed_work_sync in nfs_release_automount_timer 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 --- diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index aea76d0e5f..acfc56f9ed 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -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); } /*