diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /fs/nfs/namespace.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'fs/nfs/namespace.c')
| -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) | |||
| 176 | void nfs_release_automount_timer(void) | 176 | void nfs_release_automount_timer(void) |
| 177 | { | 177 | { |
| 178 | if (list_empty(&nfs_automount_list)) | 178 | if (list_empty(&nfs_automount_list)) |
| 179 | cancel_delayed_work_sync(&nfs_automount_task); | 179 | cancel_delayed_work(&nfs_automount_task); |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | /* | 182 | /* |