From owner-svn-src-user@FreeBSD.ORG  Tue Nov 11 15:51:45 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC465106564A;
	Tue, 11 Nov 2008 15:51:45 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D0EF08FC25;
	Tue, 11 Nov 2008 15:51:45 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mABFpjBM005724;
	Tue, 11 Nov 2008 15:51:45 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mABFpjNd005723;
	Tue, 11 Nov 2008 15:51:45 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811111551.mABFpjNd005723@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Tue, 11 Nov 2008 15:51:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184851 - user/dfr/gssapi/6/sys/nfsserver
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Nov 2008 15:51:46 -0000

Author: dfr
Date: Tue Nov 11 15:51:45 2008
New Revision: 184851
URL: http://svn.freebsd.org/changeset/base/184851

Log:
  Fix locking.

Modified:
  user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c

Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c	Tue Nov 11 14:58:07 2008	(r184850)
+++ user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c	Tue Nov 11 15:51:45 2008	(r184851)
@@ -227,10 +227,14 @@ nfs_rephead(int siz, struct nfsrv_descri
 	if (err == EBADRPC)
 		return (NULL);
 
+	/* XXXRW: not 100% clear the lock is needed here. */
+	NFSD_LOCK_ASSERT();
+
 	nd->nd_repstat = err;
 	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
 		siz = 0;
 
+	NFSD_UNLOCK();
 	MGET(mreq, M_WAIT, MT_DATA);
 
 	/*
@@ -241,6 +245,7 @@ nfs_rephead(int siz, struct nfsrv_descri
 		MCLGET(mreq, M_WAIT);
 	}
 	mb = mreq;
+	NFSD_LOCK();
 	bpos = mtod(mb, caddr_t);
 
 	if (err != NFSERR_RETVOID) {
@@ -371,7 +376,9 @@ nfssvc_program(struct svc_req *rqst, SVC
 	}
 	nfsrvstats.srvrpccnt[nd.nd_procnum]++;
 
+	NFSD_LOCK();
 	error = proc(&nd, NULL, curthread, &mrep);
+	NFSD_UNLOCK();
 
 	if (nd.nd_cr)
 		crfree(nd.nd_cr);