diff options
author | Andrew Morton <akpm@osdl.org> | 2005-06-21 20:16:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:37 -0400 |
commit | a089221c5e8a5ae8d74a919c8c7a4d2f68bd59e5 (patch) | |
tree | 59418dd75d6828ff09d0a13fe9fab76f944c4ee8 /fs | |
parent | 7373909de403d229979842081c63917452e39402 (diff) |
[PATCH] rock: lindent rock.h
So we have a couple of rock-ridge bugs. First up, rotoroot the poor thing
into something which it is possible to work on.
Feed rock.h through Lindent, tidy a couple of things by hand.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/isofs/rock.h | 183 |
1 files changed, 93 insertions, 90 deletions
diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h index deaf5c8e8b4a..9d3cbc762380 100644 --- a/fs/isofs/rock.h +++ b/fs/isofs/rock.h | |||
@@ -1,85 +1,88 @@ | |||
1 | /* These structs are used by the system-use-sharing protocol, in which the | 1 | /* |
2 | Rock Ridge extensions are embedded. It is quite possible that other | 2 | * These structs are used by the system-use-sharing protocol, in which the |
3 | extensions are present on the disk, and this is fine as long as they | 3 | * Rock Ridge extensions are embedded. It is quite possible that other |
4 | all use SUSP */ | 4 | * extensions are present on the disk, and this is fine as long as they |
5 | 5 | * all use SUSP | |
6 | struct SU_SP{ | 6 | */ |
7 | unsigned char magic[2]; | 7 | |
8 | unsigned char skip; | 8 | struct SU_SP { |
9 | } __attribute__((packed)); | 9 | unsigned char magic[2]; |
10 | 10 | unsigned char skip; | |
11 | struct SU_CE{ | 11 | } __attribute__ ((packed)); |
12 | char extent[8]; | 12 | |
13 | char offset[8]; | 13 | struct SU_CE { |
14 | char size[8]; | 14 | char extent[8]; |
15 | char offset[8]; | ||
16 | char size[8]; | ||
15 | }; | 17 | }; |
16 | 18 | ||
17 | struct SU_ER{ | 19 | struct SU_ER { |
18 | unsigned char len_id; | 20 | unsigned char len_id; |
19 | unsigned char len_des; | 21 | unsigned char len_des; |
20 | unsigned char len_src; | 22 | unsigned char len_src; |
21 | unsigned char ext_ver; | 23 | unsigned char ext_ver; |
22 | char data[0]; | 24 | char data[0]; |
23 | } __attribute__((packed)); | 25 | } __attribute__ ((packed)); |
24 | 26 | ||
25 | struct RR_RR{ | 27 | struct RR_RR { |
26 | char flags[1]; | 28 | char flags[1]; |
27 | } __attribute__((packed)); | 29 | } __attribute__ ((packed)); |
28 | 30 | ||
29 | struct RR_PX{ | 31 | struct RR_PX { |
30 | char mode[8]; | 32 | char mode[8]; |
31 | char n_links[8]; | 33 | char n_links[8]; |
32 | char uid[8]; | 34 | char uid[8]; |
33 | char gid[8]; | 35 | char gid[8]; |
34 | }; | 36 | }; |
35 | 37 | ||
36 | struct RR_PN{ | 38 | struct RR_PN { |
37 | char dev_high[8]; | 39 | char dev_high[8]; |
38 | char dev_low[8]; | 40 | char dev_low[8]; |
39 | }; | 41 | }; |
40 | 42 | ||
43 | struct SL_component { | ||
44 | unsigned char flags; | ||
45 | unsigned char len; | ||
46 | char text[0]; | ||
47 | } __attribute__ ((packed)); | ||
41 | 48 | ||
42 | struct SL_component{ | 49 | struct RR_SL { |
43 | unsigned char flags; | 50 | unsigned char flags; |
44 | unsigned char len; | 51 | struct SL_component link; |
45 | char text[0]; | 52 | } __attribute__ ((packed)); |
46 | } __attribute__((packed)); | ||
47 | 53 | ||
48 | struct RR_SL{ | 54 | struct RR_NM { |
49 | unsigned char flags; | 55 | unsigned char flags; |
50 | struct SL_component link; | 56 | char name[0]; |
51 | } __attribute__((packed)); | 57 | } __attribute__ ((packed)); |
52 | 58 | ||
53 | struct RR_NM{ | 59 | struct RR_CL { |
54 | unsigned char flags; | 60 | char location[8]; |
55 | char name[0]; | ||
56 | } __attribute__((packed)); | ||
57 | |||
58 | struct RR_CL{ | ||
59 | char location[8]; | ||
60 | }; | 61 | }; |
61 | 62 | ||
62 | struct RR_PL{ | 63 | struct RR_PL { |
63 | char location[8]; | 64 | char location[8]; |
64 | }; | 65 | }; |
65 | 66 | ||
66 | struct stamp{ | 67 | struct stamp { |
67 | char time[7]; | 68 | char time[7]; |
68 | } __attribute__((packed)); | 69 | } __attribute__ ((packed)); |
69 | 70 | ||
70 | struct RR_TF{ | 71 | struct RR_TF { |
71 | char flags; | 72 | char flags; |
72 | struct stamp times[0]; /* Variable number of these beasts */ | 73 | struct stamp times[0]; /* Variable number of these beasts */ |
73 | } __attribute__((packed)); | 74 | } __attribute__ ((packed)); |
74 | 75 | ||
75 | /* Linux-specific extension for transparent decompression */ | 76 | /* Linux-specific extension for transparent decompression */ |
76 | struct RR_ZF{ | 77 | struct RR_ZF { |
77 | char algorithm[2]; | 78 | char algorithm[2]; |
78 | char parms[2]; | 79 | char parms[2]; |
79 | char real_size[8]; | 80 | char real_size[8]; |
80 | }; | 81 | }; |
81 | 82 | ||
82 | /* These are the bits and their meanings for flags in the TF structure. */ | 83 | /* |
84 | * These are the bits and their meanings for flags in the TF structure. | ||
85 | */ | ||
83 | #define TF_CREATE 1 | 86 | #define TF_CREATE 1 |
84 | #define TF_MODIFY 2 | 87 | #define TF_MODIFY 2 |
85 | #define TF_ACCESS 4 | 88 | #define TF_ACCESS 4 |
@@ -89,31 +92,31 @@ struct RR_ZF{ | |||
89 | #define TF_EFFECTIVE 64 | 92 | #define TF_EFFECTIVE 64 |
90 | #define TF_LONG_FORM 128 | 93 | #define TF_LONG_FORM 128 |
91 | 94 | ||
92 | struct rock_ridge{ | 95 | struct rock_ridge { |
93 | char signature[2]; | 96 | char signature[2]; |
94 | unsigned char len; | 97 | unsigned char len; |
95 | unsigned char version; | 98 | unsigned char version; |
96 | union{ | 99 | union { |
97 | struct SU_SP SP; | 100 | struct SU_SP SP; |
98 | struct SU_CE CE; | 101 | struct SU_CE CE; |
99 | struct SU_ER ER; | 102 | struct SU_ER ER; |
100 | struct RR_RR RR; | 103 | struct RR_RR RR; |
101 | struct RR_PX PX; | 104 | struct RR_PX PX; |
102 | struct RR_PN PN; | 105 | struct RR_PN PN; |
103 | struct RR_SL SL; | 106 | struct RR_SL SL; |
104 | struct RR_NM NM; | 107 | struct RR_NM NM; |
105 | struct RR_CL CL; | 108 | struct RR_CL CL; |
106 | struct RR_PL PL; | 109 | struct RR_PL PL; |
107 | struct RR_TF TF; | 110 | struct RR_TF TF; |
108 | struct RR_ZF ZF; | 111 | struct RR_ZF ZF; |
109 | } u; | 112 | } u; |
110 | }; | 113 | }; |
111 | 114 | ||
112 | #define RR_PX 1 /* POSIX attributes */ | 115 | #define RR_PX 1 /* POSIX attributes */ |
113 | #define RR_PN 2 /* POSIX devices */ | 116 | #define RR_PN 2 /* POSIX devices */ |
114 | #define RR_SL 4 /* Symbolic link */ | 117 | #define RR_SL 4 /* Symbolic link */ |
115 | #define RR_NM 8 /* Alternate Name */ | 118 | #define RR_NM 8 /* Alternate Name */ |
116 | #define RR_CL 16 /* Child link */ | 119 | #define RR_CL 16 /* Child link */ |
117 | #define RR_PL 32 /* Parent link */ | 120 | #define RR_PL 32 /* Parent link */ |
118 | #define RR_RE 64 /* Relocation directory */ | 121 | #define RR_RE 64 /* Relocation directory */ |
119 | #define RR_TF 128 /* Timestamps */ | 122 | #define RR_TF 128 /* Timestamps */ |