From 69c5e8194e6aed53f9cff14f3a3491f09fab7fb3 Mon Sep 17 00:00:00 2001 From: bryanv Date: Wed, 8 Oct 2014 04:07:07 +0000 Subject: MFC 272550: Remove stray uma_mtx lock/unlock in zone_drain_wait() Callers of zone_drain_wait(M_WAITOK) do not need to hold (and were not) the uma_mtx, but we would attempt to unlock and relock the mutex if we had to sleep because the zone was already draining. The M_NOWAIT callers may hold the uma_mtx, but we do not sleep in that case. --- sys/vm/uma_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 0c28c18..f327d22 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -898,9 +898,7 @@ zone_drain_wait(uma_zone_t zone, int waitok) while (zone->uz_flags & UMA_ZFLAG_DRAINING) { if (waitok == M_NOWAIT) goto out; - mtx_unlock(&uma_mtx); msleep(zone, zone->uz_lockptr, PVM, "zonedrain", 1); - mtx_lock(&uma_mtx); } zone->uz_flags |= UMA_ZFLAG_DRAINING; bucket_cache_drain(zone); -- cgit v1.1