PERFORCE change 18615 for review

[Robert Watson]

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

Change 18615 by rwatson at rwatson_tislabs on 2002/10/03 15:22:14

	Selectively integ NFS fix into MAC tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#15 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#15 (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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message