From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 15:01:25 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB8ED16A4D0; Tue,  9 Dec 2003 15:01:24 -0800 (PST)
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 C6D4D16A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:01:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AE34443D28
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 15:01:23 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9N1NXJ033253
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 15:01:23 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9N1N6n033250
	for perforce@freebsd.org; Tue, 9 Dec 2003 15:01:23 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 15:01:23 -0800 (PST)
Message-Id: <200312092301.hB9N1N6n033250@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43695 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: Tue, 09 Dec 2003 23:01:25 -0000

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

Change 43695 by sam@sam_ebb on 2003/12/09 15:00:38

	o remove Giant assertions

Affected files ...

.. //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvsock.c#3 edit
.. //depot/projects/netperf+sockets/sys/nfsserver/nfs_syscalls.c#3 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvsock.c#3 (text+ko) ====

@@ -425,8 +425,6 @@
 		goto dorecs;
 	}
 #endif
-	GIANT_REQUIRED;		/* XXX until socket locking is done */
-
 	auio.uio_td = NULL;
 	if (so->so_type == SOCK_STREAM) {
 		/*
@@ -727,8 +725,6 @@
 	struct sockaddr *sendnam;
 	int error, soflags, flags;
 
-	GIANT_REQUIRED;		/* XXX until socket locking is done */
-
 	soflags = so->so_proto->pr_flags;
 	if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED))
 		sendnam = NULL;

==== //depot/projects/netperf+sockets/sys/nfsserver/nfs_syscalls.c#3 (text+ko) ====

@@ -199,8 +199,6 @@
 	struct socket *so;
 	int error, s;
 
-	GIANT_REQUIRED;		/* XXX until socket locking done */
-
 	so = fp->f_data;
 #if 0
 	tslp = NULL;