diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-08-27 09:14:56 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-09-01 10:14:36 -0400 |
| commit | 560aef74503e928f44ddbf481b8b02d9cef37dbf (patch) | |
| tree | 739c3f1d806d2f34b5573a5ba80d25765e38c887 /fs | |
| parent | 40ffbfad6bb79a99cc7627bdaca0ee22dec526f6 (diff) | |
| download | blackbird-op-linux-560aef74503e928f44ddbf481b8b02d9cef37dbf.tar.gz blackbird-op-linux-560aef74503e928f44ddbf481b8b02d9cef37dbf.zip | |
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 <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index aea76d0e5fbd..acfc56f9edc0 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); } /* |
