patch-2.3.49 linux/fs/udf/udf_sb.h

• Lines: 102
• Date: Thu Mar 2 11:17:32 2000
• Orig file: v2.3.48/linux/fs/udf/udf_sb.h
• Orig date: Fri Jan 28 15:09:09 2000

diff -u --recursive --new-file v2.3.48/linux/fs/udf/udf_sb.h linux/fs/udf/udf_sb.h
@@ -2,13 +2,23 @@
 #define __LINUX_UDF_SB_H
 
 /* Since UDF 1.50 is ISO 13346 based... */
-#define UDF_SUPER_MAGIC	0x15013346
+#define UDF_SUPER_MAGIC				0x15013346
 
-#define UDF_FLAG_STRICT		0x00000001U
-#define UDF_FLAG_UNDELETE	0x00000002U
-#define UDF_FLAG_UNHIDE		0x00000004U
-#define UDF_FLAG_VARCONV	0x00000008U
+#define UDF_MAX_READ_VERSION		0x0200
+#define UDF_MAX_WRITE_VERSION		0x0200
 
+#define UDF_FLAG_USE_EXTENDED_FE	0
+#define UDF_VERS_USE_EXTENDED_FE	0x0200
+#define UDF_FLAG_USE_STREAMS		1
+#define UDF_VERS_USE_STREAMS		0x0200
+#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_SB_FREE(X)\
 {\
 	if (UDF_SB(X))\
@@ -27,37 +37,42 @@
 	memset(UDF_SB_PARTMAPS(X), 0x00, sizeof(struct udf_part_map) * Y);\
 }
 
-#define IS_STRICT(X)			( UDF_SB(X)->s_flags & UDF_FLAG_STRICT )
-#define IS_UNDELETE(X)			( UDF_SB(X)->s_flags & UDF_FLAG_UNDELETE )
-#define IS_UNHIDE(X)			( UDF_SB(X)->s_flags & UDF_FLAG_UNHIDE )
-
-#define UDF_SB_SESSION(X)		( UDF_SB(X)->s_session )
-#define UDF_SB_ANCHOR(X)		( UDF_SB(X)->s_anchor )
-#define UDF_SB_NUMPARTS(X)		( UDF_SB(X)->s_partitions )
-#define UDF_SB_VOLUME(X)		( UDF_SB(X)->s_thisvolume )
-#define UDF_SB_LASTBLOCK(X)		( UDF_SB(X)->s_lastblock )
-#define UDF_SB_VOLDESC(X)		( UDF_SB(X)->s_voldesc )
-#define UDF_SB_LVIDBH(X)		( UDF_SB(X)->s_lvidbh )
-#define UDF_SB_LVID(X)			( (struct LogicalVolIntegrityDesc *)UDF_SB_LVIDBH(X)->b_data )
-#define UDF_SB_LVIDIU(X)		( (struct LogicalVolIntegrityDescImpUse *)&(UDF_SB_LVID(sb)->impUse[UDF_SB_LVID(sb)->numOfPartitions * 2 * sizeof(Uint32)/sizeof(Uint8)]) )
-#define UDF_SB_PARTITION(X)		( UDF_SB(X)->s_partition )
-#define UDF_SB_RECORDTIME(X)	( UDF_SB(X)->s_recordtime )
-#define UDF_SB_VOLIDENT(X)		( UDF_SB(X)->s_volident )
-#define UDF_SB_PARTMAPS(X)		( UDF_SB(X)->s_partmaps )
-#define UDF_SB_SERIALNUM(X)		( UDF_SB(X)->s_serialnum )
-#define UDF_SB_VAT(X)			( UDF_SB(X)->s_vat )
+#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) ) )
+
+#define UDF_UPDATE_UDFREV(X,Y)			( ((Y) > UDF_SB_UDFREV(X)) ? UDF_SB_UDFREV(X) = (Y) : UDF_SB_UDFREV(X) )
+
+#define UDF_SB_PARTMAPS(X)				( UDF_SB(X)->s_partmaps )
+#define UDF_SB_PARTTYPE(X,Y)			( UDF_SB_PARTMAPS(X)[(Y)].s_partition_type )
+#define UDF_SB_PARTROOT(X,Y)			( UDF_SB_PARTMAPS(X)[(Y)].s_partition_root )
+#define UDF_SB_PARTLEN(X,Y)				( UDF_SB_PARTMAPS(X)[(Y)].s_partition_len )
+#define UDF_SB_PARTVSN(X,Y)				( UDF_SB_PARTMAPS(X)[(Y)].s_volumeseqnum )
+#define UDF_SB_PARTNUM(X,Y)				( UDF_SB_PARTMAPS(X)[(Y)].s_partition_num )
+#define UDF_SB_TYPESPAR(X,Y)			( UDF_SB_PARTMAPS(X)[(Y)].s_type_specific.s_sparing )
+#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_VOLIDENT(X)				( UDF_SB(X)->s_volident )
+#define UDF_SB_NUMPARTS(X)				( UDF_SB(X)->s_partitions )
+#define UDF_SB_PARTITION(X)				( UDF_SB(X)->s_partition )
+#define UDF_SB_SESSION(X)				( UDF_SB(X)->s_session )
+#define UDF_SB_ANCHOR(X)				( UDF_SB(X)->s_anchor )
+#define UDF_SB_LASTBLOCK(X)				( UDF_SB(X)->s_lastblock )
+#define UDF_SB_LVIDBH(X)				( UDF_SB(X)->s_lvidbh )
+#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_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_LOADED_BLOCK_BITMAPS(X)	( UDF_SB(X)->s_loaded_block_bitmaps )
-
-#define UDF_SB_PARTTYPE(X,Y)	( UDF_SB_PARTMAPS(X)[Y].s_partition_type )
-#define UDF_SB_PARTROOT(X,Y)	( UDF_SB_PARTMAPS(X)[Y].s_partition_root )
-#define UDF_SB_PARTLEN(X,Y)		( UDF_SB_PARTMAPS(X)[Y].s_partition_len )
-#define UDF_SB_PARTVSN(X,Y)		( UDF_SB_PARTMAPS(X)[Y].s_volumeseqnum )
-#define UDF_SB_PARTNUM(X,Y)		( UDF_SB_PARTMAPS(X)[Y].s_partition_num )
-#define UDF_SB_TYPESPAR(X,Y)	( UDF_SB_PARTMAPS(X)[Y].s_type_specific.s_sparing )
-#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_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 )
+#define UDF_SB_RECORDTIME(X)			( UDF_SB(X)->s_recordtime )
+#define UDF_SB_SERIALNUM(X)				( UDF_SB(X)->s_serialnum )
+#define UDF_SB_UDFREV(X)				( UDF_SB(X)->s_udfrev )
+#define UDF_SB_FLAGS(X)					( UDF_SB(X)->s_flags )
+#define UDF_SB_VAT(X)					( UDF_SB(X)->s_vat )
 
 #endif /* __LINUX_UDF_SB_H */