From owner-svn-src-stable@FreeBSD.ORG  Wed Oct  8 04:07:08 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4ED47B1A;
 Wed,  8 Oct 2014 04:07:08 +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 3A626EAA;
 Wed,  8 Oct 2014 04:07:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s984780i016731;
 Wed, 8 Oct 2014 04:07:08 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s984781T016730;
 Wed, 8 Oct 2014 04:07:08 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201410080407.s984781T016730@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: Wed, 8 Oct 2014 04:07:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r272722 - stable/10/sys/vm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2014 04:07:08 -0000

Author: bryanv
Date: Wed Oct  8 04:07:07 2014
New Revision: 272722
URL: https://svnweb.freebsd.org/changeset/base/272722

Log:
  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.

Modified:
  stable/10/sys/vm/uma_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/uma_core.c
==============================================================================
--- stable/10/sys/vm/uma_core.c	Wed Oct  8 01:03:32 2014	(r272721)
+++ stable/10/sys/vm/uma_core.c	Wed Oct  8 04:07:07 2014	(r272722)
@@ -898,9 +898,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);