 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_subr.c,v 1.110 2011/01/13 13:13:31 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.111 2011/01/21 20:36:53 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.110 2011/01/13 13:13:31 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.111 2011/01/21 20:36:53 reinoud Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -973,38 +973,59 @@ int
 udf_get_record_vpart(struct udf_mount *ump, int udf_c_type)
+{
 	int vpart_num;
 	vpart_num = ump->data_part;
 	if (udf_c_type == UDF_C_NODE)
 		vpart_num = ump->node_part;
 	if (udf_c_type == UDF_C_FIDS)
 		vpart_num = ump->fids_part;
 	return vpart_num;
+}
 /*
  * BUGALERT: some rogue implementations use random physical partition
  * numbers to break other implementations so lookup the number.
  */
 static uint16_t
 udf_find_raw_phys(struct udf_mount *ump, uint16_t raw_phys_part)
+{
 	struct part_desc *part;
 	uint16_t phys_part;
 	for (phys_part = 0; phys_part < UDF_PARTITIONS; phys_part++) {
 		part = ump->partitions[phys_part];
 		if (part == NULL)
 			break;
 		if (udf_rw16(part->part_num) == raw_phys_part)
 			break;
+	}
 	return phys_part;
+}
 /* --------------------------------------------------------------------- */
 /* we dont try to be smart; we just record the parts */
 #define UDF_UPDATE_DSCR(name, dscr) \
 	if (name) \
 		free(name, M_UDFVOLD); \
 	name = dscr;
 static int
 udf_process_vds_descriptor(struct udf_mount *ump, union dscrptr *dscr)
+{
 	struct part_desc *part;
 	uint16_t phys_part, raw_phys_part;
 	DPRINTF(VOLUMES, ("\tprocessing VDS descr %d\n",
 	    udf_rw16(dscr->tag.id)));
 	switch (udf_rw16(dscr->tag.id)) {
 	case TAGID_PRI_VOL :		/* primary partition		*/
 		UDF_UPDATE_DSCR(ump->primary_vol, &dscr->pvd);
 		break;
 	case TAGID_LOGVOL :		/* logical volume		*/
 		UDF_UPDATE_DSCR(ump->logical_vol, &dscr->lvd);
 		break;
 	case TAGID_UNALLOC_SPACE :	/* unallocated space		*/
 		UDF_UPDATE_DSCR(ump->unallocated, &dscr->usd);
 @@ -1016,33 +1037,28 @@ udf_process_vds_descriptor(struct udf_mo
 	case TAGID_PARTITION :		/* physical partition		*/
 		/* not much use if its not allocated */
 		if ((udf_rw16(dscr->pd.flags) & UDF_PART_FLAG_ALLOCATED) == 0) {
 			free(dscr, M_UDFVOLD);
 			break;
+		}
 		/*
 		 * BUGALERT: some rogue implementations use random physical
 		 * partition numbers to break other implementations so lookup
 		 * the number.
 		 */
 		raw_phys_part = udf_rw16(dscr->pd.part_num);
-		for (phys_part = 0; phys_part < UDF_PARTITIONS; phys_part++) {
+		phys_part = udf_find_raw_phys(ump, raw_phys_part);
 			part = ump->partitions[phys_part];
 			if (part == NULL)
 				break;
 			if (udf_rw16(part->part_num) == raw_phys_part)
 				break;
 		if (phys_part == UDF_PARTITIONS) {
 			free(dscr, M_UDFVOLD);
 			return EINVAL;
+		}
 		UDF_UPDATE_DSCR(ump->partitions[phys_part], &dscr->pd);
 		break;
 	case TAGID_VOL :		/* volume space extender; rare	*/
 		DPRINTF(VOLUMES, ("VDS extender ignored\n"));
 		free(dscr, M_UDFVOLD);
 		break;
 	default :
 		DPRINTF(VOLUMES, ("Unhandled VDS type %d\n",
 @@ -1829,27 +1845,26 @@ udf_write_metadata_partition_spacetable(
 /* --------------------------------------------------------------------- */
 /*
  * Checks if ump's vds information is correct and complete
  */
 int
 udf_process_vds(struct udf_mount *ump) {
 	union udf_pmap *mapping;
 	/* struct udf_args *args = &ump->mount_args; */
 	struct logvol_int_desc *lvint;
 	struct udf_logvol_info *lvinfo;
 	struct part_desc *part;
 	uint32_t n_pm, mt_l;
 	uint8_t *pmap_pos;
 	char *domain_name, *map_name;
 	const char *check_name;
 	char bits[128];
 	int pmap_stype, pmap_size;
 	int pmap_type, log_part, phys_part, raw_phys_part, maps_on;
 	int n_phys, n_virt, n_spar, n_meta;
 	int len, error;
 	if (ump == NULL)
 		return ENOENT;
 @@ -1960,33 +1975,27 @@ udf_process_vds(struct udf_mount *ump) {
 				ump->fids_part = log_part;
 				break;
+			}
 			break;
 		default:
 			return EINVAL;
+		}
 		/*
 		 * BUGALERT: some rogue implementations use random physical
 		 * partition numbers to break other implementations so lookup
 		 * the number.
 		 */
-		for (phys_part = 0; phys_part < UDF_PARTITIONS; phys_part++) {
+		phys_part = udf_find_raw_phys(ump, raw_phys_part);
 			part = ump->partitions[phys_part];
 			if (part == NULL)
 				continue;
 			if (udf_rw16(part->part_num) == raw_phys_part)
 				break;
 		DPRINTF(VOLUMES, ("\t%d -> %d(%d) type %d\n", log_part,
 		    raw_phys_part, phys_part, pmap_type));
 		if (phys_part == UDF_PARTITIONS)
 			return EINVAL;
 		if (pmap_type == UDF_VTOP_TYPE_UNKNOWN)
 			return EINVAL;
 		ump->vtop   [log_part] = phys_part;
 		ump->vtop_tp[log_part] = pmap_type;
 		pmap_pos += pmap_size;
 @@ -3106,37 +3115,48 @@ udf_read_sparables(struct udf_mount *ump
 		return 0;
 	return ENOENT;
+}
 /* --------------------------------------------------------------------- */
 static int
 udf_read_metadata_nodes(struct udf_mount *ump, union udf_pmap *mapping)
+{
 	struct part_map_meta *pmm = &mapping->pmm;
 	struct long_ad	 icb_loc;
 	struct vnode *vp;
 	uint16_t raw_phys_part, phys_part;
 	int error;
 	/*
 	 * BUGALERT: some rogue implementations use random physical
 	 * partition numbers to break other implementations so lookup
 	 * the number.
 	 */
 	/* extract our allocation parameters set up on format */
 	ump->metadata_alloc_unit_size     = udf_rw32(mapping->pmm.alloc_unit_size);
 	ump->metadata_alignment_unit_size = udf_rw16(mapping->pmm.alignment_unit_size);
 	ump->metadata_flags = mapping->pmm.flags;
 	DPRINTF(VOLUMES, ("Reading in Metadata files\n"));
-	icb_loc.loc.part_num = pmm->part_num;
+	raw_phys_part = udf_rw16(pmm->part_num);
-	icb_loc.loc.lb_num   = pmm->meta_file_lbn;
+	phys_part = udf_find_raw_phys(ump, raw_phys_part);
 	icb_loc.loc.part_num = udf_rw16(phys_part);
 	DPRINTF(VOLUMES, ("Metadata file\n"));
 	icb_loc.loc.lb_num   = pmm->meta_file_lbn;
 	error = udf_get_node(ump, &icb_loc, &ump->metadata_node);
 	if (ump->metadata_node) {
 		vp = ump->metadata_node->vnode;
 		UDF_SET_SYSTEMFILE(vp);
+	}
 	icb_loc.loc.lb_num   = pmm->meta_mirror_file_lbn;
 	if (icb_loc.loc.lb_num != -1) {
 		DPRINTF(VOLUMES, ("Metadata copy file\n"));
 		error = udf_get_node(ump, &icb_loc, &ump->metadatamirror_node);
 		if (ump->metadatamirror_node) {
 			vp = ump->metadatamirror_node->vnode;
 			UDF_SET_SYSTEMFILE(vp);
 @@ -5299,26 +5319,27 @@ udf_get_node(struct udf_mount *ump, stru
 	assert(node_icb_loc);
 	udf_node = udf_node_lookup(ump, node_icb_loc);
 	if (udf_node) {
 		DPRINTF(NODE, ("\tgot it from the hash!\n"));
 		/* vnode is returned locked */
 		*udf_noderes = udf_node;
 		mutex_exit(&ump->get_node_lock);
 		return 0;
+	}
 	/* garbage check: translate udf_node_icb_loc to sectornr */
 	error = udf_translate_vtop(ump, node_icb_loc, &sector, &dummy);
 	if (error) {
 		DPRINTF(NODE, ("\tcan't translate icb address!\n"));
 		/* no use, this will fail anyway */
 		mutex_exit(&ump->get_node_lock);
 		return EINVAL;
+	}
 	/* build udf_node (do initialise!) */
 	udf_node = pool_get(&udf_node_pool, PR_WAITOK);
 	memset(udf_node, 0, sizeof(struct udf_node));
 	DPRINTF(NODE, ("\tget new vnode\n"));
 	/* give it a vnode */
 	error = getnewvnode(VT_UDF, ump->vfs_mountp, udf_vnodeop_p, &nvp);
         if (error) {