From owner-p4-projects@FreeBSD.ORG  Sun May 30 18:28:09 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7CFB316A4D0; Sun, 30 May 2004 18:28:09 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5870116A4CE
	for <perforce@freebsd.org>; Sun, 30 May 2004 18:28:09 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5146643D5A
	for <perforce@freebsd.org>; Sun, 30 May 2004 18:28:09 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V1S9U0042594
	for <perforce@freebsd.org>; Sun, 30 May 2004 18:28:09 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V1S8ot042591
	for perforce@freebsd.org; Sun, 30 May 2004 18:28:08 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 30 May 2004 18:28:08 -0700 (PDT)
Message-Id: <200405310128.i4V1S8ot042591@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 53832 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 May 2004 01:28:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=53832

Change 53832 by rwatson@rwatson_paprika on 2004/05/30 18:27:17

	Integrate netperf_socket from CVS HEAD:
	
	- Fix for NFS server system call running Giant-free.

Affected files ...

.. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#6 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.127 2004/05/24 04:06:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.128 2004/05/31 00:59:10 rwatson Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
@@ -551,7 +551,7 @@
 		nfsrv_timer(0);
 
 		nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg;
-		sysent[SYS_nfssvc].sy_narg = 2;
+		sysent[SYS_nfssvc].sy_narg = 2 | SYF_MPSAFE;
 		nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call;
 		sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc;
 		break;