 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_extern.h,v 1.24 2008/06/28 01:34:05 rumble Exp $	*/
+/*	$NetBSD: cd9660_extern.h,v 1.25 2013/06/19 18:16:53 dholland Exp $	*/
 /*-
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley
  * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
  * Support code is derived from software contributed to Berkeley
  * by Atsushi Murai (amurai@spec.co.jp).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -75,30 +75,30 @@ struct iso_mnt {
 	int volume_space_size;
 	char root[ISODCL (157, 190)];
 	int root_extent;
 	int root_size;
 	enum ISO_FTYPE  iso_ftype;
 	int rr_skip;
 	int rr_skip0;
 };
 #define VFSTOISOFS(mp)	((struct iso_mnt *)((mp)->mnt_data))
-#define blkoff(imp, loc)	((loc) & (imp)->im_bmask)
+#define cd9660_blkoff(imp, loc)		((loc) & (imp)->im_bmask)
 #define lblktosize(imp, blk)	((blk) << (imp)->im_bshift)
 #define lblkno(imp, loc)	((loc) >> (imp)->im_bshift)
-#define blksize(imp, ip, lbn)	((imp)->logical_block_size)
+#define cd9660_blksize(imp, ip, lbn)	((imp)->logical_block_size)
 #ifdef _KERNEL
 VFS_PROTOS(cd9660);
 #include <sys/mallocvar.h>
 MALLOC_DECLARE(M_ISOFSMNT);
 extern struct pool cd9660_node_pool;
 extern int cd9660_utf8_joliet;
 int cd9660_mountroot(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_lookup.c,v 1.23 2012/12/20 08:03:42 hannken Exp $	*/
+/*	$NetBSD: cd9660_lookup.c,v 1.24 2013/06/19 18:16:53 dholland Exp $	*/
 /*-
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley
  * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
  * Support code is derived from software contributed to Berkeley
  * by Atsushi Murai (amurai@spec.co.jp).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
+ *
  *	@(#)cd9660_lookup.c	8.5 (Berkeley) 5/27/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.23 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.24 2013/06/19 18:16:53 dholland Exp $");
 #include <sys/param.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <fs/cd9660/iso.h>
 #include <fs/cd9660/cd9660_extern.h>
 #include <fs/cd9660/cd9660_node.h>
 @@ -412,24 +412,24 @@ found:
  */
 int
 cd9660_blkatoff(struct vnode *vp, off_t offset, char **res, struct buf **bpp)
+{
 	struct iso_node *ip;
 	struct iso_mnt *imp;
 	struct buf *bp;
 	daddr_t lbn;
 	int bsize, error;
 	ip = VTOI(vp);
 	imp = ip->i_mnt;
 	lbn = lblkno(imp, offset);
-	bsize = blksize(imp, ip, lbn);
+	bsize = cd9660_blksize(imp, ip, lbn);
 	if ((error = bread(vp, lbn, bsize, NOCRED, 0, &bp)) != 0) {
 		*bpp = NULL;
 		return (error);
+	}
 	if (res)
-		*res = (char *)bp->b_data + blkoff(imp, offset);
+		*res = (char *)bp->b_data + cd9660_blkoff(imp, offset);
 	*bpp = bp;
 	return (0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_vfsops.c,v 1.76 2012/12/20 08:03:42 hannken Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.77 2013/06/19 18:16:53 dholland Exp $	*/
 /*-
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley
  * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
  * Support code is derived from software contributed to Berkeley
  * by Atsushi Murai (amurai@spec.co.jp).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.76 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.77 2013/06/19 18:16:53 dholland Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <miscfs/genfs/genfs.h>
 @@ -756,27 +756,27 @@ cd9660_vget_internal(struct mount *mp, i
 	cd9660_ihashins(ip);
 	mutex_exit(&cd9660_hashlock);
 	if (isodir == 0) {
 		int lbn, off;
 		lbn = lblkno(imp, ino);
 		if (lbn >= imp->volume_space_size) {
 			vput(vp);
 			printf("fhtovp: lbn exceed volume space %d\n", lbn);
 			return (ESTALE);
+		}
-		off = blkoff(imp, ino);
+		off = cd9660_blkoff(imp, ino);
 		if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size) {
 			vput(vp);
 			printf("fhtovp: crosses block boundary %d\n",
 			    off + ISO_DIRECTORY_RECORD_SIZE);
 			return (ESTALE);
+		}
 		error = bread(imp->im_devvp,
 			      lbn << (imp->im_bshift - DEV_BSHIFT),
 			      imp->logical_block_size, NOCRED, 0, &bp);
 		if (error) {
 			vput(vp);
 			printf("fhtovp: bread error %d\n",error);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.44 2013/06/19 18:16:53 dholland Exp $	*/
 /*-
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley
  * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
  * Support code is derived from software contributed to Berkeley
  * by Atsushi Murai (amurai@spec.co.jp).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)cd9660_vnops.c	8.15 (Berkeley) 5/27/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.44 2013/06/19 18:16:53 dholland Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 @@ -240,37 +240,37 @@ cd9660_read(void *v)
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
 			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
 			if (error)
 				break;
+		}
 		goto out;
+	}
 	do {
 		lbn = lblkno(imp, uio->uio_offset);
-		on = blkoff(imp, uio->uio_offset);
+		on = cd9660_blkoff(imp, uio->uio_offset);
 		n = MIN(imp->logical_block_size - on, uio->uio_resid);
 		diff = (off_t)ip->i_size - uio->uio_offset;
 		if (diff <= 0)
 			return (0);
 		if (diff < n)
 			n = diff;
-		size = blksize(imp, ip, lbn);
+		size = cd9660_blksize(imp, ip, lbn);
 		rablock = lbn + 1;
 		if (lblktosize(imp, rablock) < ip->i_size) {
-			rasize = blksize(imp, ip, rablock);
+			rasize = cd9660_blksize(imp, ip, rablock);
 			error = breadn(vp, lbn, size, &rablock,
 				       &rasize, 1, NOCRED, 0, &bp);
 		} else {
 			error = bread(vp, lbn, size, NOCRED, 0, &bp);
+		}
 		if (error) {
 			return (error);
+		}
 		n = MIN(n, size - bp->b_resid);
 		error = uiomove((char *)bp->b_data + on, (int)n, uio);
 		brelse(bp, 0);
 	} while (error == 0 && uio->uio_resid > 0 && n != 0);