diff options
Diffstat (limited to 'sys/fs/autofs/autofs.c')
| -rw-r--r-- | sys/fs/autofs/autofs.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sys/fs/autofs/autofs.c b/sys/fs/autofs/autofs.c index eeaf705..ddf8372 100644 --- a/sys/fs/autofs/autofs.c +++ b/sys/fs/autofs/autofs.c @@ -76,6 +76,7 @@ #include <sys/sx.h> #include <sys/sysctl.h> #include <sys/syscallsubr.h> +#include <sys/taskqueue.h> #include <sys/vnode.h> #include <machine/atomic.h> #include <vm/uma.h> @@ -260,7 +261,7 @@ autofs_path(struct autofs_node *anp) } static void -autofs_callout(void *context) +autofs_task(void *context, int pending) { struct autofs_request *ar; @@ -414,9 +415,14 @@ autofs_trigger_one(struct autofs_node *anp, strlcpy(ar->ar_options, amp->am_options, sizeof(ar->ar_options)); - callout_init(&ar->ar_callout, 1); - callout_reset(&ar->ar_callout, - autofs_timeout * hz, autofs_callout, ar); + TIMEOUT_TASK_INIT(taskqueue_thread, &ar->ar_task, 0, + autofs_task, ar); + error = taskqueue_enqueue_timeout(taskqueue_thread, + &ar->ar_task, autofs_timeout * hz); + if (error != 0) { + AUTOFS_WARN("taskqueue_enqueue_timeout() failed " + "with error %d", error); + } refcount_init(&ar->ar_refcount, 1); TAILQ_INSERT_TAIL(&autofs_softc->sc_requests, ar, ar_next); } @@ -456,7 +462,8 @@ autofs_trigger_one(struct autofs_node *anp, * XXX: Is it safe? */ sx_xunlock(&autofs_softc->sc_lock); - callout_drain(&ar->ar_callout); + taskqueue_cancel_timeout(taskqueue_thread, &ar->ar_task, NULL); + taskqueue_drain_timeout(taskqueue_thread, &ar->ar_task); sx_xlock(&autofs_softc->sc_lock); uma_zfree(autofs_request_zone, ar); } |
