From owner-svn-src-head@FreeBSD.ORG  Mon Jun  9 15:00:44 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 1D05E961;
 Mon,  9 Jun 2014 15:00:44 +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 0A1C32D2C;
 Mon,  9 Jun 2014 15:00:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59F0hrC055858;
 Mon, 9 Jun 2014 15:00:43 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59F0hcq055857;
 Mon, 9 Jun 2014 15:00:43 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201406091500.s59F0hcq055857@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 9 Jun 2014 15:00:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267278 - head/sys/rpc
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
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: Mon, 09 Jun 2014 15:00:44 -0000

Author: mav
Date: Mon Jun  9 15:00:43 2014
New Revision: 267278
URL: http://svnweb.freebsd.org/changeset/base/267278

Log:
  Fix race in r267221.
  
  MFC after:	2 weeks

Modified:
  head/sys/rpc/svc.c

Modified: head/sys/rpc/svc.c
==============================================================================
--- head/sys/rpc/svc.c	Mon Jun  9 14:46:32 2014	(r267277)
+++ head/sys/rpc/svc.c	Mon Jun  9 15:00:43 2014	(r267278)
@@ -1210,15 +1210,17 @@ svc_run_internal(SVCGROUP *grp, bool_t i
 				 */
 				if (pool->sp_assign) {
 					stpref = pool->sp_assign(st, rqstp);
+					rqstp->rq_thread = stpref;
 					STAILQ_INSERT_TAIL(&stpref->st_reqs,
 					    rqstp, rq_link);
 					mtx_unlock(&stpref->st_lock);
-					rqstp->rq_thread = stpref;
 					if (stpref != st)
 						rqstp = NULL;
-				} else
+				} else {
+					rqstp->rq_thread = st;
 					STAILQ_INSERT_TAIL(&st->st_reqs,
 					    rqstp, rq_link);
+				}
 			}
 		} while (rqstp == NULL && stat == XPRT_MOREREQS
 		    && grp->sg_state != SVCPOOL_CLOSING);