From owner-p4-projects  Thu Oct  3 14:57:42 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DDB9437B404; Thu,  3 Oct 2002 14:57:40 -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 761BD37B401
	for <perforce@freebsd.org>; Thu,  3 Oct 2002 14:57:40 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F02E43E4A
	for <perforce@freebsd.org>; Thu,  3 Oct 2002 14:57:40 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g93LveCo042208
	for <perforce@freebsd.org>; Thu, 3 Oct 2002 14:57:40 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g93LvdpZ042205
	for perforce@freebsd.org; Thu, 3 Oct 2002 14:57:39 -0700 (PDT)
Date: Thu, 3 Oct 2002 14:57:39 -0700 (PDT)
Message-Id: <200210032157.g93LvdpZ042205@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 18614 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18614

Change 18614 by rwatson@rwatson_tislabs on 2002/10/03 14:57:09

	Integrate NFSv2 removal hang in server code.

Affected files ...

.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#14 integrate

Differences ...

==== //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#14 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.123 2002/09/25 02:39:39 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.124 2002/10/03 21:50:37 rwatson Exp $");
 
 /*
  * nfs version 2 and 3 server calls to vnode ops
@@ -2905,10 +2905,9 @@
 	if (dirp)
 		diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 	nfsm_reply(NFSX_WCCDATA(v3));
-	if (v3) {
+	error = 0;
+	if (v3)
 		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-	}
 	/* fall through */
 
 nfsmout:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message