 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_allocation.c,v 1.24 2009/06/18 15:06:38 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.25 2009/06/18 15:09:18 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.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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_allocation.c,v 1.24 2009/06/18 15:06:38 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.25 2009/06/18 15:09:18 reinoud Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 /* TODO strip */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 @@ -1018,27 +1018,27 @@ udf_allocate_space(struct udf_mount *ump
 	case UDF_ALLOC_RELAXEDSEQUENTIAL :	/* UDF 2.50/~meta BluRay-R  */
 		printf("ALERT: udf_allocate_space : allocation %d "
 				"not implemented yet!\n", alloc_type);
 		/* TODO implement, doesn't have to be contiguous */
 		error = ENOSPC;
 		break;
+	}
 #ifdef DEBUG
 	if (udf_verbose & UDF_DEBUG_ALLOC) {
 		lmappos = lmapping;
 		printf("udf_allocate_space, allocated logical lba :\n");
 		for (lb_num = 0; lb_num < num_lb; lb_num++) {
-			printf("%s %"PRIu64",", (lb_num > 0)?",":"",
+			printf("%s %"PRIu64, (lb_num > 0)?",":"",
 				*lmappos++);
+		}
 		printf("\n");
+	}
 #endif
 	mutex_exit(&ump->allocate_mutex);
 	return error;
+}
 /* --------------------------------------------------------------------- */
 void
 @@ -2243,27 +2243,27 @@ udf_grow_node(struct udf_node *udf_node,
 			/* read in using the `normal' vn_rdwr() */
 			error = vn_rdwr(UIO_READ, udf_node->vnode,
 					evacuated_data, old_size, 0,
 					UIO_SYSSPACE, IO_ALTSEMANTICS | IO_NODELOCKED,
 					FSCRED, NULL, NULL);
 			/* enter again */
 			UDF_LOCK_NODE(udf_node, 0);
+		}
 		/* convert to a normal alloc and select type */
 		isdir    = (vp->v_type == VDIR);
 		my_part  = udf_rw16(udf_node->loc.loc.part_num);
-		dst_part = isdir? ump->fids_part : ump->data_part;
+		dst_part = isdir ? ump->fids_part : ump->data_part;
 		addr_type = UDF_ICB_SHORT_ALLOC;
 		if (dst_part != my_part)
 			addr_type = UDF_ICB_LONG_ALLOC;
 		icbflags &= ~UDF_ICB_TAG_FLAGS_ALLOC_MASK;
 		icbflags |= addr_type;
 		icbtag->flags = udf_rw16(icbflags);
 		/* wipe old descriptor space */
 		udf_wipe_adslots(udf_node);
 		memset(&c_ad, 0, sizeof(struct long_ad));
 		c_ad.len          = udf_rw32(old_size | UDF_EXT_FREE);