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/fs/cd9660/cd9660_node.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/cd9660/cd9660_node.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.29.22.1
retrieving revision 1.30
diff -u -p -r1.29.22.1 -r1.30
--- src/sys/fs/cd9660/cd9660_node.c	2014/05/21 21:06:40	1.29.22.1
+++ src/sys/fs/cd9660/cd9660_node.c	2014/02/27 16:51:38	1.30
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.c,v 1.29.22.1 2014/05/21 21:06:40 bouyer Exp $	*/
+/*	$NetBSD: cd9660_node.c,v 1.30 2014/02/27 16:51:38 hannken Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.29.22.1 2014/05/21 21:06:40 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.30 2014/02/27 16:51:38 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -170,6 +170,7 @@ void
 cd9660_ihashins(struct iso_node *ip)
 {
 	struct ihashhead *ipp;
+	int error __diagused;
 
 	KASSERT(mutex_owned(&cd9660_hashlock));
 
@@ -178,7 +179,8 @@ cd9660_ihashins(struct iso_node *ip)
 	LIST_INSERT_HEAD(ipp, ip, i_hash);
 	mutex_exit(&cd9660_ihash_lock);
 
-	VOP_LOCK(ITOV(ip), LK_EXCLUSIVE);
+	error = VOP_LOCK(ITOV(ip), LK_EXCLUSIVE);
+	KASSERT(error == 0);
 }
 
 /*
@@ -438,14 +440,7 @@ isodirino(struct iso_directory_record *i
 {
 	ino_t ino;
 
-	/*
-	 * Note there is an inverse calculation in
-	 * cd9660_vfsops.c:cd9660_vget_internal():
-	 *   ip->iso_start = ino >> imp->im_bshift;
-	 * and also a calculation of the isodir pointer
-	 * from an inode in cd9660_vnops.c:cd9660_readlink()
-	 */
-	ino = ((ino_t)isonum_733(isodir->extent) +
-		isonum_711(isodir->ext_attr_length)) << imp->im_bshift;
-	return ino;
+	ino = (isonum_733(isodir->extent) + isonum_711(isodir->ext_attr_length))
+	      << imp->im_bshift;
+	return (ino);
 }