From owner-svn-src-stable@FreeBSD.ORG  Fri Feb  7 05:23:05 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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 099F3F67;
 Fri,  7 Feb 2014 05:23:05 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E6BAB1171;
 Fri,  7 Feb 2014 05:23:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s175N4Zq032015;
 Fri, 7 Feb 2014 05:23:04 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s175N4RI032014;
 Fri, 7 Feb 2014 05:23:04 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201402070523.s175N4RI032014@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 7 Feb 2014 05:23:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r261578 - stable/9/sys/rpc
X-SVN-Group: stable-9
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.17
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: Fri, 07 Feb 2014 05:23:05 -0000

Author: mav
Date: Fri Feb  7 05:23:04 2014
New Revision: 261578
URL: http://svnweb.freebsd.org/changeset/base/261578

Log:
  MFC r261449:
  Fix lock acquisition in case no request space available, missed in r260097.

Modified:
  stable/9/sys/rpc/svc.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/rpc/svc.c
==============================================================================
--- stable/9/sys/rpc/svc.c	Fri Feb  7 05:08:59 2014	(r261577)
+++ stable/9/sys/rpc/svc.c	Fri Feb  7 05:23:04 2014	(r261578)
@@ -1180,9 +1180,9 @@ svc_run_internal(SVCPOOL *pool, bool_t i
 			 */
 			xprt->xp_lastactive = time_uptime;
 			do {
-				mtx_unlock(&pool->sp_lock);
 				if (!svc_request_space_available(pool))
 					break;
+				mtx_unlock(&pool->sp_lock);
 				rqstp = NULL;
 				stat = svc_getreq(xprt, &rqstp);
 				if (rqstp) {