patch-2.4.6 linux/fs/udf/udf_sb.h
Next file: linux/fs/udf/udfdecl.h
Previous file: linux/fs/udf/udf_i.h
Back to the patch index
Back to the overall index
- Lines: 108
- Date:
Mon Jun 11 19:15:27 2001
- Orig file:
v2.4.5/linux/fs/udf/udf_sb.h
- Orig date:
Mon Mar 20 08:17:43 2000
diff -u --recursive --new-file v2.4.5/linux/fs/udf/udf_sb.h linux/fs/udf/udf_sb.h
@@ -1,11 +1,11 @@
#ifndef __LINUX_UDF_SB_H
#define __LINUX_UDF_SB_H
-/* Since UDF 1.50 is ISO 13346 based... */
-#define UDF_SUPER_MAGIC 0x15013346
+/* Since UDF 2.01 is ISO 13346 based... */
+#define UDF_SUPER_MAGIC 0x15013346
-#define UDF_MAX_READ_VERSION 0x0200
-#define UDF_MAX_WRITE_VERSION 0x0200
+#define UDF_MAX_READ_VERSION 0x0201
+#define UDF_MAX_WRITE_VERSION 0x0201
#define UDF_FLAG_USE_EXTENDED_FE 0
#define UDF_VERS_USE_EXTENDED_FE 0x0200
@@ -14,16 +14,18 @@
#define UDF_FLAG_USE_SHORT_AD 2
#define UDF_FLAG_USE_AD_IN_ICB 3
#define UDF_FLAG_USE_FILE_CTIME_EA 4
-#define UDF_FLAG_STRICT 5
-#define UDF_FLAG_UNDELETE 6
-#define UDF_FLAG_UNHIDE 7
-#define UDF_FLAG_VARCONV 8
-
-#define UDF_PART_FLAG_UNALLOC_BITMAP 0x0001
-#define UDF_PART_FLAG_UNALLOC_TABLE 0x0002
-#define UDF_PART_FLAG_FREED_BITMAP 0x0004
-#define UDF_PART_FLAG_FREED_TABLE 0x0008
-
+#define UDF_FLAG_STRICT 5
+#define UDF_FLAG_UNDELETE 6
+#define UDF_FLAG_UNHIDE 7
+#define UDF_FLAG_VARCONV 8
+#define UDF_FLAG_NLS_MAP 9
+#define UDF_FLAG_UTF8 10
+
+#define UDF_PART_FLAG_UNALLOC_BITMAP 0x0001
+#define UDF_PART_FLAG_UNALLOC_TABLE 0x0002
+#define UDF_PART_FLAG_FREED_BITMAP 0x0004
+#define UDF_PART_FLAG_FREED_TABLE 0x0008
+
#define UDF_SB_FREE(X)\
{\
if (UDF_SB(X))\
@@ -37,11 +39,41 @@
#define UDF_SB_ALLOC_PARTMAPS(X,Y)\
{\
- UDF_SB_NUMPARTS(X) = Y;\
UDF_SB_PARTMAPS(X) = kmalloc(sizeof(struct udf_part_map) * Y, GFP_KERNEL);\
- memset(UDF_SB_PARTMAPS(X), 0x00, sizeof(struct udf_part_map) * Y);\
+ if (UDF_SB_PARTMAPS(X) != NULL)\
+ {\
+ UDF_SB_NUMPARTS(X) = Y;\
+ memset(UDF_SB_PARTMAPS(X), 0x00, sizeof(struct udf_part_map) * Y);\
+ }\
+ else\
+ {\
+ UDF_SB_NUMPARTS(X) = 0;\
+ udf_error(X, __FUNCTION__, "Unable to allocate space for %d partition maps", Y);\
+ }\
}
+#define UDF_SB_ALLOC_BITMAP(X,Y,Z)\
+{\
+ int nr_groups = ((UDF_SB_PARTLEN((X),(Y)) + (sizeof(struct SpaceBitmapDesc) << 3) +\
+ ((X)->s_blocksize * 8) - 1) / ((X)->s_blocksize * 8));\
+ UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap = kmalloc(sizeof(struct udf_bitmap) +\
+ sizeof(struct buffer_head *) * nr_groups,\
+ GFP_KERNEL);\
+ if (UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap != NULL)\
+ {\
+ memset(UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap, 0x00,\
+ sizeof(struct udf_bitmap) + sizeof(struct buffer_head *) * nr_groups);\
+ UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_block_bitmap =\
+ (struct buffer_head **)(UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap + 1);\
+ UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_nr_groups = nr_groups;\
+ }\
+ else\
+ {\
+ udf_error(X, __FUNCTION__, "Unable to allocate space for bitmap and %d buffer_head pointers", nr_groups);\
+ }\
+}
+
+
#define UDF_QUERY_FLAG(X,Y) ( UDF_SB(X)->s_flags & ( 1 << (Y) ) )
#define UDF_SET_FLAG(X,Y) ( UDF_SB(X)->s_flags |= ( 1 << (Y) ) )
#define UDF_CLEAR_FLAG(X,Y) ( UDF_SB(X)->s_flags &= ~( 1 << (Y) ) )
@@ -58,6 +90,8 @@
#define UDF_SB_TYPEVIRT(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_type_specific.s_virtual )
#define UDF_SB_PARTFUNC(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_func )
#define UDF_SB_PARTFLAGS(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_flags )
+#define UDF_SB_BITMAP(X,Y,Z,I) ( UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_block_bitmap[I] )
+#define UDF_SB_BITMAP_NR_GROUPS(X,Y,Z) ( UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_nr_groups )
#define UDF_SB_VOLIDENT(X) ( UDF_SB(X)->s_volident )
#define UDF_SB_NUMPARTS(X) ( UDF_SB(X)->s_partitions )
@@ -69,9 +103,6 @@
#define UDF_SB_LVID(X) ( (struct LogicalVolIntegrityDesc *)UDF_SB_LVIDBH(X)->b_data )
#define UDF_SB_LVIDIU(X) ( (struct LogicalVolIntegrityDescImpUse *)&(UDF_SB_LVID(X)->impUse[UDF_SB_LVID(X)->numOfPartitions * 2 * sizeof(Uint32)/sizeof(Uint8)]) )
-#define UDF_SB_LOADED_BLOCK_BITMAPS(X) ( UDF_SB(X)->s_loaded_block_bitmaps )
-#define UDF_SB_BLOCK_BITMAP_NUMBER(X,Y) ( UDF_SB(X)->s_block_bitmap_number[(Y)] )
-#define UDF_SB_BLOCK_BITMAP(X,Y) ( UDF_SB(X)->s_block_bitmap[(Y)] )
#define UDF_SB_UMASK(X) ( UDF_SB(X)->s_umask )
#define UDF_SB_GID(X) ( UDF_SB(X)->s_gid )
#define UDF_SB_UID(X) ( UDF_SB(X)->s_uid )
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)