From c03d95d34124cf0afe160b15ff8c0ba71f538d71 Mon Sep 17 00:00:00 2001 From: trasz Date: Fri, 7 Nov 2014 15:42:11 +0000 Subject: MFC r272405: Call uma_zfree() outside of lock, and improve comment. Sponsored by: The FreeBSD Foundation --- sys/fs/autofs/autofs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/fs/autofs/autofs.c') diff --git a/sys/fs/autofs/autofs.c b/sys/fs/autofs/autofs.c index ddf8372..52461d3 100644 --- a/sys/fs/autofs/autofs.c +++ b/sys/fs/autofs/autofs.c @@ -459,13 +459,13 @@ autofs_trigger_one(struct autofs_node *anp, if (last) { TAILQ_REMOVE(&autofs_softc->sc_requests, ar, ar_next); /* - * XXX: Is it safe? + * Unlock the sc_lock, so that autofs_task() can complete. */ sx_xunlock(&autofs_softc->sc_lock); 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); + sx_xlock(&autofs_softc->sc_lock); } /* -- cgit v1.1