Sync with CSRG.

sys/isofs/cd9660/TODO.hibler

@@ -1,16 +1,16 @@
-#	$NetBSD: TODO.hibler,v 1.5 1994/08/03 06:03:12 mycroft Exp $
+#	$NetBSD: TODO.hibler,v 1.6 1994/12/13 22:33:10 mycroft Exp $
 
 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS).
    Since it was modelled after the inode code, we might be able to merge
    them back.  It looks like a seperate (but very similar) lookup routine
    will be needed due to the associated file stuff.
 
-4. It would be nice to be able to use the vfs_cluster code.
+2. It would be nice to be able to use the vfs_cluster code.
    Unfortunately, if the logical block size is smaller than the page size,
    it won't work.  Also, if throughtput is relatively constant for any
    block size (as it is for the HP drive--150kbs) then clustering may not
    buy much (or may even hurt when vfs_cluster comes up with a large sync
    cluster).
 
-5. Seems like there should be a "notrans" or some such mount option to show
+3. Seems like there should be a "notrans" or some such mount option to show
    filenames as they really are without lower-casing.  Does this make sense?

sys/isofs/cd9660/cd9660_bmap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_bmap.c,v 1.4 1994/07/19 14:14:08 mycroft Exp $	*/
+/*	$NetBSD: cd9660_bmap.c,v 1.5 1994/12/13 22:33:12 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
+ *	@(#)cd9660_bmap.c	8.4 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_lookup.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_lookup.c,v 1.11 1994/07/22 23:17:59 mycroft Exp $	*/
+/*	$NetBSD: cd9660_lookup.c,v 1.12 1994/12/13 22:33:14 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993, 1994
@@ -38,7 +38,8 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
- *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
+ *
+ *	@(#)cd9660_lookup.c	8.5 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_node.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.c,v 1.11 1994/09/22 02:47:31 mycroft Exp $	*/
+/*	$NetBSD: cd9660_node.c,v 1.12 1994/12/13 22:33:16 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
+ *	@(#)cd9660_node.c	8.5 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_node.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.h,v 1.8 1994/09/22 02:47:33 mycroft Exp $	*/
+/*	$NetBSD: cd9660_node.h,v 1.9 1994/12/13 22:33:18 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
+ *	@(#)cd9660_node.h	8.4 (Berkeley) 12/5/94
  */
 
 /*

sys/isofs/cd9660/cd9660_rrip.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_rrip.c,v 1.9 1994/10/29 07:58:38 cgd Exp $	*/
+/*	$NetBSD: cd9660_rrip.c,v 1.10 1994/12/13 22:33:22 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
+ *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_rrip.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_rrip.h,v 1.5 1994/09/19 09:09:52 mycroft Exp $	*/
+/*	$NetBSD: cd9660_rrip.h,v 1.6 1994/12/13 22:33:24 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_rrip.h	8.1 (Berkeley) 1/21/94
+ *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
  */
 
 typedef struct {

sys/isofs/cd9660/cd9660_util.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_util.c,v 1.7 1994/09/19 09:09:54 mycroft Exp $	*/
+/*	$NetBSD: cd9660_util.c,v 1.8 1994/12/13 22:33:25 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_util.c	8.1 (Berkeley) 1/21/94
+ *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_vfsops.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vfsops.c,v 1.9 1994/07/19 15:27:42 mycroft Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.10 1994/12/13 22:33:27 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
+ *	@(#)cd9660_vfsops.c	8.9 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>

sys/isofs/cd9660/cd9660_vnops.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.18 1994/12/06 06:56:40 mycroft Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.19 1994/12/13 22:33:29 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
+ *	@(#)cd9660_vnops.c	8.15 (Berkeley) 12/5/94
  */
 
 #include <sys/param.h>
@@ -1007,6 +1007,12 @@ cd9660_enotsupp()
 #define cd9660_setattr \
 	((int (*) __P((struct  vop_setattr_args *)))cd9660_enotsupp)
 #define cd9660_write ((int (*) __P((struct  vop_write_args *)))cd9660_enotsupp)
+#ifdef NFSSERVER
+int	lease_check __P((struct vop_lease_args *));
+#define	cd9660_lease_check lease_check
+#else
+#define	cd9660_lease_check ((int (*) __P((struct vop_lease_args *)))nullop)
+#endif
 #define cd9660_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define cd9660_remove \
 	((int (*) __P((struct  vop_remove_args *)))cd9660_enotsupp)
@@ -1048,6 +1054,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
 	{ &vop_read_desc, cd9660_read },	/* read */
 	{ &vop_write_desc, cd9660_write },	/* write */
+	{ &vop_lease_desc, cd9660_lease_check },/* lease */
 	{ &vop_ioctl_desc, cd9660_ioctl },	/* ioctl */
 	{ &vop_select_desc, cd9660_select },	/* select */
 	{ &vop_mmap_desc, cd9660_mmap },	/* mmap */
@@ -1099,6 +1106,7 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
 	{ &vop_read_desc, spec_read },		/* read */
 	{ &vop_write_desc, spec_write },	/* write */
+	{ &vop_lease_desc, spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
 	{ &vop_select_desc, spec_select },	/* select */
 	{ &vop_mmap_desc, spec_mmap },		/* mmap */
@@ -1148,6 +1156,7 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
 	{ &vop_read_desc, fifo_read },		/* read */
 	{ &vop_write_desc, fifo_write },	/* write */
+	{ &vop_lease_desc, fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
 	{ &vop_select_desc, fifo_select },	/* select */
 	{ &vop_mmap_desc, fifo_mmap },		/* mmap */

sys/isofs/cd9660/iso.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: iso.h,v 1.7 1994/09/19 09:09:59 mycroft Exp $	*/
+/*	$NetBSD: iso.h,v 1.8 1994/12/13 22:33:32 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)iso.h	8.2 (Berkeley) 1/23/94
+ *	@(#)iso.h	8.4 (Berkeley) 12/5/94
  */
 
 #define ISODCL(from, to) (to - from + 1)