Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/nfs/nfs_serv.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/nfs/nfs_serv.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.138.12.1
retrieving revision 1.139
diff -u -p -r1.138.12.1 -r1.139
--- src/sys/nfs/nfs_serv.c	2008/12/13 01:15:28	1.138.12.1
+++ src/sys/nfs/nfs_serv.c	2008/11/19 18:36:09	1.139
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_serv.c,v 1.138.12.1 2008/12/13 01:15:28 haad Exp $	*/
+/*	$NetBSD: nfs_serv.c,v 1.139 2008/11/19 18:36:09 ad Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.138.12.1 2008/12/13 01:15:28 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.139 2008/11/19 18:36:09 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,7 +96,7 @@ extern struct nfsstats nfsstats;
 extern const nfstype nfsv2_type[9];
 extern const nfstype nfsv3_type[9];
 int nfsrvw_procrastinate = NFS_GATHERDELAY * 1000;
-bool nfsd_use_loan = true;	/* use page-loan for READ OP */
+int nfsd_use_loan = 1;	/* use page-loan for READ OP */
 
 #define	nqsrv_getl(vp, rw)	/* nothing */
 
@@ -2562,10 +2562,9 @@ out:
 struct flrep {
 	nfsuint64 fl_off;
 	u_int32_t fl_postopok;
-	struct nfs_fattr fl_fattr; /* XXX: must be of fattr3 size */
+	u_int32_t fl_fattr[NFSX_V3FATTR / sizeof (u_int32_t)];
 	u_int32_t fl_fhok;
 	u_int32_t fl_fhsize;
-	/* handle comes here, filled in dynamically */
 };
 
 int