CVS commit: src/sys/fs/udf

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Wed Feb 24 19:20:13 UTC 2010

Modified Files:
        src/sys/fs/udf: udf.h udf_subr.c

Log Message:
Rename metadata partition parameters to be less generic and add the flags.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.102 -r1.103 src/sys/fs/udf/udf_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.39 src/sys/fs/udf/udf.h:1.40
--- src/sys/fs/udf/udf.h:1.39	Wed Feb 24 19:14:12 2010
+++ src/sys/fs/udf/udf.h	Wed Feb 24 19:20:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.39 2010/02/24 19:14:12 reinoud Exp $ */
+/* $NetBSD: udf.h,v 1.40 2010/02/24 19:20:13 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -330,8 +330,9 @@
 	struct udf_node 	*metadatabitmap_node;	/* system node       */
 	struct space_bitmap_desc*metadata_unalloc_dscr;
 	struct udf_bitmap	 metadata_unalloc_bits;
-	uint32_t		 alloc_unit_size;
-	uint16_t		 alignment_unit_size;
+	uint32_t		 metadata_alloc_unit_size;
+	uint16_t		 metadata_alignment_unit_size;
+	uint8_t			 metadata_flags;
 
 	/* rb tree for lookup icb to udf_node and sorted list for sync */
 	kmutex_t	ihash_lock;

Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.102 src/sys/fs/udf/udf_subr.c:1.103
--- src/sys/fs/udf/udf_subr.c:1.102	Wed Feb 24 19:14:12 2010
+++ src/sys/fs/udf/udf_subr.c	Wed Feb 24 19:20:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.102 2010/02/24 19:14:12 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.103 2010/02/24 19:20:13 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.102 2010/02/24 19:14:12 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.103 2010/02/24 19:20:13 reinoud Exp $");
 #endif /* not lint */
 
 
@@ -3119,8 +3119,9 @@
 	int error;
 
 	/* extract our allocation parameters set up on format */
-	ump->alloc_unit_size     = udf_rw32(mapping->pmm.alloc_unit_size);
-	ump->alignment_unit_size = udf_rw16(mapping->pmm.alignment_unit_size);
+	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;