diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:45:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:45:54 -0400 |
| commit | b1330031b76bf1c9dc23635e016625aa9edc069a (patch) | |
| tree | e4f104e387fa249df7c1eb18b5a57a0cec6f727b /fs/nfs/namespace.c | |
| parent | ea3c4b126ad63bd782c7bb5266bb4fd88e203169 (diff) | |
| parent | 1b3b4a1a2deb7d3e5d66063bd76304d840c966b3 (diff) | |
Merge branch 'for_linus' of git://git.linux-nfs.org/pub/linux/nfs-2.6
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 | /* |