export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/fs/udf/udf_sb.h
..
..
@@ -20,8 +20,6 @@
20
20
 #define UDF_FLAG_UNDELETE		6
21
21
 #define UDF_FLAG_UNHIDE			7
22
22
 #define UDF_FLAG_VARCONV		8
23
-#define UDF_FLAG_NLS_MAP		9
24
-#define UDF_FLAG_UTF8			10
25
23
 #define UDF_FLAG_UID_FORGET     11    /* save -1 for uid to disk */
26
24
 #define UDF_FLAG_GID_FORGET     12
27
25
 #define UDF_FLAG_UID_SET	13
..
..
@@ -35,8 +33,6 @@
35
33
 
36
34
 #define UDF_PART_FLAG_UNALLOC_BITMAP	0x0001
37
35
 #define UDF_PART_FLAG_UNALLOC_TABLE	0x0002
38
-#define UDF_PART_FLAG_FREED_BITMAP	0x0004
39
-#define UDF_PART_FLAG_FREED_TABLE	0x0008
40
36
 #define UDF_PART_FLAG_READ_ONLY		0x0010
41
37
 #define UDF_PART_FLAG_WRITE_ONCE	0x0020
42
38
 #define UDF_PART_FLAG_REWRITABLE	0x0040
..
..
@@ -52,10 +48,10 @@
52
48
 
53
49
 #define UDF_INVALID_MODE		((umode_t)-1)
54
50
 
55
-#pragma pack(1) /* XXX(hch): Why?  This file just defines in-core structures */
56
-
57
51
 #define MF_DUPLICATE_MD		0x01
58
52
 #define MF_MIRROR_FE_LOADED	0x02
53
+
54
+#define EFSCORRUPTED EUCLEAN
59
55
 
60
56
 struct udf_meta_data {
61
57
 	__u32	s_meta_file_loc;
..
..
@@ -87,7 +83,7 @@
87
83
 struct udf_bitmap {
88
84
 	__u32			s_extPosition;
89
85
 	int			s_nr_groups;
90
-	struct buffer_head 	*s_block_bitmap[0];
86
+	struct buffer_head	*s_block_bitmap[];
91
87
 };
92
88
 
93
89
 struct udf_part_map {
..
..
@@ -95,10 +91,6 @@
95
91
 		struct udf_bitmap	*s_bitmap;
96
92
 		struct inode		*s_table;
97
93
 	} s_uspace;
98
-	union {
99
-		struct udf_bitmap	*s_bitmap;
100
-		struct inode		*s_table;
101
-	} s_fspace;
102
94
 	__u32	s_partition_root;
103
95
 	__u32	s_partition_len;
104
96
 	__u16	s_partition_type;