From 629ef9cd7813712749ae88ab3faf8d03d11e1224 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Tue, 13 Dec 1994 17:17:01 +0000
Subject: [PATCH] Sync with CSRG.

---
 sys/nfs/nfs_serv.c     | 4 ++--
 sys/nfs/nfs_srvcache.c | 4 ++--
 sys/nfs/nfsmount.h     | 4 ++--
 sys/nfs/nfsnode.h      | 5 +++--
 sys/nfs/nfsrvcache.h   | 4 ++--
 sys/nfs/nqnfs.h        | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 7686a6621e83..54b48b151273 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_serv.c,v 1.16 1994/06/29 06:42:13 cgd Exp $	*/
+/*	$NetBSD: nfs_serv.c,v 1.17 1994/12/13 17:17:01 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
+ *	@(#)nfs_serv.c	8.4 (Berkeley) 6/4/94
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index f88a0bcccb30..9e2d9ea0a35a 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_srvcache.c,v 1.9 1994/08/17 12:34:12 mycroft Exp $	*/
+/*	$NetBSD: nfs_srvcache.c,v 1.10 1994/12/13 17:17:03 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfs_srvcache.c	8.1 (Berkeley) 6/10/93
+ *	@(#)nfs_srvcache.c	8.2 (Berkeley) 8/18/94
  */
 
 /*
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index d904f037e966..96e9f1d28372 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsmount.h,v 1.6 1994/08/18 22:48:03 mycroft Exp $	*/
+/*	$NetBSD: nfsmount.h,v 1.7 1994/12/13 17:17:04 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
+ *	@(#)nfsmount.h	8.2 (Berkeley) 8/18/94
  */
 
 /*
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 76e803f59c89..9708687e418f 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsnode.h,v 1.12 1994/08/18 22:48:05 mycroft Exp $	*/
+/*	$NetBSD: nfsnode.h,v 1.13 1994/12/13 17:17:05 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
+ *	@(#)nfsnode.h	8.6 (Berkeley) 8/18/94
  */
 
 /*
@@ -124,6 +124,7 @@ int	nfs_getattr __P((struct vop_getattr_args *));
 int	nfs_setattr __P((struct vop_setattr_args *));
 int	nfs_read __P((struct vop_read_args *));
 int	nfs_write __P((struct vop_write_args *));
+#define	nfs_lease_check ((int (*) __P((struct  vop_lease_args *)))nullop)
 int	nfsspec_read __P((struct vop_read_args *));
 int	nfsspec_write __P((struct vop_write_args *));
 #ifdef FIFO
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index b68ee705bad3..d6a1417b00c4 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsrvcache.h,v 1.7 1994/08/18 22:48:08 mycroft Exp $	*/
+/*	$NetBSD: nfsrvcache.h,v 1.8 1994/12/13 17:17:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
+ *	@(#)nfsrvcache.h	8.2 (Berkeley) 8/18/94
  */
 
 /*
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index ce91e8b31e21..f5f07347afc1 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nqnfs.h,v 1.3 1994/08/18 22:48:10 mycroft Exp $	*/
+/*	$NetBSD: nqnfs.h,v 1.4 1994/12/13 17:17:08 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
+ *	@(#)nqnfs.h	8.2 (Berkeley) 8/18/94
  */
 
 /*