From owner-svn-src-head@FreeBSD.ORG  Sun Oct  5 03:18:31 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 46CD5CA3;
 Sun,  5 Oct 2014 03:18:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 346D782A;
 Sun,  5 Oct 2014 03:18:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s953IVow002184;
 Sun, 5 Oct 2014 03:18:31 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s953IVbq002183;
 Sun, 5 Oct 2014 03:18:31 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201410050318.s953IVbq002183@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bryanv set sender to
 bryanv@FreeBSD.org using -f
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Sun, 5 Oct 2014 03:18:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272550 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 03:18:31 -0000

Author: bryanv
Date: Sun Oct  5 03:18:30 2014
New Revision: 272550
URL: https://svnweb.freebsd.org/changeset/base/272550

Log:
  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.
  
  Reviewed by:	jhb
  MFC after:	3 days

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Sun Oct  5 02:52:54 2014	(r272549)
+++ head/sys/vm/uma_core.c	Sun Oct  5 03:18:30 2014	(r272550)
@@ -897,9 +897,7 @@ zone_drain_wait(uma_zone_t zone, int wai
 	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);