From owner-svn-src-user@FreeBSD.ORG  Tue Nov 11 19:41:13 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 B7F02106567C;
	Tue, 11 Nov 2008 19:41:13 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id AAB778FC35;
	Tue, 11 Nov 2008 19:41:13 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from fledge.watson.org (fledge.watson.org [65.122.17.41])
	by cyrus.watson.org (Postfix) with ESMTP id 698B946B43;
	Tue, 11 Nov 2008 14:41:13 -0500 (EST)
Date: Tue, 11 Nov 2008 19:41:13 +0000 (GMT)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Doug Rabson <dfr@FreeBSD.org>
In-Reply-To: <200811111551.mABFpjNd005723@svn.freebsd.org>
Message-ID: <alpine.BSF.1.10.0811111940020.63650@fledge.watson.org>
References: <200811111551.mABFpjNd005723@svn.freebsd.org>
User-Agent: Alpine 1.10 (BSF 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: 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 19:41:13 -0000

On Tue, 11 Nov 2008, Doug Rabson wrote:

> 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();
> +

Perhaps this should now be an XXXDFR? :-)  Or alternatively, if you think the 
locking really is needed, we should convert my old and questionable comment to 
a more firm one.

Robert N M Watson
Computer Laboratory
University of Cambridge

> 	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);
>