svn commit: r274233 - stable/10/sys/fs/autofs

[Edward Tomasz Napierala]

Author: trasz
Date: Fri Nov  7 15:42:11 2014
New Revision: 274233
URL: https://svnweb.freebsd.org/changeset/base/274233

Log:
  MFC r272405:
  
  Call uma_zfree() outside of lock, and improve comment.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/fs/autofs/autofs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/autofs/autofs.c
==============================================================================
--- stable/10/sys/fs/autofs/autofs.c	Fri Nov  7 15:40:34 2014	(r274232)
+++ stable/10/sys/fs/autofs/autofs.c	Fri Nov  7 15:42:11 2014	(r274233)
@@ -459,13 +459,13 @@ autofs_trigger_one(struct autofs_node *a
 	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);
 	}
 
 	/*